You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2005/09/14 19:29:12 UTC
svn commit: r280889 - in /geronimo/trunk/modules:
client/src/java/org/apache/geronimo/client/
connector/src/java/org/apache/geronimo/connector/outbound/
connector/src/java/org/apache/geronimo/connector/work/
j2ee/src/java/org/apache/geronimo/j2ee/j2eeo...
Author: jboynes
Date: Wed Sep 14 10:28:53 2005
New Revision: 280889
URL: http://svn.apache.org/viewcvs?rev=280889&view=rev
Log:
JTAResource has specific meaning to JSR77 so we need to give our components a different type
clean up NameFactory and make the strings final
Modified:
geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/AppClientContainer.java
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java
geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java
geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java
geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java
geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledNonTransactionalTimer.java
geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledTransactionalTimer.java
geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/TransactionContextManagerGBean.java
geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java
geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java
Modified: geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/AppClientContainer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/AppClientContainer.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/AppClientContainer.java (original)
+++ geronimo/trunk/modules/client/src/java/org/apache/geronimo/client/AppClientContainer.java Wed Sep 14 10:28:53 2005
@@ -186,7 +186,7 @@
infoFactory.addAttribute("defaultPrincipal", DefaultPrincipal.class, true);
infoFactory.addReference("JNDIContext", AppClientPlugin.class, NameFactory.GERONIMO_SERVICE);
- infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.JTA_RESOURCE);
+ infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
infoFactory.addAttribute("classLoader", ClassLoader.class, false);
infoFactory.addAttribute("kernel", Kernel.class, false);
Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java (original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java Wed Sep 14 10:28:53 2005
@@ -43,7 +43,7 @@
infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
infoBuilder.addReference("ConnectionTracker", ConnectionTracker.class, NameFactory.JCA_CONNECTION_TRACKER);
- infoBuilder.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.JTA_RESOURCE);
+ infoBuilder.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
infoBuilder.setConstructor(new String[]{
"transactionSupport",
Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java (original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java Wed Sep 14 10:28:53 2005
@@ -54,7 +54,7 @@
infoFactory.addOperation("getXATerminator");
- infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.JTA_RESOURCE);
+ infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
infoFactory.setConstructor(new String[]{
"syncMaximumPoolSize",
Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java (original)
+++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java Wed Sep 14 10:28:53 2005
@@ -25,50 +25,56 @@
*/
public class NameFactory {
- //name components
- public static String J2EE_SERVER = "J2EEServer";
- public static String J2EE_APPLICATION = "J2EEApplication";
- public static String J2EE_MODULE = "J2EEModule";
- public static String J2EE_TYPE = "j2eeType";
- public static String J2EE_NAME = "name";
-
- //types
- public static String J2EE_DOMAIN = "J2EEDomain";
- public static String JVM = "JVM";
- public static String APP_CLIENT_MODULE = "AppClientModule";
-
- public static String EJB = "EJB";
- public static String EJB_MODULE = "EJBModule";
- public static String MESSAGE_DRIVEN_BEAN = "MessageDrivenBean";
- public static String ENTITY_BEAN = "EntityBean";
- public static String STATEFUL_SESSION_BEAN = "StatefulSessionBean";
- public static String STATELESS_SESSION_BEAN = "StatelessSessionBean";
-
- public static String WEB_MODULE = "WebModule";
- public static String SERVLET = "Servlet";
-
- public static String RESOURCE_ADAPTER_MODULE = "ResourceAdapterModule";
- public static String RESOURCE_ADAPTER = "ResourceAdapter";
- public static String JAVA_MAIL_RESOURCE = "JavaMailResource";
- public static String JCA_RESOURCE = "JCAResource";
- public static String JCA_CONNECTION_FACTORY = "JCAConnectionFactory";
- public static String JCA_CONNECTION_TRACKER = "JCAConnectionTracker";
- public static String JCA_MANAGED_CONNECTION_FACTORY = "JCAManagedConnectionFactory";
- public static String JDBC_RESOURCE = "JDBCResource";
- public static String JDBC_DATASOURCE = "JDBCDataSource";
- public static String JDBC_DRIVER = "JDBCDriver";
- public static String JMS_RESOURCE = "JMSResource";
-
- public static String JNDI_RESOURCE = "JNDIResource";
- public static String JTA_RESOURCE = "JTAResource";
-
- public static String RMI_IIOP_RESOURCE = "RMI_IIOPResource";
- public static String URL_RESOURCE = "URLResource";
+ // Manadatory key properties from JSR77.3.1.1.1.3
+ public static final String J2EE_TYPE = "j2eeType";
+ public static final String J2EE_NAME = "name";
+
+ // ManagedObject j2eeTypes from JSR77.3-1
+ public static final String J2EE_DOMAIN = "J2EEDomain";
+ public static final String J2EE_SERVER = "J2EEServer";
+ public static final String J2EE_APPLICATION = "J2EEApplication";
+ public static final String APP_CLIENT_MODULE = "AppClientModule";
+ public static final String EJB_MODULE = "EJBModule";
+ public static final String WEB_MODULE = "WebModule";
+ public static final String RESOURCE_ADAPTER_MODULE = "ResourceAdapterModule";
+ public static final String ENTITY_BEAN = "EntityBean";
+ public static final String STATEFUL_SESSION_BEAN = "StatefulSessionBean";
+ public static final String STATELESS_SESSION_BEAN = "StatelessSessionBean";
+ public static final String MESSAGE_DRIVEN_BEAN = "MessageDrivenBean";
+ public static final String SERVLET = "Servlet";
+ public static final String RESOURCE_ADAPTER = "ResourceAdapter";
+ public static final String JAVA_MAIL_RESOURCE = "JavaMailResource";
+ public static final String JCA_RESOURCE = "JCAResource";
+ public static final String JCA_CONNECTION_FACTORY = "JCAConnectionFactory";
+ public static final String JCA_MANAGED_CONNECTION_FACTORY = "JCAManagedConnectionFactory";
+ public static final String JDBC_RESOURCE = "JDBCResource";
+ public static final String JDBC_DATASOURCE = "JDBCDataSource";
+ public static final String JDBC_DRIVER = "JDBCDriver";
+ public static final String JMS_RESOURCE = "JMSResource";
+ public static final String JNDI_RESOURCE = "JNDIResource";
+ public static final String JTA_RESOURCE = "JTAResource";
+ public static final String RMI_IIOP_RESOURCE = "RMI_IIOPResource";
+ public static final String URL_RESOURCE = "URLResource";
+ public static final String JVM = "JVM";
+
+ // abstract name components
+ public static final String J2EE_DEPLOYABLE_OBJECT = "J2EEDeployableObject";
+ public static final String J2EE_MODULE = "J2EEModule";
+ public static final String EJB = "EJB";
+ public static final String SESSION_BEAN = "SessionBean";
+ public static final String J2EE_RESOURCE = "J2EEResource";
//used for J2EEApplication= when component is not deployed in an ear.
- public static String NULL = "null";
+ public static final String NULL = "null";
//geronimo extensions
+ // todo should these really be j2eeType or should we have a Geronimo-specific property?
+ public static final String TRANSACTION_MANAGER = "TransactionManager";
+ public static final String TRANSACTION_CONTEXT_MANAGER = "TransactionContextManager";
+ public static final String TRANSACTION_LOG = "TransactionLog";
+ public static final String XID_FACTORY = "XIDFactory";
+ public static final String XID_IMPORTER = "XIDImporter";
+ public static final String JCA_CONNECTION_TRACKER = "JCAConnectionTracker";
public static final String JCA_ADMIN_OBJECT = "JCAAdminObject";
public static final String JCA_ACTIVATION_SPEC = "JCAActivationSpec";
//TODO shouldn't we use the RESOURCE_ADAPTER string?
@@ -81,11 +87,8 @@
public static final String GERONIMO_SERVICE = "GBean"; //copied in GBeanInfoBuilder to avoid dependencies in the wrong direction.
public static final String CORBA_SERVICE = "CORBABean";
public static final String JACC_MANAGER = "JACCManager";
-
public static final String SYSTEM_LOG = "SystemLog";
-
- public static String JAXR_CONNECTION_FACTORY = "JAXRConnectionFactory";
-
+ public static final String JAXR_CONNECTION_FACTORY = "JAXRConnectionFactory";
public static final String CONFIG_BUILDER = "ConfigBuilder";
public static final String MODULE_BUILDER = "ModuleBuilder";
public static final String SECURITY_REALM = "SecurityRealm";
@@ -99,7 +102,7 @@
public static final String CONFIGURATION_ENTRY = "ConfigurationEntry";
public static final String PERSISTENT_CONFIGURATION_LIST = "PersistentConfigurationList"; //duplicated in FileConfigurationList
// public static final String URL_PATTERN = "URLPattern";
- public static String DEFAULT_SERVLET = "DefaultServlet";
+ public static final String DEFAULT_SERVLET = "DefaultServlet";
public static final String SERVLET_WEB_SERVICE_TEMPLATE = "ServletWebServiceTemplate";
public static final String CORBA_CSS = "CORBACSS";
public static final String CORBA_TSS = "CORBATSS";
@@ -169,13 +172,13 @@
if ("*".equals(serverName)) {
query = true;
} else {
- buffer.append(sep).append(J2EE_SERVER + "=").append(context.getJ2eeServerName(serverName));
+ buffer.append(sep).append(J2EE_SERVER).append("=").append(context.getJ2eeServerName(serverName));
sep = ",";
}
if ("*".equals(applicationName)) {
query = true;
} else {
- buffer.append(sep).append(J2EE_APPLICATION + "=").append(context.getJ2eeApplicationName(applicationName));
+ buffer.append(sep).append(J2EE_APPLICATION).append("=").append(context.getJ2eeApplicationName(applicationName));
sep = ",";
}
if ("*".equals(moduleName)) {
@@ -187,14 +190,14 @@
if ("*".equals(type)) {
query = true;
} else {
- buffer.append(sep).append(J2EE_TYPE + "=").append(context.getJ2eeType(type));
+ buffer.append(sep).append(J2EE_TYPE).append("=").append(context.getJ2eeType(type));
sep = ",";
}
//explicit attributes, must be included: if * then make a query
if ("*".equals(name)) {
query = true;
} else {
- buffer.append(sep).append(J2EE_NAME + "=").append(context.getJ2eeName(name));
+ buffer.append(sep).append(J2EE_NAME).append("=").append(context.getJ2eeName(name));
sep = ",";
}
//make a query, possibly
Modified: geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java (original)
+++ geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java Wed Sep 14 10:28:53 2005
@@ -238,8 +238,8 @@
connectorName = NameFactory.getWebComponentName(null, null, null, null, "jettyConnector", "WebResource", moduleContext);
// webModuleName = NameFactory.getWebComponentName(null, null, null, null, NameFactory.WEB_MODULE, "WebResource", moduleContext);
- tmName = NameFactory.getComponentName(null, null, null, null, null, "TransactionManager", NameFactory.JTA_RESOURCE, moduleContext);
- tcmName = NameFactory.getComponentName(null, null, null, null, null, "TransactionContextManager", NameFactory.JTA_RESOURCE, moduleContext);
+ tmName = NameFactory.getComponentName(null, null, null, null, null, "TransactionManager", NameFactory.TRANSACTION_MANAGER, moduleContext);
+ tcmName = NameFactory.getComponentName(null, null, null, null, null, "TransactionContextManager", NameFactory.TRANSACTION_CONTEXT_MANAGER, moduleContext);
ctcName = new ObjectName("geronimo.test:role=ConnectionTrackingCoordinator");
kernel = KernelFactory.newInstance().createKernel("foo");
Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java Wed Sep 14 10:28:53 2005
@@ -554,7 +554,7 @@
infoBuilder.addAttribute("contextPath", String.class, true);
- infoBuilder.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.JTA_RESOURCE);
+ infoBuilder.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
infoBuilder.addReference("TrackedConnectionAssociator", TrackedConnectionAssociator.class, NameFactory.JCA_CONNECTION_TRACKER);
infoBuilder.addReference("JettyContainer", JettyContainer.class, NameFactory.GERONIMO_SERVICE);
infoBuilder.addReference("RoleDesignateSource", RoleDesignateSource.class, NameFactory.JACC_MANAGER);
Modified: geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java (original)
+++ geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java Wed Sep 14 10:28:53 2005
@@ -266,8 +266,8 @@
connectorName = NameFactory.getWebComponentName(null, null, null, null, "jettyConnector", "WebResource", moduleContext);
webModuleName = NameFactory.getModuleName(null, null, null, null, "testModule", moduleContext);
- tmName = NameFactory.getComponentName(null, null, null, null, null, "TransactionManager", NameFactory.JTA_RESOURCE, moduleContext);
- tcmName = NameFactory.getComponentName(null, null, null, null, null, "TransactionContextManager", NameFactory.JTA_RESOURCE, moduleContext);
+ tmName = NameFactory.getComponentName(null, null, null, null, null, "TransactionManager", NameFactory.TRANSACTION_MANAGER, moduleContext);
+ tcmName = NameFactory.getComponentName(null, null, null, null, null, "TransactionContextManager", NameFactory.TRANSACTION_CONTEXT_MANAGER, moduleContext);
ctcName = new ObjectName("geronimo.test:role=ConnectionTrackingCoordinator");
kernel = KernelFactory.newInstance().createKernel("test.kernel");
Modified: geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java (original)
+++ geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java Wed Sep 14 10:28:53 2005
@@ -56,7 +56,7 @@
infoFactory.addReference("ManagedConnectionFactoryWrapper", ManagedConnectionFactoryWrapper.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
- infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.JTA_RESOURCE);
+ infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
infoFactory.addReference("DerbySystem", Serializable.class, NameFactory.GERONIMO_SERVICE);
infoFactory.addAttribute("kernel", Kernel.class, false);
Modified: geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java (original)
+++ geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java Wed Sep 14 10:28:53 2005
@@ -59,7 +59,7 @@
infoFactory.addInterface(PersistentTimer.class);
infoFactory.addAttribute("repeatCount", int.class, true);
- infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.JTA_RESOURCE);
+ infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
infoFactory.addReference("ManagedConnectionFactoryWrapper", ManagedConnectionFactoryWrapper.class, NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
infoFactory.addReference("DerbySystem", Serializable.class, NameFactory.GERONIMO_SERVICE);
Modified: geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledNonTransactionalTimer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledNonTransactionalTimer.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledNonTransactionalTimer.java (original)
+++ geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledNonTransactionalTimer.java Wed Sep 14 10:28:53 2005
@@ -47,7 +47,7 @@
infoFactory.addInterface(PersistentTimer.class);
infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
- infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.JTA_RESOURCE);
+ infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
infoFactory.setConstructor(new String[] {"TransactionContextManager", "ThreadPool"});
GBEAN_INFO = infoFactory.getBeanInfo();
Modified: geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledTransactionalTimer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledTransactionalTimer.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledTransactionalTimer.java (original)
+++ geronimo/trunk/modules/timer/src/java/org/apache/geronimo/timer/vm/VMStoreThreadPooledTransactionalTimer.java Wed Sep 14 10:28:53 2005
@@ -49,7 +49,7 @@
infoFactory.addInterface(PersistentTimer.class);
infoFactory.addAttribute("repeatCount", int.class, true);
- infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.JTA_RESOURCE);
+ infoFactory.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
infoFactory.setConstructor(new String[] {"repeatCount", "TransactionContextManager", "ThreadPool"});
Modified: geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java (original)
+++ geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java Wed Sep 14 10:28:53 2005
@@ -340,9 +340,9 @@
"tomcatHost", "WebResource", moduleContext);
tmName = NameFactory.getComponentName(null, null, null, null, null,
- "TransactionManager", NameFactory.JTA_RESOURCE, moduleContext);
+ "TransactionManager", NameFactory.TRANSACTION_MANAGER, moduleContext);
tcmName = NameFactory.getComponentName(null, null, null, null, null,
- "TransactionContextManager", NameFactory.JTA_RESOURCE,
+ "TransactionContextManager", NameFactory.TRANSACTION_CONTEXT_MANAGER,
moduleContext);
ctcName = new ObjectName(
"geronimo.server:role=ConnectionTrackingCoordinator");
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java Wed Sep 14 10:28:53 2005
@@ -416,17 +416,12 @@
infoBuilder.addAttribute("componentContext", Map.class, true);
infoBuilder.addAttribute("unshareableResources", Set.class, true);
infoBuilder.addAttribute("applicationManagedSecurityResources", Set.class, true);
- infoBuilder.addAttribute("userTransaction",
- OnlineUserTransaction.class, true);
- infoBuilder.addReference("TransactionContextManager",
- TransactionContextManager.class, NameFactory.JTA_RESOURCE);
- infoBuilder.addReference("TrackedConnectionAssociator",
- TrackedConnectionAssociator.class, NameFactory.JCA_CONNECTION_TRACKER);
+ infoBuilder.addAttribute("userTransaction", OnlineUserTransaction.class, true);
+ infoBuilder.addReference("TransactionContextManager", TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
+ infoBuilder.addReference("TrackedConnectionAssociator", TrackedConnectionAssociator.class, NameFactory.JCA_CONNECTION_TRACKER);
- infoBuilder.addReference("Container", TomcatContainer.class,
- NameFactory.GERONIMO_SERVICE);
- infoBuilder.addReference("RoleDesignateSource",
- RoleDesignateSource.class, NameFactory.JACC_MANAGER);
+ infoBuilder.addReference("Container", TomcatContainer.class, NameFactory.GERONIMO_SERVICE);
+ infoBuilder.addReference("RoleDesignateSource", RoleDesignateSource.class, NameFactory.JACC_MANAGER);
infoBuilder.addReference("TomcatRealm", ObjectRetriever.class);
infoBuilder.addReference("TomcatValveChain", ValveGBean.class);
infoBuilder.addAttribute("crossContext", boolean.class, true);
Modified: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original)
+++ geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Wed Sep 14 10:28:53 2005
@@ -318,8 +318,8 @@
hostName = NameFactory.getWebComponentName(null, null, null, null, "tomcatHost", "WebResource", moduleContext);
webModuleName = NameFactory.getModuleName(null, null, null, null, "testModule", moduleContext);
- tmName = NameFactory.getComponentName(null, null, null, null, "TransactionManager", NameFactory.JTA_RESOURCE, moduleContext);
- tcmName = NameFactory.getComponentName(null, null, null, null, "TransactionContextManager", NameFactory.JTA_RESOURCE, moduleContext);
+ tmName = NameFactory.getComponentName(null, null, null, null, "TransactionManager", NameFactory.TRANSACTION_MANAGER, moduleContext);
+ tcmName = NameFactory.getComponentName(null, null, null, null, "TransactionContextManager", NameFactory.TRANSACTION_CONTEXT_MANAGER, moduleContext);
ctcName = new ObjectName("geronimo.test:role=ConnectionTrackingCoordinator");
Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/TransactionContextManagerGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/TransactionContextManagerGBean.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/TransactionContextManagerGBean.java (original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/TransactionContextManagerGBean.java Wed Sep 14 10:28:53 2005
@@ -36,7 +36,7 @@
public static final GBeanInfo GBEAN_INFO;
static {
- GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(TransactionContextManager.class, NameFactory.JTA_RESOURCE);
+ GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(TransactionContextManager.class, NameFactory.TRANSACTION_CONTEXT_MANAGER);
infoFactory.addOperation("getTransactionManager");
infoFactory.addOperation("getContext");
@@ -50,8 +50,8 @@
infoFactory.addOperation("setRollbackOnly");
infoFactory.addOperation("setTransactionTimeout", new Class[] {int.class});
- infoFactory.addReference("TransactionManager", ExtendedTransactionManager.class, NameFactory.JTA_RESOURCE);
- infoFactory.addReference("XidImporter", XidImporter.class, NameFactory.JTA_RESOURCE);
+ infoFactory.addReference("TransactionManager", ExtendedTransactionManager.class, NameFactory.TRANSACTION_MANAGER);
+ infoFactory.addReference("XidImporter", XidImporter.class, NameFactory.TRANSACTION_MANAGER);
infoFactory.addInterface(XATerminator.class);
infoFactory.addInterface(XAWork.class);
Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java (original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/log/HOWLLog.java Wed Sep 14 10:28:53 2005
@@ -394,7 +394,7 @@
public static final GBeanInfo GBEAN_INFO;
static {
- GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(HOWLLog.class, NameFactory.JTA_RESOURCE);
+ GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(HOWLLog.class, NameFactory.TRANSACTION_LOG);
infoFactory.addAttribute("bufferClassName", String.class, true);
infoFactory.addAttribute("bufferSizeKBytes", Integer.TYPE, true);
infoFactory.addAttribute("checksumEnabled", Boolean.TYPE, true);
@@ -408,7 +408,7 @@
infoFactory.addAttribute("minBuffers", Integer.TYPE, true);
infoFactory.addAttribute("threadsWaitingForceThreshold", Integer.TYPE, true);
- infoFactory.addReference("XidFactory", XidFactory.class, NameFactory.JTA_RESOURCE);
+ infoFactory.addReference("XidFactory", XidFactory.class, NameFactory.XID_FACTORY);
infoFactory.addReference("ServerInfo", ServerInfo.class, NameFactory.GERONIMO_SERVICE);
infoFactory.addInterface(TransactionLog.class);
Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java (original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/TransactionManagerImplGBean.java Wed Sep 14 10:28:53 2005
@@ -71,10 +71,10 @@
public static final GBeanInfo GBEAN_INFO;
static {
- GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder(TransactionManagerImplGBean.class, NameFactory.JTA_RESOURCE);
+ GBeanInfoBuilder infoBuilder = new GBeanInfoBuilder(TransactionManagerImplGBean.class, NameFactory.TRANSACTION_MANAGER);
infoBuilder.addAttribute("defaultTransactionTimeoutSeconds", int.class, true);
- infoBuilder.addReference("TransactionLog", TransactionLog.class, NameFactory.JTA_RESOURCE);
+ infoBuilder.addReference("TransactionLog", TransactionLog.class, NameFactory.TRANSACTION_LOG);
infoBuilder.addReference("ResourceManagers", ResourceManager.class);//two kinds of things, so specify the type in each pattern.
infoBuilder.addInterface(ExtendedTransactionManager.class);
Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java?rev=280889&r1=280888&r2=280889&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java (original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/manager/XidFactoryImplGBean.java Wed Sep 14 10:28:53 2005
@@ -29,7 +29,7 @@
public static final GBeanInfo GBEAN_INFO;
static {
- GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(XidFactoryImplGBean.class, NameFactory.JTA_RESOURCE);
+ GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(XidFactoryImplGBean.class, NameFactory.XID_FACTORY);
infoFactory.addInterface(XidFactory.class);
GBEAN_INFO = infoFactory.getBeanInfo();
}