Author: asoldano
Date: 2014-11-11 09:11:06 -0500 (Tue, 11 Nov 2014)
New Revision: 19094
Modified:
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/ClientConfigAdd.java
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/EndpointConfigAdd.java
Log:
[JBWS-3854] EndpointConfigAdd does not set required PropertyService dependencies
Modified:
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/ClientConfigAdd.java
===================================================================
---
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/ClientConfigAdd.java 2014-11-11
14:01:25 UTC (rev 19093)
+++
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/ClientConfigAdd.java 2014-11-11
14:11:06 UTC (rev 19094)
@@ -80,7 +80,9 @@
final ConfigService clientConfigService = new ConfigService(serverConfig, name,
true);
final ServiceTarget target = context.getServiceTarget();
final ServiceBuilder<?> clientServiceBuilder =
target.addService(serviceName, clientConfigService);
- setDependency(context, clientServiceBuilder,
clientConfigService.getPropertiesInjector(), PropertyService.class, serviceName, address,
Constants.PROPERTY);
+ for (ServiceName sn : PackageUtils.getServiceNameDependencies(context,
serviceName, address, Constants.PROPERTY)) {
+ clientServiceBuilder.addDependency(sn, PropertyService.class,
clientConfigService.getPropertiesInjector());
+ }
setDependency(context, clientServiceBuilder,
clientConfigService.getPreHandlerChainsInjector(), UnifiedHandlerChainMetaData.class,
serviceName, address, Constants.PRE_HANDLER_CHAIN);
final Injector<UnifiedHandlerChainMetaData> postInjector =
clientConfigService.getPostHandlerChainsInjector();
setDependency(context, clientServiceBuilder, postInjector,
UnifiedHandlerChainMetaData.class, serviceName, address, Constants.POST_HANDLER_CHAIN);
Modified:
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/EndpointConfigAdd.java
===================================================================
---
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/EndpointConfigAdd.java 2014-11-11
14:01:25 UTC (rev 19093)
+++
container/wildfly81/branches/jbossws-wildfly810/server-integration/src/main/java/org/jboss/as/webservices/dmr/EndpointConfigAdd.java 2014-11-11
14:11:06 UTC (rev 19094)
@@ -32,6 +32,7 @@
import org.jboss.as.controller.PathAddress;
import org.jboss.as.controller.ServiceVerificationHandler;
import org.jboss.as.webservices.service.ConfigService;
+import org.jboss.as.webservices.service.PropertyService;
import org.jboss.as.webservices.util.ASHelper;
import org.jboss.as.webservices.util.WSServices;
import org.jboss.dmr.ModelNode;
@@ -83,6 +84,9 @@
final ServiceTarget target = context.getServiceTarget();
final ServiceBuilder<?> clientServiceBuilder =
target.addService(serviceName, endpointConfigService);
+ for (ServiceName sn : PackageUtils.getServiceNameDependencies(context,
serviceName, address, Constants.PROPERTY)) {
+ clientServiceBuilder.addDependency(sn, PropertyService.class,
endpointConfigService.getPropertiesInjector());
+ }
setDependency(context, clientServiceBuilder,
endpointConfigService.getPreHandlerChainsInjector(), serviceName, address,
Constants.PRE_HANDLER_CHAIN);
setDependency(context, clientServiceBuilder,
endpointConfigService.getPostHandlerChainsInjector(), serviceName, address,
Constants.POST_HANDLER_CHAIN);
ServiceController<?> controller =
clientServiceBuilder.setInitialMode(ServiceController.Mode.ACTIVE).install();