geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r552073 [1/2] - in /geronimo/server/trunk: assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/ assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/ assemblies/geronimo-jetty6-jee5/ assemblies/geronimo-jetty...
Date Sat, 30 Jun 2007 01:10:53 GMT
Author: djencks
Date: Fri Jun 29 18:10:51 2007
New Revision: 552073

URL: http://svn.apache.org/viewvc?view=rev&rev=552073
Log:
GERONIMO-3272 eliminate the geronimo-transaction-jta11 module, we are entirely on jta11 now.  Also refix logging error for non-NamedXAResource.  Also make jpa stuff use spec interfaces and not drag ejb spec into the tm

Added:
    geronimo/server/trunk/configs/transaction/
    geronimo/server/trunk/configs/transaction/LICENSE.txt   (with props)
    geronimo/server/trunk/configs/transaction/NOTICE.txt   (with props)
    geronimo/server/trunk/configs/transaction/pom.xml   (with props)
    geronimo/server/trunk/configs/transaction/src/
    geronimo/server/trunk/configs/transaction/src/plan/
    geronimo/server/trunk/configs/transaction/src/plan/plan.xml   (with props)
    geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/TransactionSynchronizationRegistryTest.java   (contents, props changed)
      - copied, changed from r551734, geronimo/server/trunk/modules/geronimo-transaction-jta11/src/test/java/org/apache/geronimo/transaction/jta11/TransactionSynchronizationRegistryTest.java
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml   (with props)
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/src/main/
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/src/main/resources/
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/src/main/resources/jca-cms-rar.xml   (with props)
Removed:
    geronimo/server/trunk/configs/transaction-jta11/
    geronimo/server/trunk/modules/geronimo-transaction-jta11/
Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/client_artifact_aliases.properties
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/artifact_aliases.properties
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/artifact_aliases.properties
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
    geronimo/server/trunk/configs/axis2/pom.xml
    geronimo/server/trunk/configs/client-transaction/pom.xml
    geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml
    geronimo/server/trunk/configs/connector-deployer/pom.xml
    geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/cxf/pom.xml
    geronimo/server/trunk/configs/jasper/pom.xml
    geronimo/server/trunk/configs/jetty6/pom.xml
    geronimo/server/trunk/configs/openejb/pom.xml
    geronimo/server/trunk/configs/openjpa/pom.xml
    geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml
    geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/configs/system-database/pom.xml
    geronimo/server/trunk/configs/tomcat6/pom.xml
    geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerTxScoped.java
    geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/EntityManagerWrapper.java
    geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/InternalCMPEntityManagerExtended.java
    geronimo/server/trunk/modules/geronimo-transaction/pom.xml
    geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
    geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
    geronimo/server/trunk/modules/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/java/org/apache/geronimo/itest/TestServlet.java
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/web.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/client_artifact_aliases.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/client_artifact_aliases.properties?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/client_artifact_aliases.properties (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/client_artifact_aliases.properties Fri Jun 29 18:10:51 2007
@@ -22,4 +22,4 @@
 #the next 2 lines allow running the webservices-common config on the client
 org.apache.geronimo.configs/j2ee-security//car=org.apache.geronimo.configs/client-security/${version}/car
 org.apache.geronimo.configs/j2ee-server//car=org.apache.geronimo.configs/client/${version}/car
-org.apache.geronimo.configs/transaction-jta11//car=org.apache.geronimo.configs/client-transaction/${version}/car
+org.apache.geronimo.configs/transaction//car=org.apache.geronimo.configs/client-transaction/${version}/car

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/artifact_aliases.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/artifact_aliases.properties?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/artifact_aliases.properties (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/artifact_aliases.properties Fri Jun 29 18:10:51 2007
@@ -16,6 +16,6 @@
 #=====================================================================
 #You can use this file to indicate that you want to substitute one module for another.
 #format is oldartifactid=newartifactId e.g.
-#org.apache.geronimo.configs/transaction//car=org.apache.geronimo.configs/transaction-jta11/1.2-SNAPSHOT/car
+#org.apache.geronimo.configs/transaction//car=org.apache.geronimo.configs/transaction/1.2-SNAPSHOT/car
 #versions can be ommitted on the left side but not the right.
 #This can also specify explicit versions in the same format.

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml Fri Jun 29 18:10:51 2007
@@ -83,7 +83,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-jta11</artifactId>
+            <artifactId>transaction</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/artifact_aliases.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/artifact_aliases.properties?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/artifact_aliases.properties (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/artifact_aliases.properties Fri Jun 29 18:10:51 2007
@@ -19,7 +19,6 @@
 ## $Rev$ $Date$
 ##
 
-org.apache.geronimo.configs/transaction//car=org.apache.geronimo.configs/transaction-jta11/${version}/car
 org.apache.geronimo.configs/jetty//car=org.apache.geronimo.configs/jetty6/${version}/car
 org.apache.geronimo.configs/jetty-deployer//car=org.apache.geronimo.configs/jetty6-deployer/${version}/car
 

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml Fri Jun 29 18:10:51 2007
@@ -42,7 +42,7 @@
 
     <module name="org.apache.geronimo.configs/j2ee-server/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/transaction-jta11/${version}/car"/>
+    <module name="org.apache.geronimo.configs/transaction/${version}/car"/>
 
     <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JaasLoginServiceRemotingServer">

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/config.xml Fri Jun 29 18:10:51 2007
@@ -40,7 +40,7 @@
     
     <module name="org.apache.geronimo.configs/j2ee-server/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/transaction-jta11/${version}/car"/>
+    <module name="org.apache.geronimo.configs/transaction/${version}/car"/>
 
     <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JaasLoginServiceRemotingServer">

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml Fri Jun 29 18:10:51 2007
@@ -83,7 +83,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-jta11</artifactId>
+            <artifactId>transaction</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml Fri Jun 29 18:10:51 2007
@@ -42,7 +42,7 @@
 
     <module name="org.apache.geronimo.configs/j2ee-server/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/transaction-jta11/${version}/car"/>
+    <module name="org.apache.geronimo.configs/transaction/${version}/car"/>
 
     <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JaasLoginServiceRemotingServer">

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/config.xml Fri Jun 29 18:10:51 2007
@@ -40,7 +40,7 @@
     
     <module name="org.apache.geronimo.configs/j2ee-server/${version}/car"/>
 
-    <module name="org.apache.geronimo.configs/transaction-jta11/${version}/car"/>
+    <module name="org.apache.geronimo.configs/transaction/${version}/car"/>
 
     <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
         <gbean name="JaasLoginServiceRemotingServer">

Modified: geronimo/server/trunk/configs/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2/pom.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/configs/axis2/pom.xml (original)
+++ geronimo/server/trunk/configs/axis2/pom.xml Fri Jun 29 18:10:51 2007
@@ -65,7 +65,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-jta11</artifactId>
+            <artifactId>transaction</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/configs/client-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-transaction/pom.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/configs/client-transaction/pom.xml (original)
+++ geronimo/server/trunk/configs/client-transaction/pom.xml Fri Jun 29 18:10:51 2007
@@ -65,7 +65,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-transaction-jta11</artifactId>
+            <artifactId>geronimo-transaction</artifactId>
             <version>${version}</version>
         </dependency>
 

Modified: geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml Fri Jun 29 18:10:51 2007
@@ -48,7 +48,7 @@
         <attribute name="tmId">71,84,77,73,68</attribute>
     </gbean>
 
-    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.jta11.GeronimoTransactionManagerJTA11GBean">
+    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean">
         <!--no transaction log on the client-->
         <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
         <reference name="XidFactory">

Modified: geronimo/server/trunk/configs/connector-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/connector-deployer/pom.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/configs/connector-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/connector-deployer/pom.xml Fri Jun 29 18:10:51 2007
@@ -44,7 +44,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-jta11</artifactId>
+            <artifactId>transaction</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>runtime</scope>

Modified: geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml Fri Jun 29 18:10:51 2007
@@ -35,7 +35,7 @@
                 <dependencies>
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
-                        <artifactId>transaction-jta11</artifactId>
+                        <artifactId>transaction</artifactId>
                         <type>car</type>
                     </dependency>
                     <dependency>

Modified: geronimo/server/trunk/configs/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf/pom.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/configs/cxf/pom.xml (original)
+++ geronimo/server/trunk/configs/cxf/pom.xml Fri Jun 29 18:10:51 2007
@@ -65,7 +65,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-jta11</artifactId>
+            <artifactId>transaction</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/configs/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jasper/pom.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/configs/jasper/pom.xml (original)
+++ geronimo/server/trunk/configs/jasper/pom.xml Fri Jun 29 18:10:51 2007
@@ -51,7 +51,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-jta11</artifactId>
+            <artifactId>transaction</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/configs/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6/pom.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/configs/jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty6/pom.xml Fri Jun 29 18:10:51 2007
@@ -51,7 +51,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-jta11</artifactId>
+            <artifactId>transaction</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb/pom.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/configs/openejb/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb/pom.xml Fri Jun 29 18:10:51 2007
@@ -51,7 +51,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-jta11</artifactId>
+            <artifactId>transaction</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/configs/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openjpa/pom.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/configs/openjpa/pom.xml (original)
+++ geronimo/server/trunk/configs/openjpa/pom.xml Fri Jun 29 18:10:51 2007
@@ -57,7 +57,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-jta11</artifactId>
+            <artifactId>transaction</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml Fri Jun 29 18:10:51 2007
@@ -55,7 +55,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-jta11</artifactId>
+            <artifactId>transaction</artifactId>
             <type>car</type>
             <version>${version}</version>
             <scope>runtime</scope>

Modified: geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml Fri Jun 29 18:10:51 2007
@@ -42,7 +42,7 @@
             </environment>
         </xml-attribute>
     </gbean>
-    <!-- TODO possibly the ref builders only need a dependency on transaction-jta11 -->
+    <!-- TODO possibly the ref builders only need a dependency on transaction -->
     <gbean name="PersistenceContextRefBuilder" class="org.apache.geronimo.persistence.builder.PersistenceContextRefBuilder">
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Fri Jun 29 18:10:51 2007
@@ -187,7 +187,7 @@
         <module>jetty6-deployer</module>
         <module>myfaces</module>
         <module>myfaces-deployer</module>
-        <module>transaction-jta11</module>
+        <module>transaction</module>
         <module>uddi-jetty6</module>
         <module>webconsole-jetty6</module>
         <module>webservices-common</module>

Modified: geronimo/server/trunk/configs/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/system-database/pom.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/configs/system-database/pom.xml (original)
+++ geronimo/server/trunk/configs/system-database/pom.xml Fri Jun 29 18:10:51 2007
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-jta11</artifactId>
+            <artifactId>transaction</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/configs/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat6/pom.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/configs/tomcat6/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat6/pom.xml Fri Jun 29 18:10:51 2007
@@ -51,7 +51,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-jta11</artifactId>
+            <artifactId>transaction</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Added: geronimo/server/trunk/configs/transaction/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction/LICENSE.txt?view=auto&rev=552073
==============================================================================
--- geronimo/server/trunk/configs/transaction/LICENSE.txt (added)
+++ geronimo/server/trunk/configs/transaction/LICENSE.txt Fri Jun 29 18:10:51 2007
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

Propchange: geronimo/server/trunk/configs/transaction/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/transaction/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/transaction/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/configs/transaction/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction/NOTICE.txt?view=auto&rev=552073
==============================================================================
--- geronimo/server/trunk/configs/transaction/NOTICE.txt (added)
+++ geronimo/server/trunk/configs/transaction/NOTICE.txt Fri Jun 29 18:10:51 2007
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/server/trunk/configs/transaction/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/transaction/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/transaction/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/configs/transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction/pom.xml?view=auto&rev=552073
==============================================================================
--- geronimo/server/trunk/configs/transaction/pom.xml (added)
+++ geronimo/server/trunk/configs/transaction/pom.xml Fri Jun 29 18:10:51 2007
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>transaction</artifactId>
+    <name>Geronimo Configs :: Transaction Manager (JTA11)</name>
+    <packaging>car</packaging>
+    
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-security</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <!-- ThreadPool -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-core</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-persistence-jpa10</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transformer</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.objectweb.howl</groupId>
+            <artifactId>howl</artifactId>
+        </dependency>
+
+    </dependencies>
+    
+</project>

Propchange: geronimo/server/trunk/configs/transaction/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/transaction/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/transaction/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/configs/transaction/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/transaction/src/plan/plan.xml?view=auto&rev=552073
==============================================================================
--- geronimo/server/trunk/configs/transaction/src/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/transaction/src/plan/plan.xml Fri Jun 29 18:10:51 2007
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+        <attribute name="lazyConnect">true</attribute>
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
+    </gbean>
+
+    <gbean name="ConnectorThreadPool" class="org.apache.geronimo.pool.ThreadPool">
+        <attribute name="keepAliveTime">5000</attribute>
+        <attribute name="poolSize">30</attribute>
+        <attribute name="poolName">ConnectorThreadPool</attribute>
+    </gbean>
+
+    <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
+        <reference name="SyncPool">
+            <name>ConnectorThreadPool</name>
+        </reference>
+        <reference name="StartPool">
+            <name>ConnectorThreadPool</name>
+        </reference>
+        <reference name="ScheduledPool">
+            <name>ConnectorThreadPool</name>
+        </reference>
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
+    </gbean>
+
+    <gbean name="HOWLTransactionLog" class="org.apache.geronimo.transaction.log.HOWLLogGBean">
+        <attribute name="bufferClassName">org.objectweb.howl.log.BlockLogBuffer</attribute>
+        <attribute name="bufferSizeKBytes">32</attribute>
+        <attribute name="checksumEnabled">true</attribute>
+        <attribute name="adler32Checksum">true</attribute>
+        <attribute name="flushSleepTimeMilliseconds">50</attribute>
+        <attribute name="logFileDir">var/txlog</attribute>
+        <attribute name="logFileExt">log</attribute>
+        <attribute name="logFileName">howl</attribute>
+        <attribute name="maxBlocksPerFile">-1</attribute>
+        <attribute name="maxBuffers">0</attribute>
+        <attribute name="maxLogFiles">2</attribute>
+        <attribute name="minBuffers">4</attribute>
+        <attribute name="threadsWaitingForceThreshold">-1</attribute>
+        <reference name="XidFactory">
+            <name>XidFactory</name>
+        </reference>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+
+    <gbean name="XidFactory" class="org.apache.geronimo.transaction.manager.XidFactoryImplGBean">
+        <attribute name="tmId">71,84,77,73,68</attribute>
+    </gbean>
+
+    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean">
+        <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
+        <reference name="XidFactory">
+            <name>XidFactory</name>
+        </reference>
+        <reference name="TransactionLog">
+            <name>HOWLTransactionLog</name>
+        </reference>
+    </gbean>
+
+    <gbean name="TransactionManagerBinding" class="org.apache.geronimo.gjndi.binding.GBeanBinding">
+        <attribute name="name">TransactionManager</attribute>
+        <attribute name="abstractNameQuery">?name=TransactionManager#</attribute>
+        <reference name="Context">
+            <name>JavaContext</name>
+        </reference>
+    </gbean>
+    <gbean name="TransactionSynchronizationRegistryBinding" class="org.apache.geronimo.gjndi.binding.GBeanBinding">
+        <attribute name="name">TransactionSynchronizationRegistry</attribute>
+        <attribute name="abstractNameQuery">?name=TransactionManager#</attribute>
+        <reference name="Context">
+            <name>JavaContext</name>
+        </reference>
+    </gbean>
+
+</module>

Propchange: geronimo/server/trunk/configs/transaction/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/configs/transaction/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/configs/transaction/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerTxScoped.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerTxScoped.java?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerTxScoped.java (original)
+++ geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/CMPEntityManagerTxScoped.java Fri Jun 29 18:10:51 2007
@@ -19,17 +19,11 @@
 
 import java.util.Map;
 
-import javax.persistence.EntityManager;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-import javax.persistence.EntityTransaction;
-import javax.persistence.EntityManagerFactory;
+import javax.persistence.*;
 import javax.persistence.TransactionRequiredException;
-import javax.transaction.Status;
-
-import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
+import javax.transaction.*;
 import org.apache.geronimo.transaction.manager.TransactionImpl;
+import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
 
 /**
  * @version $Rev$ $Date$
@@ -56,11 +50,18 @@
         if (transaction == null) {
             return null;
         }
-        EntityManagerWrapper entityManagerWrapper = (EntityManagerWrapper) transaction.getEntityManager(persistenceUnit);
+        EntityManagerWrapper entityManagerWrapper = (EntityManagerWrapper) transactionManager.getResource(persistenceUnit);
         if (entityManagerWrapper == null) {
             EntityManager entityManager = createEntityManager();
             entityManagerWrapper = new EntityManagerWrapperTxScoped(entityManager);
-            transaction.setEntityManager(persistenceUnit, entityManagerWrapper);
+            transactionManager.putResource(persistenceUnit, entityManagerWrapper);
+            try {
+                transaction.registerSynchronization(entityManagerWrapper);
+            } catch (javax.transaction.RollbackException e) {
+                throw (TransactionRequiredException) new TransactionRequiredException("No active transaction").initCause(e);
+            } catch (SystemException e) {
+                throw (TransactionRequiredException) new TransactionRequiredException("No active transaction").initCause(e);
+            }
         }
         return entityManagerWrapper.getEntityManager();
     }
@@ -90,7 +91,7 @@
         }
     }
 
-    public <T>T merge(T t) {
+    public <T> T merge(T t) {
         EntityManager entityManager = getEntityManager(true);
         if (entityManager != null) {
             return entityManager.merge(t);
@@ -118,7 +119,7 @@
         }
     }
 
-    public <T>T find(Class<T> aClass, Object o) {
+    public <T> T find(Class<T> aClass, Object o) {
         EntityManager entityManager = getEntityManager(false);
         if (entityManager != null) {
             return entityManager.find(aClass, o);
@@ -132,7 +133,7 @@
         }
     }
 
-    public <T>T getReference(Class<T> aClass, Object o) {
+    public <T> T getReference(Class<T> aClass, Object o) {
         EntityManager entityManager = getEntityManager(false);
         if (entityManager != null) {
             return entityManager.getReference(aClass, o);
@@ -163,11 +164,11 @@
     public void setFlushMode(FlushModeType flushModeType) {
         EntityManager entityManager = getEntityManager(false);
         if (entityManager != null) {
-             entityManager.setFlushMode(flushModeType);
+            entityManager.setFlushMode(flushModeType);
         } else {
             entityManager = createEntityManager();
             try {
-                 entityManager.setFlushMode(flushModeType);
+                entityManager.setFlushMode(flushModeType);
             } finally {
                 entityManager.close();
             }
@@ -191,11 +192,11 @@
     public void lock(Object o, LockModeType lockModeType) {
         EntityManager entityManager = getEntityManager(false);
         if (entityManager != null) {
-             entityManager.lock(o, lockModeType);
+            entityManager.lock(o, lockModeType);
         } else {
             entityManager = createEntityManager();
             try {
-                 entityManager.lock(o, lockModeType);
+                entityManager.lock(o, lockModeType);
             } finally {
                 entityManager.close();
             }
@@ -205,11 +206,11 @@
     public void refresh(Object o) {
         EntityManager entityManager = getEntityManager(true);
         if (entityManager != null) {
-             entityManager.refresh(o);
+            entityManager.refresh(o);
         } else {
             entityManager = createEntityManager();
             try {
-                 entityManager.refresh(o);
+                entityManager.refresh(o);
             } finally {
                 entityManager.close();
             }
@@ -219,11 +220,11 @@
     public void clear() {
         EntityManager entityManager = getEntityManager(false);
         if (entityManager != null) {
-             entityManager.clear();
+            entityManager.clear();
         } else {
             entityManager = createEntityManager();
             try {
-                 entityManager.clear();
+                entityManager.clear();
             } finally {
                 entityManager.close();
             }
@@ -324,7 +325,7 @@
         }
     }
 
-    private static class EntityManagerWrapperTxScoped implements EntityManagerWrapper {
+    private static class EntityManagerWrapperTxScoped implements EntityManagerWrapper, Synchronization {
         private final EntityManager entityManager;
 
         public EntityManagerWrapperTxScoped(EntityManager entityManager) {
@@ -335,11 +336,18 @@
         }
 
         public void close() {
-                entityManager.close();
+            entityManager.close();
         }
 
         public EntityManager getEntityManager() {
             return entityManager;
+        }
+
+        public void beforeCompletion() {
+        }
+
+        public void afterCompletion(int i) {
+            close();
         }
     }
 }

Modified: geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/EntityManagerWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/EntityManagerWrapper.java?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/EntityManagerWrapper.java (original)
+++ geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/EntityManagerWrapper.java Fri Jun 29 18:10:51 2007
@@ -18,13 +18,14 @@
 package org.apache.geronimo.persistence;
 
 import javax.persistence.EntityManager;
+import javax.transaction.Synchronization;
 
 import org.apache.geronimo.transaction.manager.Closeable;
 
 /**
  * @version $Rev$ $Date$
  */
-public interface EntityManagerWrapper extends Closeable {
+public interface EntityManagerWrapper extends Synchronization {
 
     EntityManager getEntityManager();
     

Modified: geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/InternalCMPEntityManagerExtended.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/InternalCMPEntityManagerExtended.java?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/InternalCMPEntityManagerExtended.java (original)
+++ geronimo/server/trunk/modules/geronimo-persistence-jpa10/src/main/java/org/apache/geronimo/persistence/InternalCMPEntityManagerExtended.java Fri Jun 29 18:10:51 2007
@@ -19,13 +19,8 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-
-import org.apache.geronimo.transaction.manager.TransactionImpl;
+import javax.ejb.EJBException;
+import javax.persistence.*;
 import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
 
 /**
@@ -56,7 +51,7 @@
     }
 
     void beanRemoved() {
-        if (count.decrementAndGet() ==0 ) {
+        if (count.decrementAndGet() == 0) {
             entityManager.close();
             EntityManagerExtendedRegistry.clearEntityManager(persistenceUnit);
         }
@@ -71,7 +66,7 @@
         entityManager.persist(o);
     }
 
-    public <T>T merge(T t) {
+    public <T> T merge(T t) {
         return entityManager.merge(t);
     }
 
@@ -79,11 +74,11 @@
         entityManager.remove(o);
     }
 
-    public <T>T find(Class<T> aClass, Object o) {
+    public <T> T find(Class<T> aClass, Object o) {
         return entityManager.find(aClass, o);
     }
 
-    public <T>T getReference(Class<T> aClass, Object o) {
+    public <T> T getReference(Class<T> aClass, Object o) {
         return entityManager.getReference(aClass, o);
     }
 
@@ -148,9 +143,11 @@
     }
 
     public void joinTransaction() {
-            TransactionImpl transaction = (TransactionImpl) transactionManager.getTransaction();
-            //This checks section 5.6.3.1, throwing an EJBException if there is already a PersistenceContext.
-            transaction.setEntityManager(persistenceUnit, this);
+        //This checks section 5.6.3.1, throwing an EJBException if there is already a PersistenceContext.
+        if (transactionManager.getResource(persistenceUnit) != null) {
+            throw new EJBException("EntityManager " + transactionManager.getResource(persistenceUnit) + " for persistenceUnit " + persistenceUnit + " already associated with this transaction " + transactionManager.getTransactionKey());
+        }
+        transactionManager.putResource(persistenceUnit, this);
         entityManager.joinTransaction();
     }
 
@@ -158,4 +155,10 @@
         return entityManager.getDelegate();
     }
 
+    public void beforeCompletion() {
+    }
+
+    public void afterCompletion(int i) {
+        //close is a no-op
+    }
 }

Modified: geronimo/server/trunk/modules/geronimo-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction/pom.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-transaction/pom.xml Fri Jun 29 18:10:51 2007
@@ -52,11 +52,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         </dependency>
 

Modified: geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java (original)
+++ geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionImpl.java Fri Jun 29 18:10:51 2007
@@ -39,7 +39,6 @@
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
-import javax.ejb.EJBException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -65,7 +64,6 @@
     private Object logMark;
 
     private final Map resources = new HashMap();
-    private final Map entityManagers = new HashMap();
 
     TransactionImpl(XidFactory xidFactory, TransactionLog txnLog, long transactionTimeoutMilliseconds) throws SystemException {
         this(xidFactory.createXid(), xidFactory, txnLog, transactionTimeoutMilliseconds);
@@ -527,10 +525,6 @@
         // this does not synchronize because nothing can modify our state at this time
         afterCompletion(interposedSyncList);
         afterCompletion(syncList);
-        for (Iterator i = entityManagers.values().iterator(); i.hasNext();) {
-            Closeable entityManager = (Closeable) i.next();
-            entityManager.close();
-        }
     }
 
     private void afterCompletion(List syncs) {
@@ -677,17 +671,6 @@
         return manager;
     }
 
-    public Object getEntityManager(String persistenceUnit) {
-        return entityManagers.get(persistenceUnit);
-    }
-
-    public void setEntityManager(String persistenceUnit, Object entityManager) {
-        Object oldEntityManager = entityManagers.put(persistenceUnit, entityManager);
-        if (oldEntityManager != null) {
-            throw new EJBException("EntityManager " + oldEntityManager + " for persistenceUnit " + persistenceUnit + " already associated with this transaction " + xid);
-        }
-    }
-
     private static class TransactionBranch implements TransactionBranchInfo {
         private final XAResource committer;
         private final Xid branchId;
@@ -711,11 +694,7 @@
             } else {
                 // if it isn't a named resource should we really stop all processing here!
                 // Maybe this would be better to handle else where and do we really want to prevent all processing of transactions?
-                Throwable throwable = new IllegalStateException("Cannot log transactions as " + committer + " is not a NamedXAResource.");
-                Writer w = new StringWriter();
-                PrintWriter pw = new PrintWriter(w);
-                throwable.printStackTrace(pw);
-                log.error(w.toString());
+                log.error("Please correct the integration and supply a NamedXAResource", new IllegalStateException("Cannot log transactions as " + committer + " is not a NamedXAResource."));
                 return committer.toString();
             }
         }

Modified: geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java (original)
+++ geronimo/server/trunk/modules/geronimo-transaction/src/main/java/org/apache/geronimo/transaction/manager/TransactionManagerImpl.java Fri Jun 29 18:10:51 2007
@@ -23,17 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.InvalidTransactionException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
+import javax.transaction.*;
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.Xid;
 
@@ -48,7 +38,7 @@
  *
  * @version $Rev$ $Date$
  */
-public class TransactionManagerImpl implements TransactionManager, UserTransaction, XidImporter, MonitorableTransactionManager, RecoverableTransactionManager {
+public class TransactionManagerImpl implements TransactionManager, UserTransaction, TransactionSynchronizationRegistry, XidImporter, MonitorableTransactionManager, RecoverableTransactionManager {
     private static final Log log = LogFactory.getLog(TransactionManagerImpl.class);
     protected static final int DEFAULT_TIMEOUT = 600;
     protected static final byte[] DEFAULT_TM_ID = new byte[] {71,84,77,73,68};

Copied: geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/TransactionSynchronizationRegistryTest.java (from r551734, geronimo/server/trunk/modules/geronimo-transaction-jta11/src/test/java/org/apache/geronimo/transaction/jta11/TransactionSynchronizationRegistryTest.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/TransactionSynchronizationRegistryTest.java?view=diff&rev=552073&p1=geronimo/server/trunk/modules/geronimo-transaction-jta11/src/test/java/org/apache/geronimo/transaction/jta11/TransactionSynchronizationRegistryTest.java&r1=551734&p2=geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/TransactionSynchronizationRegistryTest.java&r2=552073
==============================================================================
--- geronimo/server/trunk/modules/geronimo-transaction-jta11/src/test/java/org/apache/geronimo/transaction/jta11/TransactionSynchronizationRegistryTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/TransactionSynchronizationRegistryTest.java Fri Jun 29 18:10:51 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.transaction.jta11;
+package org.apache.geronimo.transaction.manager;
 
 import javax.transaction.Synchronization;
 import javax.transaction.HeuristicMixedException;
@@ -36,13 +36,13 @@
 
 
 
-    private GeronimoTransactionManagerJTA11 tm;
+    private GeronimoTransactionManager tm;
 
     private CountingSync interposedSync;
     private CountingSync normalSync;
 
     protected void setUp() throws Exception {
-        tm  = new GeronimoTransactionManagerJTA11();
+        tm  = new GeronimoTransactionManager();
     }
 
     private void setUpInterposedSync() throws NotSupportedException, SystemException {

Propchange: geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/TransactionSynchronizationRegistryTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/TransactionSynchronizationRegistryTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/modules/geronimo-transaction/src/test/java/org/apache/geronimo/transaction/manager/TransactionSynchronizationRegistryTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Fri Jun 29 18:10:51 2007
@@ -112,7 +112,6 @@
         <module>geronimo-jetty6-clustering-wadi</module>
         <module>geronimo-myfaces</module>
         <module>geronimo-myfaces-builder</module>
-        <module>geronimo-transaction-jta11</module>
         <module>geronimo-web-2.5-builder</module>
     </modules>
     

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources/META-INF/geronimo-application.xml Fri Jun 29 18:10:51 2007
@@ -120,13 +120,58 @@
         <web>web.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
             <security-realm-name>test-cms-realm</security-realm-name>
+            <security xmlns="http://geronimo.apache.org/xml/ns/security-2.0">
+                <credential-store>
+                    <pattern>
+                        <name xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">test-credential-store</name>
+                    </pattern>
+                </credential-store>
+                <default-subject>
+                    <realm>test-cms-realm</realm>
+                    <id>test</id>
+                </default-subject>
+                <role-mappings>
+                    <role role-name="test">
+                        <principal class="org.apache.geronimo.connector.outbound.security.ResourcePrincipal" name="system"/>
+                    </role>
+                    <role role-name="fail">
+                        <run-as-subject>
+                            <realm>test-cms-realm</realm>
+                            <id>fail</id>
+                        </run-as-subject>
+                    </role>
+                </role-mappings>
+            </security>
+            <gbean name="test-credential-store" class="org.apache.geronimo.security.credentialstore.SimpleCredentialStoreImpl">
+                <xml-attribute name="credentialStore">
+                    <credential-store xmlns="http://geronimo.apache.org/xml/ns/credentialstore-1.0">
+                        <realm name="test-cms-realm">
+                            <subject>
+                                <id>test</id>
+                                <credential>
+                                    <type>org.apache.geronimo.security.credentialstore.NameCallbackHandler</type>
+                                    <value>system</value>
+                                </credential>
+                                <credential>
+                                    <type>org.apache.geronimo.security.credentialstore.PasswordCallbackHandler</type>
+                                    <value>manager</value>
+                                </credential>
+                            </subject>
+                            <subject>
+                                <id>fail</id>
+                                <credential>
+                                    <type>org.apache.geronimo.security.credentialstore.NameCallbackHandler</type>
+                                    <value>unauthorized</value>
+                                </credential>
+                                <credential>
+                                    <type>org.apache.geronimo.security.credentialstore.PasswordCallbackHandler</type>
+                                    <value>nope</value>
+                                </credential>
+                            </subject>
+                        </realm>
+                    </credential-store>
+                </xml-attribute>
+            </gbean>
         </web-app>
     </module>
-    <security>
-        <role-mappings>
-            <role role-name="test">
-                <principal class="org.apache.geronimo.connector.outbound.security.ResourcePrincipal" name="system"/>
-            </role>
-        </role-mappings>
-    </security>
 </application>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml Fri Jun 29 18:10:51 2007
@@ -52,5 +52,11 @@
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/java/org/apache/geronimo/itest/TestServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/java/org/apache/geronimo/itest/TestServlet.java?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/java/org/apache/geronimo/itest/TestServlet.java (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/java/org/apache/geronimo/itest/TestServlet.java Fri Jun 29 18:10:51 2007
@@ -20,6 +20,9 @@
 import java.io.PrintWriter;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.security.Principal;
 
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -27,6 +30,10 @@
 import javax.servlet.ServletException;
 import javax.sql.DataSource;
 import javax.annotation.Resource;
+import javax.security.auth.Subject;
+
+import org.apache.geronimo.security.Callers;
+import org.apache.geronimo.security.ContextManager;
 
 
 /**
@@ -44,7 +51,12 @@
     }
 
     protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        Callers callers = ContextManager.getCallers();
+        Subject current = callers.getCurrentCaller();
+        Subject next = callers.getNextCaller();
         PrintWriter out = response.getWriter();
+        out.println("Current subject: " + current);
+        out.println("Next subject:    " + next);
         //this should create the database
         if (csds == null) {
             out.println("No configured datasource found");
@@ -65,6 +77,18 @@
         }
         try {
             Connection con = cmsds.getConnection();
+            DatabaseMetaData md = con.getMetaData();
+            ResultSet rs = md.getSchemas();
+            while (rs.next()) {
+                String schema = rs.getString(1);
+                for (Principal p: next.getPrincipals()) {
+                    String user = p.getName();
+                    if (schema.equals(user)) {
+                        out.println("expected schema: " + user);
+                    }
+                }
+            }
+            rs.close();
             con.close();
             out.println("Successfully got container managed connection");
         } catch (SQLException e) {

Added: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml?view=auto&rev=552073
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Jun 29 18:10:51 2007
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <moduleId>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>${pom.artifactId}</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </moduleId>
+        <dependencies>
+            <dependency>
+                <groupId>${pom.groupId}</groupId>
+                <artifactId>jca-cms-rar</artifactId>
+                <type>car</type>
+            </dependency>
+        </dependencies>
+    </environment>
+
+    <context-root>jca-cms</context-root>
+    <security-realm-name>test-cms-realm</security-realm-name>
+    <security xmlns="http://geronimo.apache.org/xml/ns/security-2.0">
+        <credential-store>
+            <pattern>
+                <name xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">test-credential-store</name>
+            </pattern>
+        </credential-store>
+        <default-subject>
+            <realm>test-cms-realm</realm>
+            <id>fail</id>
+        </default-subject>
+        <role-mappings>
+            <role role-name="test">
+                <principal class="org.apache.geronimo.connector.outbound.security.ResourcePrincipal" name="system"/>
+            </role>
+            <role role-name="fail">
+                <run-as-subject>
+                    <realm>test-cms-realm</realm>
+                    <id>fail</id>
+                </run-as-subject>
+            </role>
+        </role-mappings>
+    </security>
+    <gbean name="test-credential-store" class="org.apache.geronimo.security.credentialstore.SimpleCredentialStoreImpl">
+        <xml-attribute name="credentialStore">
+            <credential-store xmlns="http://geronimo.apache.org/xml/ns/credentialstore-1.0">
+                <realm name="test-cms-realm">
+                    <subject>
+                        <id>test</id>
+                        <credential>
+                            <type>org.apache.geronimo.security.credentialstore.NameCallbackHandler</type>
+                            <value>system</value>
+                        </credential>
+                        <credential>
+                            <type>org.apache.geronimo.security.credentialstore.PasswordCallbackHandler</type>
+                            <value>manager</value>
+                        </credential>
+                    </subject>
+                    <subject>
+                        <id>fail</id>
+                        <credential>
+                            <type>org.apache.geronimo.security.credentialstore.NameCallbackHandler</type>
+                            <value>unauthorized</value>
+                        </credential>
+                        <credential>
+                            <type>org.apache.geronimo.security.credentialstore.PasswordCallbackHandler</type>
+                            <value>nope</value>
+                        </credential>
+                    </subject>
+                </realm>
+            </credential-store>
+        </xml-attribute>
+    </gbean>
+</web-app>

Propchange: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/web.xml?view=diff&rev=552073&r1=552072&r2=552073
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/src/main/webapp/WEB-INF/web.xml Fri Jun 29 18:10:51 2007
@@ -30,10 +30,29 @@
         <servlet-class>org.apache.geronimo.itest.TestServlet</servlet-class>
         <load-on-startup>0</load-on-startup>
     </servlet>
+    <servlet>
+        <display-name>J2CA container managed security itest servlet with run-as</display-name>
+        <servlet-name>run-as-servlet</servlet-name>
+        <servlet-class>org.apache.geronimo.itest.TestServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+        <run-as>
+            <role-name>fail</role-name>
+        </run-as>
+    </servlet>
 
     <servlet-mapping>
         <servlet-name>servlet</servlet-name>
-        <url-pattern>/servlet</url-pattern>
+        <url-pattern>/default-subject-servlet</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>servlet</servlet-name>
+        <url-pattern>/secured-servlet</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>run-as-servlet</servlet-name>
+        <url-pattern>/run-as-servlet</url-pattern>
     </servlet-mapping>
 
     <login-config>
@@ -44,11 +63,14 @@
     <security-role>
         <role-name>test</role-name>
     </security-role>
+    <security-role>
+        <role-name>fail</role-name>
+    </security-role>
 
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>All</web-resource-name>
-            <url-pattern>/servlet</url-pattern>
+            <url-pattern>/secured-servlet</url-pattern>
         </web-resource-collection>
         <auth-constraint>
             <role-name>test</role-name>



Mime
View raw message