Use non deprecated versions of API to simplify service building

wildfly · Jan 16, 2015 · 947c94c · 947c94c
1 parent 1a6cdb6
commit 947c94c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 36 deletions.
diff --git a/connector/src/main/java/org/jboss/as/connector/deployers/ds/DsDeploymentActivator.java b/connector/src/main/java/org/jboss/as/connector/deployers/ds/DsDeploymentActivator.java
@@ -22,18 +22,13 @@
 
 package org.jboss.as.connector.deployers.ds;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
 import org.jboss.as.connector.deployers.datasource.DataSourceDefinitionAnnotationProcessor;
 import org.jboss.as.connector.deployers.datasource.DataSourceDefinitionDescriptorProcessor;
 import org.jboss.as.connector.deployers.ds.processors.DsXmlDeploymentInstallProcessor;
 import org.jboss.as.connector.deployers.ds.processors.DsXmlDeploymentParsingProcessor;
 import org.jboss.as.connector.subsystems.datasources.DataSourcesExtension;
 import org.jboss.as.server.DeploymentProcessorTarget;
 import org.jboss.as.server.deployment.Phase;
-import org.jboss.msc.service.ServiceController;
-import org.jboss.msc.service.ServiceTarget;
 
 /**
  * Service activator which installs the various service required for datasource
@@ -43,13 +38,6 @@
  */
 public class DsDeploymentActivator {
 
-    public Collection<ServiceController<?>> activateServices(final ServiceTarget serviceTarget) {
-
-        final Collection<ServiceController<?>> controllers = new ArrayList<ServiceController<?>>(1);
-
-        return controllers;
-    }
-
     public void activateProcessors(final DeploymentProcessorTarget updateContext) {
         updateContext.addDeploymentProcessor(DataSourcesExtension.SUBSYSTEM_NAME, Phase.PARSE, Phase.PARSE_DSXML_DEPLOYMENT, new DsXmlDeploymentParsingProcessor());
         updateContext.addDeploymentProcessor(DataSourcesExtension.SUBSYSTEM_NAME, Phase.PARSE, Phase.PARSE_RESOURCE_DEF_ANNOTATION_DATA_SOURCE, new DataSourceDefinitionAnnotationProcessor());

diff --git a/connector/src/main/java/org/jboss/as/connector/deployers/ra/RaDeploymentActivator.java b/connector/src/main/java/org/jboss/as/connector/deployers/ra/RaDeploymentActivator.java
@@ -22,10 +22,6 @@
 
 package org.jboss.as.connector.deployers.ra;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 import org.jboss.as.connector.deployers.ds.processors.DriverProcessor;
 import org.jboss.as.connector.deployers.ds.processors.StructureDriverProcessor;
 import org.jboss.as.connector.deployers.ra.processors.IronJacamarDeploymentParsingProcessor;
@@ -46,7 +42,6 @@
 import org.jboss.as.server.deployment.Phase;
 import org.jboss.jca.core.spi.mdr.MetadataRepository;
 import org.jboss.jca.core.spi.transaction.TransactionIntegration;
-import org.jboss.msc.service.ServiceController;
 import org.jboss.msc.service.ServiceTarget;
 
 /**
@@ -63,30 +58,27 @@ public RaDeploymentActivator(final boolean appclient) {
         this.appclient = appclient;
     }
 
-    public Collection<ServiceController<?>> activateServices(final ServiceTarget serviceTarget) {
+    public void activateServices(final ServiceTarget serviceTarget) {
-        final List<ServiceController<?>> controllers = new ArrayList<ServiceController<?>>();
         // add resources here
 
-        controllers.add(serviceTarget.addService(ConnectorServices.IRONJACAMAR_MDR, mdrService)
+        serviceTarget.addService(ConnectorServices.IRONJACAMAR_MDR, mdrService)
-            .install());
+            .install();
 
         RaRepositoryService raRepositoryService = new RaRepositoryService();
-        controllers.add(serviceTarget.addService(ConnectorServices.RA_REPOSITORY_SERVICE, raRepositoryService)
+        serviceTarget.addService(ConnectorServices.RA_REPOSITORY_SERVICE, raRepositoryService)
             .addDependency(ConnectorServices.IRONJACAMAR_MDR, MetadataRepository.class, raRepositoryService.getMdrInjector())
                 .addDependency(ConnectorServices.TRANSACTION_INTEGRATION_SERVICE, TransactionIntegration.class,
                         raRepositoryService.getTransactionIntegrationInjector())
-            .install());
+            .install();
 
         ManagementRepositoryService managementRepositoryService = new ManagementRepositoryService();
-        controllers.add(serviceTarget.addService(ConnectorServices.MANAGEMENT_REPOSITORY_SERVICE, managementRepositoryService)
+        serviceTarget.addService(ConnectorServices.MANAGEMENT_REPOSITORY_SERVICE, managementRepositoryService)
-            .install());
+            .install();
 
         ResourceAdapterDeploymentRegistryService registryService = new ResourceAdapterDeploymentRegistryService();
-        controllers.add(serviceTarget.addService(ConnectorServices.RESOURCE_ADAPTER_REGISTRY_SERVICE, registryService)
+        serviceTarget.addService(ConnectorServices.RESOURCE_ADAPTER_REGISTRY_SERVICE, registryService)
             .addDependency(ConnectorServices.IRONJACAMAR_MDR)
-            .install());
+            .install();
-
-        return controllers;
     }
 
 

diff --git a/...main/java/org/jboss/as/connector/deployers/ra/processors/ParsedRaDeploymentProcessor.java b/...main/java/org/jboss/as/connector/deployers/ra/processors/ParsedRaDeploymentProcessor.java
@@ -213,8 +213,7 @@ public static ServiceBuilder process(final ConnectorXmlDescriptor connectorXmlDe
 
 
             // Create the service
-            ServiceBuilder builder =
+            return Services.addServerExecutorDependency(
-                    Services.addServerExecutorDependency(
                         serviceTarget.addService(deployerServiceName, raDeploymentService),
                         raDeploymentService.getExecutorServiceInjector(), false)
                     .addDependency(ConnectorServices.IRONJACAMAR_MDR, AS7MetadataRepository.class, raDeploymentService.getMdrInjector())
@@ -228,8 +227,6 @@ public static ServiceBuilder process(final ConnectorXmlDescriptor connectorXmlDe
                     .addDependency(ConnectorServices.IDLE_REMOVER_SERVICE)
                     .addDependency(ConnectorServices.CONNECTION_VALIDATOR_SERVICE)
                     .addDependency(NamingService.SERVICE_NAME);
-
-            return builder;
         } catch (Throwable t) {
             throw new DeploymentUnitProcessingException(t);
         }

diff --git a/.../src/main/java/org/jboss/as/connector/subsystems/datasources/DataSourcesSubsystemAdd.java b/.../src/main/java/org/jboss/as/connector/subsystems/datasources/DataSourcesSubsystemAdd.java
@@ -58,8 +58,5 @@ protected void execute(DeploymentProcessorTarget processorTarget) {
                 processorTarget.addDeploymentProcessor(DataSourcesExtension.SUBSYSTEM_NAME, Phase.INSTALL, Phase.INSTALL_DEFAULT_BINDINGS_DATASOURCE, new DefaultDataSourceBindingProcessor());
             }
         }, OperationContext.Stage.RUNTIME);
-
-
-        dsDeploymentActivator.activateServices(context.getServiceTarget());
     }
 }