Merge pull request #2094 from bdecoste/master

KeyStore element in subsystem not required
This commit is contained in:
Bill Burke 2016-01-22 18:34:55 -05:00
commit d3cab2be93

View file

@ -64,7 +64,6 @@ public class KeyDefinition extends SimpleResourceDefinition {
static final ObjectTypeAttributeDefinition KEY_STORE = static final ObjectTypeAttributeDefinition KEY_STORE =
ObjectTypeAttributeDefinition.Builder.of(Constants.Model.KEY_STORE, ObjectTypeAttributeDefinition.Builder.of(Constants.Model.KEY_STORE,
KeyStoreDefinition.ALL_ATTRIBUTES) KeyStoreDefinition.ALL_ATTRIBUTES)
.setAllowNull(false)
.build(); .build();
static final SimpleAttributeDefinition[] ATTRIBUTES = {SIGNING, ENCRYPTION}; static final SimpleAttributeDefinition[] ATTRIBUTES = {SIGNING, ENCRYPTION};