Skip to content

Commit

Permalink
webservices transformers for eap 6.2, 6.3 & 6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@ctomc
ctomc committed Dec 7, 2015
1 parent e369350 commit 091cc2d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 81 deletions.
18 changes: 0 additions & 18 deletions webservices/server-integration/src/main/java/org/jboss/as/webservices/dmr/WSExtension.java
View file
Expand Up @@ -46,7 +46,6 @@
import org.jboss.as.controller.parsing.ExtensionParsingContext;
import org.jboss.as.controller.registry.ManagementResourceRegistration;
import org.jboss.as.controller.transform.description.DiscardAttributeChecker;
import org.jboss.as.controller.transform.description.RejectAttributeChecker;
import org.jboss.as.controller.transform.description.ResourceTransformationDescriptionBuilder;
import org.jboss.as.controller.transform.description.TransformationDescription;
import org.jboss.as.controller.transform.description.TransformationDescriptionBuilder;
Expand Down Expand Up @@ -178,7 +177,6 @@ public void initialize(final ExtensionContext context) {
}

if (context.isRegisterTransformers()) {
registerTransformers1_1_0(subsystem);
registerTransformers1_2_0(subsystem);
}
}
Expand All @@ -192,22 +190,6 @@ public void initializeParsers(final ExtensionParsingContext context) {
context.setSubsystemXmlMapping(SUBSYSTEM_NAME, Namespace.WEBSERVICES_2_0.getUriString(), WSSubSystem20Reader.getInstance());
}

private void registerTransformers1_1_0(SubsystemRegistration registration) {
ModelVersion version = ModelVersion.create(1, 1, 0);

ResourceTransformationDescriptionBuilder builder = TransformationDescriptionBuilder.Factory.createSubsystemInstance();
builder.getAttributeBuilder().setDiscard(DiscardAttributeChecker.ALWAYS, Attributes.STATISTICS_ENABLED);
builder.getAttributeBuilder().addRejectCheck(RejectAttributeChecker.SIMPLE_EXPRESSIONS, Attributes.SUBSYSTEM_ATTRIBUTES).end();
builder.getAttributeBuilder().setDiscard(DiscardAttributeChecker.ALWAYS, Attributes.WSDL_URI_SCHEME);
builder.rejectChildResource(CLIENT_CONFIG_PATH);

ResourceTransformationDescriptionBuilder endpoint = builder.addChildResource(ENDPOINT_CONFIG_PATH);
endpoint.addChildResource(PRE_HANDLER_CHAIN_PATH).getAttributeBuilder().addRejectCheck(RejectAttributeChecker.SIMPLE_EXPRESSIONS, Attributes.PROTOCOL_BINDINGS).end();
endpoint.addChildResource(POST_HANDLER_CHAIN_PATH).getAttributeBuilder().addRejectCheck(RejectAttributeChecker.SIMPLE_EXPRESSIONS, Attributes.PROTOCOL_BINDINGS).end();

TransformationDescription.Tools.register(builder.build(), registration, version);
}

