You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2004/07/15 05:25:36 UTC
cvs commit: incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction GeronimoTransactionManager.java
djencks 2004/07/14 20:25:36
Modified: modules/assembly/src/plan j2ee-server-plan.xml
modules/connector/src/java/org/apache/geronimo/connector
ActivationSpecWrapper.java
modules/connector/src/java/org/apache/geronimo/connector/work
GeronimoWorkManager.java
modules/connector/src/test-data/connector_1_5
geronimo-ra.xml
modules/transaction/src/java/org/apache/geronimo/transaction
GeronimoTransactionManager.java
Log:
Attribute/Reference name case corrections
Revision Changes Path
1.36 +17 -7 incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml
Index: j2ee-server-plan.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- j2ee-server-plan.xml 12 Jul 2004 06:07:50 -0000 1.35
+++ j2ee-server-plan.xml 15 Jul 2004 03:25:35 -0000 1.36
@@ -111,14 +111,20 @@
<attribute name="policyConfigurationFactory" type="java.lang.String">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
<reference name="Realms">geronimo.security:type=SecurityRealm,*</reference>
</gbean>
-
+
<gbean name="geronimo.security:type=LoginService" class="org.apache.geronimo.security.jaas.LoginService">
<reference name="Realms">geronimo.security:type=SecurityRealm,*</reference>
<attribute name="reclaimPeriod" type="long">100000</attribute>
<attribute name="algorithm" type="java.lang.String">HmacSHA1</attribute>
<attribute name="password" type="java.lang.String">secret</attribute>
</gbean>
-
+
+ <gbean name="geronimo.server:type=ThreadPool,name=DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
+ <attribute name="keepAliveTime" type="long">5000</attribute>
+ <attribute name="poolSize" type="int">10</attribute>
+ <attribute name="poolName" type="java.lang.String">DefaultThreadPool</attribute>
+ </gbean>
+
<gbean name="geronimo.server:type=ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator">
</gbean>
@@ -126,7 +132,7 @@
<attribute name="syncMaximumPoolSize" type="int">10</attribute>
<attribute name="startMaximumPoolSize" type="int">10</attribute>
<attribute name="scheduledMaximumPoolSize" type="int">10</attribute>
- <reference name="xaServices">geronimo.server:type=TransactionManager</reference>
+ <reference name="XAServices">geronimo.server:type=TransactionManager</reference>
</gbean>
<gbean name="geronimo.server:type=HOWLTransactionLog" class="org.apache.geronimo.transaction.log.HOWLLog">
@@ -153,6 +159,10 @@
</references>
</gbean>
+ <gbean name="geronimo.server:type=TransactionContextManager" class="org.apache.geronimo.transaction.context.TransactionContextManager">
+ <reference name="TransactionManager">geronimo.server:type=TransactionManager</reference>
+ </gbean>
+
<!-- default WAR container using Jetty -->
<gbean name="geronimo.server:type=WebContainer,container=Jetty" class="org.apache.geronimo.jetty.JettyContainerImpl">
@@ -177,13 +187,13 @@
<!-- EJB Protocol -->
<gbean name="openejb:type=SocketService,name=EJB" class="org.openejb.server.SimpleSocketService">
- <attribute name="ServiceClassName" type="java.lang.String">org.openejb.server.ejbd.EjbServer</attribute>
- <attribute name="OnlyFrom" type="java.net.InetAddress[]">127.0.0.1</attribute>
+ <attribute name="serviceClassName" type="java.lang.String">org.openejb.server.ejbd.EjbServer</attribute>
+ <attribute name="onlyFrom" type="java.net.InetAddress[]">127.0.0.1</attribute>
<reference name="ContainerIndex">openejb:type=ContainerIndex</reference>
</gbean>
<gbean name="openejb:type=ServiceDaemon,name=EJB" class="org.openejb.server.ServiceDaemon">
- <attribute name="Port" type="int">4201</attribute>
- <attribute name="InetAddress" type="java.net.InetAddress">127.0.0.1</attribute>
+ <attribute name="port" type="int">4201</attribute>
+ <attribute name="inetAddress" type="java.net.InetAddress">127.0.0.1</attribute>
<reference name="SocketService">openejb:type=SocketService,name=EJB</reference>
</gbean>
1.2 +3 -3 incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/ActivationSpecWrapper.java
Index: ActivationSpecWrapper.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/ActivationSpecWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ActivationSpecWrapper.java 25 Jun 2004 21:33:26 -0000 1.1
+++ ActivationSpecWrapper.java 15 Jul 2004 03:25:36 -0000 1.2
@@ -177,7 +177,7 @@
infoFactory.addAttribute("activationSpecClass", Class.class, true);
infoFactory.addAttribute("containerId", String.class, true);
- infoFactory.addReference("resourceAdapterWrapper", ResourceAdapterWrapper.class);
+ infoFactory.addReference("ResourceAdapterWrapper", ResourceAdapterWrapper.class);
infoFactory.addOperation("activate", new Class[] {MessageEndpointFactory.class});
infoFactory.addOperation("deactivate", new Class[] {MessageEndpointFactory.class});
@@ -187,7 +187,7 @@
infoFactory.setConstructor(new String[]{
"activationSpecClass",
"containerId",
- "resourceAdapterWrapper"});
+ "ResourceAdapterWrapper"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
1.10 +3 -3 incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/work/GeronimoWorkManager.java
Index: GeronimoWorkManager.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/work/GeronimoWorkManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- GeronimoWorkManager.java 11 Jul 2004 21:55:34 -0000 1.9
+++ GeronimoWorkManager.java 15 Jul 2004 03:25:36 -0000 1.10
@@ -262,13 +262,13 @@
infoFactory.addOperation("getXATerminator");
- infoFactory.addReference("xaServices", XAServices.class);
+ infoFactory.addReference("XAServices", XAServices.class);
infoFactory.setConstructor(new String[]{
"syncMaximumPoolSize",
"startMaximumPoolSize",
"scheduledMaximumPoolSize",
- "xaServices"});
+ "XAServices"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
1.22 +1 -1 incubator-geronimo/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml
Index: geronimo-ra.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- geronimo-ra.xml 12 Jul 2004 06:07:50 -0000 1.21
+++ geronimo-ra.xml 15 Jul 2004 03:25:36 -0000 1.22
@@ -108,7 +108,7 @@
<attribute name="syncMaximumPoolSize" type="int">10</attribute>
<attribute name="startMaximumPoolSize" type="int">10</attribute>
<attribute name="scheduledMaximumPoolSize" type="int">10</attribute>
- <reference name="xaServices">geronimo.server:type=TransactionManager</reference>
+ <reference name="XAServices">geronimo.server:type=TransactionManager</reference>
</gbean>
<gbean name="geronimo.server:type=TransactionManager" class="org.apache.geronimo.transaction.GeronimoTransactionManager">
1.3 +4 -4 incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/GeronimoTransactionManager.java
Index: GeronimoTransactionManager.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/transaction/src/java/org/apache/geronimo/transaction/GeronimoTransactionManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GeronimoTransactionManager.java 20 Jun 2004 07:40:15 -0000 1.2
+++ GeronimoTransactionManager.java 15 Jul 2004 03:25:36 -0000 1.3
@@ -67,8 +67,8 @@
static {
GBeanInfoFactory infoFactory = new GBeanInfoFactory(GeronimoTransactionManager.class);
- infoFactory.addReference("transactionLog", TransactionLog.class);
- infoFactory.addReference("resourceManagers", ResourceManager.class);
+ infoFactory.addReference("TransactionLog", TransactionLog.class);
+ infoFactory.addReference("ResourceManagers", ResourceManager.class);
infoFactory.addOperation("setTransactionTimeout", new Class[]{int.class});
infoFactory.addOperation("begin");
@@ -80,7 +80,7 @@
infoFactory.addOperation("rollback");
infoFactory.addOperation("setRollbackOnly");
- infoFactory.setConstructor(new String[]{"transactionLog", "resourceManagers"});
+ infoFactory.setConstructor(new String[]{"TransactionLog", "ResourceManagers"});
GBEAN_INFO = infoFactory.getBeanInfo();
}