Permalink
Comparing changes
Open a pull request
- 3 commits
- 5 files changed
- 0 commit comments
- 2 contributors
Commits on Apr 24, 2019
WFLY-12006 EJB3 IIOP attributes enable-by-default and use-qualified-name should be required
Unified
Split
Showing
with
9 additions
and 7 deletions.
- +2 −2 ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3IIOPAdd.java
- +4 −2 ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3IIOPResourceDefinition.java
- +1 −1 ejb3/src/main/java/org/jboss/as/ejb3/subsystem/RemotingEjbReceiverChannelCreationOptionResource.java
- +1 −1 ejb3/src/main/java/org/jboss/as/ejb3/subsystem/RemotingEjbReceiverDefinition.java
- +1 −1 undertow/src/main/java/org/wildfly/extension/undertow/handlers/ReverseProxyHandlerHost.java
| @@ -47,8 +47,8 @@ private EJB3IIOPAdd() { | ||
|
|
||
| @Override | ||
| protected void performBoottime(final OperationContext context, final ModelNode operation, final ModelNode model) throws OperationFailedException { | ||
| final Boolean enableByDefault = EJB3IIOPResourceDefinition.ENABLE_BY_DEFAULT.resolveModelAttribute(context, model).asBoolean(); | ||
| final Boolean useQualifiedName = EJB3IIOPResourceDefinition.USE_QUALIFIED_NAME.resolveModelAttribute(context, model).asBoolean(); | ||
| final boolean enableByDefault = EJB3IIOPResourceDefinition.ENABLE_BY_DEFAULT.resolveModelAttribute(context, model).asBoolean(); | ||
| final boolean useQualifiedName = EJB3IIOPResourceDefinition.USE_QUALIFIED_NAME.resolveModelAttribute(context, model).asBoolean(); | ||
| final IIOPSettingsService settingsService = new IIOPSettingsService(enableByDefault, useQualifiedName); | ||
| context.addStep(new AbstractDeploymentChainStep() { | ||
| protected void execute(DeploymentProcessorTarget processorTarget) { | ||
| @@ -54,15 +54,17 @@ | ||
|
|
||
|
|
||
| static final SimpleAttributeDefinition USE_QUALIFIED_NAME = | ||
| new SimpleAttributeDefinitionBuilder(EJB3SubsystemModel.USE_QUALIFIED_NAME, ModelType.BOOLEAN, true) | ||
| new SimpleAttributeDefinitionBuilder(EJB3SubsystemModel.USE_QUALIFIED_NAME, ModelType.BOOLEAN) | ||
| .setAllowExpression(true) | ||
| .setFlags(AttributeAccess.Flag.RESTART_NONE) | ||
| .setRequired(true) | ||
| .build(); | ||
|
|
||
| static final SimpleAttributeDefinition ENABLE_BY_DEFAULT = | ||
| new SimpleAttributeDefinitionBuilder(EJB3SubsystemModel.ENABLE_BY_DEFAULT, ModelType.BOOLEAN, true) | ||
| new SimpleAttributeDefinitionBuilder(EJB3SubsystemModel.ENABLE_BY_DEFAULT, ModelType.BOOLEAN) | ||
| .setAllowExpression(true) | ||
| .setFlags(AttributeAccess.Flag.RESTART_NONE) | ||
| .setRequired(true) | ||
| .build(); | ||
|
|
||
| private static final Map<String, AttributeDefinition> ATTRIBUTES; | ||
| @@ -54,7 +54,7 @@ | ||
| * Attribute definition of the channel creation option "type" | ||
| */ | ||
| static final SimpleAttributeDefinition CHANNEL_CREATION_OPTION_TYPE = new SimpleAttributeDefinitionBuilder( | ||
| EJB3SubsystemModel.TYPE, ModelType.STRING, true).setRequired(true) | ||
| EJB3SubsystemModel.TYPE, ModelType.STRING).setRequired(true) | ||
| .setValidator(AllowedChannelOptionTypesValidator.INSTANCE).build(); | ||
|
|
||
| public static final Map<String, AttributeDefinition> ATTRIBUTES; | ||
| @@ -45,7 +45,7 @@ | ||
| public class RemotingEjbReceiverDefinition extends SimpleResourceDefinition { | ||
|
|
||
| public static final SimpleAttributeDefinition OUTBOUND_CONNECTION_REF = new SimpleAttributeDefinitionBuilder( | ||
| EJB3SubsystemModel.OUTBOUND_CONNECTION_REF, ModelType.STRING, true).setRequired(true).setAllowExpression(true) | ||
| EJB3SubsystemModel.OUTBOUND_CONNECTION_REF, ModelType.STRING).setRequired(true).setAllowExpression(true) | ||
| .build(); | ||
|
|
||
| public static final SimpleAttributeDefinition CONNECT_TIMEOUT = new SimpleAttributeDefinitionBuilder( | ||
| @@ -84,7 +84,7 @@ | ||
| .setDynamicNameMapper(DynamicNameMappers.PARENT) | ||
| .build(); | ||
|
|
||
| public static final SimpleAttributeDefinition OUTBOUND_SOCKET_BINDING = new SimpleAttributeDefinitionBuilder("outbound-socket-binding", ModelType.STRING, true) | ||
| public static final SimpleAttributeDefinition OUTBOUND_SOCKET_BINDING = new SimpleAttributeDefinitionBuilder("outbound-socket-binding", ModelType.STRING) | ||
| .setRequired(true) | ||
| .setValidator(new StringLengthValidator(1, false)) | ||
| .setAllowExpression(true) | ||