Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Closed
wants to merge 2 commits into from
Closed

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fb1a29
WFLY-4429 Refactor JCA subsystems ---> Use of PASSIVE services
Feb 2, 2015
8d13861
WFLY-4429 fixing ctomc comments squash after review
Apr 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...java/org/jboss/as/connector/deployers/datasource/DataSourceDefinitionInjectionSource.java
View file
Open in desktop
Expand Up @@ -217,7 +217,7 @@ private void startDataSource(final AbstractDataSourceService dataSourceService,
final ServiceBuilder valueSourceServiceBuilder, final Injector<ManagedReferenceFactory> injector) {


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),
Expand Down
14 changes: 11 additions & 3 deletions .../java/org/jboss/as/connector/deployers/ds/processors/DsXmlDeploymentInstallProcessor.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -73,6 +75,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;
Expand Down Expand Up @@ -298,8 +301,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("\\.", "_"));
Expand Down
3 changes: 1 addition & 2 deletions connector/src/main/java/org/jboss/as/connector/deployers/ra/RaDeploymentActivator.java
View file
Open in desktop
Expand Up @@ -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());
}
}