private void registerTransformers1_2_0(SubsystemRegistration registration) {
ModelVersion version = ModelVersion.create(1, 2, 0);
ResourceTransformationDescriptionBuilder builder = TransformationDescriptionBuilder.Factory.createSubsystemInstance();
Expand Down
69 changes: 6 additions & 63 deletions ...ration/src/test/java/org/jboss/as/webservices/dmr/WebservicesSubsystemParserTestCase.java
View file
Expand Up @@ -33,7 +33,6 @@
import org.jboss.as.controller.RunningMode;
import org.jboss.as.model.test.FailedOperationTransformationConfig;
import org.jboss.as.model.test.ModelTestControllerVersion;
import org.jboss.as.model.test.ModelTestUtils;
import org.jboss.as.subsystem.test.AbstractSubsystemBaseTest;
import org.jboss.as.subsystem.test.AdditionalInitialization;
import org.jboss.as.subsystem.test.KernelServices;
Expand Down Expand Up @@ -150,75 +149,19 @@ private void checkClientConfigs(ModelNode model) throws Exception {
assertEquals("my-handlers2", postHandlers.get(0).getName());
}

private FailedOperationTransformationConfig getConfig() {
PathAddress subsystemAddress = PathAddress.pathAddress(WSExtension.SUBSYSTEM_PATH);
PathAddress endpoint = subsystemAddress.append(WSExtension.ENDPOINT_CONFIG_PATH);
return new FailedOperationTransformationConfig()
.addFailedAttribute(subsystemAddress, new FailedOperationTransformationConfig.RejectExpressionsConfig(Attributes.SUBSYSTEM_ATTRIBUTES))
.addFailedAttribute(endpoint.append(WSExtension.PRE_HANDLER_CHAIN_PATH),new FailedOperationTransformationConfig.RejectExpressionsConfig(Attributes.PROTOCOL_BINDINGS))
.addFailedAttribute(endpoint.append(WSExtension.POST_HANDLER_CHAIN_PATH),new FailedOperationTransformationConfig.RejectExpressionsConfig(Attributes.PROTOCOL_BINDINGS))
.addFailedAttribute(subsystemAddress.append(WSExtension.CLIENT_CONFIG_PATH),FailedOperationTransformationConfig.REJECTED_RESOURCE)
.addFailedAttribute(subsystemAddress.append(WSExtension.CLIENT_CONFIG_PATH).append(WSExtension.PRE_HANDLER_CHAIN_PATH),FailedOperationTransformationConfig.REJECTED_RESOURCE)
.addFailedAttribute(subsystemAddress.append(WSExtension.CLIENT_CONFIG_PATH).append(WSExtension.PRE_HANDLER_CHAIN_PATH).append(WSExtension.HANDLER_PATH),FailedOperationTransformationConfig.REJECTED_RESOURCE)
.addFailedAttribute(subsystemAddress.append(WSExtension.CLIENT_CONFIG_PATH).append(WSExtension.POST_HANDLER_CHAIN_PATH),FailedOperationTransformationConfig.REJECTED_RESOURCE)
.addFailedAttribute(subsystemAddress.append(WSExtension.CLIENT_CONFIG_PATH).append(WSExtension.POST_HANDLER_CHAIN_PATH).append(WSExtension.HANDLER_PATH),FailedOperationTransformationConfig.REJECTED_RESOURCE);
}


private void testRejectExpressions_1_1_0(ModelTestControllerVersion controllerVersion) throws Exception {
// create builder for current subsystem version
KernelServicesBuilder builder = createKernelServicesBuilder(createAdditionalInitialization());

// create builder for legacy subsystem version
ModelVersion version_1_1_0 = ModelVersion.create(1, 1, 0);
builder.createLegacyKernelServicesBuilder(null, controllerVersion, version_1_1_0)
.addMavenResourceURL("org.jboss.as:jboss-as-webservices-server-integration:" + controllerVersion.getMavenGavVersion());

KernelServices mainServices = builder.build();
KernelServices legacyServices = mainServices.getLegacyServices(version_1_1_0);

Assert.assertNotNull(legacyServices);
Assert.assertTrue("main services did not boot", mainServices.isSuccessfulBoot());
Assert.assertTrue(legacyServices.isSuccessfulBoot());

List<ModelNode> xmlOps = builder.parseXmlResource("ws-subsystem12.xml");

ModelTestUtils.checkFailedTransformedBootOperations(mainServices, version_1_1_0, xmlOps, getConfig());
}

@Test
public void testTransformersAS712() throws Exception {
testRejectExpressions_1_1_0(ModelTestControllerVersion.V7_1_2_FINAL);
}

@Test
public void testTransformersAS713() throws Exception {
testRejectExpressions_1_1_0(ModelTestControllerVersion.V7_1_3_FINAL);
}

@Test
public void testTransformersEAP600() throws Exception {
testRejectExpressions_1_1_0(ModelTestControllerVersion.EAP_6_0_0);
}

@Test
public void testTransformersEAP601() throws Exception {
testRejectExpressions_1_1_0(ModelTestControllerVersion.EAP_6_0_1);
}

@Test
public void testTransformersAS720() throws Exception {
testTransformers_1_2_0(ModelTestControllerVersion.V7_2_0_FINAL);
public void testTransformersEAP620() throws Exception {
testTransformers_1_2_0(ModelTestControllerVersion.EAP_6_2_0);
}

@Test
public void testTransformersEAP610() throws Exception {
testTransformers_1_2_0(ModelTestControllerVersion.EAP_6_1_0);
public void testTransformersEAP630() throws Exception {
testTransformers_1_2_0(ModelTestControllerVersion.EAP_6_3_0);
}

@Test
public void testTransformersEAP611() throws Exception {
testTransformers_1_2_0(ModelTestControllerVersion.EAP_6_1_1);
public void testTransformersEAP640() throws Exception {
testTransformers_1_2_0(ModelTestControllerVersion.EAP_6_4_0);
}

private void testTransformers_1_2_0(ModelTestControllerVersion controllerVersion) throws Exception {
Expand Down

0 comments on commit 091cc2d

Please sign in to comment.