WFLY-4429 Refactor JCA subsystems ---> Use of PASSIVE services

wildfly · Jun 18, 2015 · 74d2253 · 74d2253
1 parent 66b56b6
commit 74d2253
Show file tree

Hide file tree

Showing 42 changed files with 1,663 additions and 631 deletions.
diff --git a/...java/org/jboss/as/connector/deployers/datasource/DataSourceDefinitionInjectionSource.java b/...java/org/jboss/as/connector/deployers/datasource/DataSourceDefinitionInjectionSource.java
@@ -218,7 +218,7 @@ private void startDataSource(final AbstractDataSourceService dataSourceService,
                                  final ServiceBuilder valueSourceServiceBuilder, final Injector<ManagedReferenceFactory> injector, boolean securityEnabled) {
 
 
-        final ServiceName dataSourceServiceName = AbstractDataSourceService.SERVICE_NAME_BASE.append("DataSourceDefinition", moduleDescription.getApplicationName(), moduleDescription.getModuleName(), jndiName);
+        final ServiceName dataSourceServiceName = AbstractDataSourceService.SERVICE_NAME_BASE.append(jndiName);
         final ServiceBuilder<?> dataSourceServiceBuilder =
                 Services.addServerExecutorDependency(
                         serviceTarget.addService(dataSourceServiceName, dataSourceService),

diff --git a/.../java/org/jboss/as/connector/deployers/ds/processors/DsXmlDeploymentInstallProcessor.java b/.../java/org/jboss/as/connector/deployers/ds/processors/DsXmlDeploymentInstallProcessor.java
@@ -31,10 +31,12 @@
 import java.util.Map;
 
 import org.jboss.as.connector.logging.ConnectorLogger;
+import org.jboss.as.connector.services.datasources.statistics.DataSourceStatisticsService;
 import org.jboss.as.connector.services.driver.registry.DriverRegistry;
 import org.jboss.as.connector.subsystems.datasources.AbstractDataSourceService;
+import org.jboss.as.connector.subsystems.datasources.CommonDeploymentService;
+import org.jboss.as.connector.subsystems.datasources.Constants;
 import org.jboss.as.connector.subsystems.datasources.DataSourceReferenceFactoryService;
-import org.jboss.as.connector.subsystems.datasources.DataSourceStatisticsListener;
 import org.jboss.as.connector.subsystems.datasources.DataSourcesExtension;
 import org.jboss.as.connector.subsystems.datasources.DataSourcesSubsystemProviders;
 import org.jboss.as.connector.subsystems.datasources.LocalDataSourceService;
@@ -76,6 +78,7 @@
 import org.jboss.jca.core.spi.mdr.MetadataRepository;
 import org.jboss.jca.core.spi.rar.ResourceAdapterRepository;
 import org.jboss.jca.core.spi.transaction.TransactionIntegration;
+import org.jboss.jca.deployers.common.CommonDeployment;
 import org.jboss.msc.service.AbstractServiceListener;
 import org.jboss.msc.service.ServiceBuilder;
 import org.jboss.msc.service.ServiceController;
@@ -308,8 +311,13 @@ private void startDataSource(final AbstractDataSourceService dataSourceService,
             if (overrideRegistration == null || overrideRegistration.isAllowsOverride()) {
                 overrideRegistration = registration.registerOverrideModel(managementName, DataSourcesSubsystemProviders.OVERRIDE_DS_DESC);
             }
-            dataSourceServiceBuilder.addListener(new DataSourceStatisticsListener(overrideRegistration, false));
-            DataSourceStatisticsListener.registerStatisticsResources(resource);
+            DataSourceStatisticsService statsService = new DataSourceStatisticsService(registration, false );
+                            serviceTarget.addService(dataSourceServiceName.append(Constants.STATISTICS), statsService)
+                                    .addDependency(dataSourceServiceName)
+                                    .addDependency(CommonDeploymentService.SERVICE_NAME_BASE.append(jndiName), CommonDeployment.class, statsService.getCommonDeploymentInjector())
+                                    .setInitialMode(ServiceController.Mode.PASSIVE)
+                                    .install();
+            DataSourceStatisticsService.registerStatisticsResources(resource);
         } // else should probably throw an ISE or something
 
         final ServiceName driverServiceName = ServiceName.JBOSS.append("jdbc-driver", driverName.replaceAll("\\.", "_"));

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
@@ -101,8 +101,7 @@ public void activateProcessors(final DeploymentProcessorTarget updateContext) {
                 new AdministeredObjectDefinitionDescriptorProcessor());
         updateContext.addDeploymentProcessor(ResourceAdaptersExtension.SUBSYSTEM_NAME, Phase.INSTALL, Phase.INSTALL_RA_NATIVE, new RaNativeProcessor());
         updateContext.addDeploymentProcessor(ResourceAdaptersExtension.SUBSYSTEM_NAME, Phase.INSTALL, Phase.INSTALL_RA_DEPLOYMENT, new ParsedRaDeploymentProcessor());
-        updateContext.addDeploymentProcessor(ResourceAdaptersExtension.SUBSYSTEM_NAME, Phase.INSTALL, Phase.INSTALL_RA_XML_DEPLOYMENT, new RaXmlDeploymentProcessor(
-                mdrService.getValue()));
+        updateContext.addDeploymentProcessor(ResourceAdaptersExtension.SUBSYSTEM_NAME, Phase.INSTALL, Phase.INSTALL_RA_XML_DEPLOYMENT, new RaXmlDeploymentProcessor() );
         updateContext.addDeploymentProcessor(ResourceAdaptersExtension.SUBSYSTEM_NAME, Phase.INSTALL, Phase.INSTALL_JDBC_DRIVER, new DriverProcessor());
     }
 }