geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r443443 [1/2] - in /geronimo/sandbox/jee5-jta: ./ assemblies-jee5/ assemblies-jee5/geronimo-boilerplate-jee5/ assemblies-jee5/geronimo-boilerplate-jee5/src/ assemblies-jee5/geronimo-jetty5-jee5/ assemblies-jee5/geronimo-jetty5-jee5/src/ ass...
Date Thu, 14 Sep 2006 19:25:22 GMT
Author: djencks
Date: Thu Sep 14 12:25:19 2006
New Revision: 443443

URL: http://svn.apache.org/viewvc?view=rev&rev=443443
Log:
move everything around a bit to try to make a place to assemble a jee5 server

Added:
    geronimo/sandbox/jee5-jta/assemblies-jee5/
    geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-boilerplate-jee5/
      - copied from r443150, geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/
    geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-boilerplate-jee5/LICENSE.txt
      - copied unchanged from r443442, geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/LICENSE.txt
    geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-boilerplate-jee5/NOTICE.txt
      - copied unchanged from r443442, geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/NOTICE.txt
    geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml
      - copied, changed from r443442, geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml
    geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-boilerplate-jee5/src/
      - copied from r443442, geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/src/
    geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-jetty5-jee5/
      - copied from r443150, geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/
    geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-jetty5-jee5/LICENSE.txt
      - copied unchanged from r443442, geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/LICENSE.txt
    geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-jetty5-jee5/NOTICE.txt
      - copied unchanged from r443442, geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/NOTICE.txt
    geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-jetty5-jee5/pom.xml
      - copied, changed from r443442, geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml
    geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-jetty5-jee5/src/
      - copied from r443442, geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/src/
    geronimo/sandbox/jee5-jta/assemblies-jee5/pom.xml
      - copied, changed from r443150, geronimo/server/trunk/assemblies/pom.xml
    geronimo/sandbox/jee5-jta/configs-jee5/
    geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/
    geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/LICENSE.txt   (with props)
    geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/NOTICE.txt   (with props)
    geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/pom.xml   (with props)
    geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/
    geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/plan/
    geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/plan/plan.xml   (with props)
    geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/site/
    geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/site/apt/
    geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/site/site.xml   (with props)
    geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11/
      - copied from r443150, geronimo/server/trunk/configs/jetty/
    geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11-deployer/
      - copied from r443150, geronimo/server/trunk/configs/jetty-deployer/
    geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11-deployer/LICENSE.txt
      - copied unchanged from r443442, geronimo/server/trunk/configs/jetty-deployer/LICENSE.txt
    geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11-deployer/NOTICE.txt
      - copied unchanged from r443442, geronimo/server/trunk/configs/jetty-deployer/NOTICE.txt
    geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11-deployer/pom.xml
      - copied, changed from r443442, geronimo/server/trunk/configs/jetty-deployer/pom.xml
    geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11-deployer/src/
      - copied from r443442, geronimo/server/trunk/configs/jetty-deployer/src/
    geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11/LICENSE.txt
      - copied unchanged from r443442, geronimo/server/trunk/configs/jetty/LICENSE.txt
    geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11/NOTICE.txt
      - copied unchanged from r443442, geronimo/server/trunk/configs/jetty/NOTICE.txt
    geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11/pom.xml
      - copied, changed from r443442, geronimo/server/trunk/configs/jetty/pom.xml
    geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11/src/
      - copied from r443442, geronimo/server/trunk/configs/jetty/src/
    geronimo/sandbox/jee5-jta/configs-jee5/pom.xml   (with props)
    geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/
    geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/LICENSE.txt   (with props)
    geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/NOTICE.txt   (with props)
    geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/pom.xml   (with props)
    geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/
    geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/plan/
    geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/plan/plan.xml   (with props)
    geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/site/
    geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/site/apt/
    geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/site/site.xml   (with props)
    geronimo/sandbox/jee5-jta/modules/
    geronimo/sandbox/jee5-jta/modules/geronimo-persistence-jpa10/
      - copied from r437806, geronimo/sandbox/jee5-jta/geronimo-persistence-jpa10/
    geronimo/sandbox/jee5-jta/modules/geronimo-persistence-jpa10/LICENSE.txt
      - copied unchanged from r443442, geronimo/sandbox/jee5-jta/geronimo-persistence-jpa10/LICENSE.txt
    geronimo/sandbox/jee5-jta/modules/geronimo-persistence-jpa10/NOTICE.txt
      - copied unchanged from r443442, geronimo/sandbox/jee5-jta/geronimo-persistence-jpa10/NOTICE.txt
    geronimo/sandbox/jee5-jta/modules/geronimo-persistence-jpa10/pom.xml
      - copied unchanged from r443442, geronimo/sandbox/jee5-jta/geronimo-persistence-jpa10/pom.xml
    geronimo/sandbox/jee5-jta/modules/geronimo-persistence-jpa10/src/
      - copied from r443442, geronimo/sandbox/jee5-jta/geronimo-persistence-jpa10/src/
    geronimo/sandbox/jee5-jta/modules/geronimo-transaction-jta11/
      - copied from r437194, geronimo/sandbox/jee5-jta/geronimo-transaction-jta11/
    geronimo/sandbox/jee5-jta/modules/geronimo-transaction-jta11/LICENSE.txt
      - copied unchanged from r443442, geronimo/sandbox/jee5-jta/geronimo-transaction-jta11/LICENSE.txt
    geronimo/sandbox/jee5-jta/modules/geronimo-transaction-jta11/NOTICE.txt
      - copied unchanged from r443442, geronimo/sandbox/jee5-jta/geronimo-transaction-jta11/NOTICE.txt
    geronimo/sandbox/jee5-jta/modules/geronimo-transaction-jta11/pom.xml
      - copied unchanged from r443442, geronimo/sandbox/jee5-jta/geronimo-transaction-jta11/pom.xml
    geronimo/sandbox/jee5-jta/modules/geronimo-transaction-jta11/project.properties
      - copied unchanged from r443442, geronimo/sandbox/jee5-jta/geronimo-transaction-jta11/project.properties
    geronimo/sandbox/jee5-jta/modules/geronimo-transaction-jta11/project.xml
      - copied unchanged from r443442, geronimo/sandbox/jee5-jta/geronimo-transaction-jta11/project.xml
    geronimo/sandbox/jee5-jta/modules/geronimo-transaction-jta11/src/
      - copied from r443442, geronimo/sandbox/jee5-jta/geronimo-transaction-jta11/src/
    geronimo/sandbox/jee5-jta/pom.xml   (with props)
Removed:
    geronimo/sandbox/jee5-jta/geronimo-persistence-jpa10/
    geronimo/sandbox/jee5-jta/geronimo-transaction-jta11/
Modified:
    geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml
    geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11-deployer/src/plan/plan.xml
    geronimo/sandbox/jee5-jta/modules/geronimo-persistence-jpa10/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java

Copied: geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml (from r443442, geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml?view=diff&rev=443443&p1=geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml&r1=443442&p2=geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml&r2=443443
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml (original)
+++ geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-boilerplate-jee5/pom.xml Thu Sep 14 12:25:19 2006
@@ -26,13 +26,13 @@
     
     <parent>
         <groupId>org.apache.geronimo.assemblies</groupId>
-        <artifactId>assemblies</artifactId>
+        <artifactId>assemblies-jee5</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>geronimo-boilerplate-j2ee</artifactId>
-    <name>Geronimo Assemblies :: Boilerplate J2EE</name>
+    <artifactId>geronimo-boilerplate-jee5</artifactId>
+    <name>Geronimo Assemblies :: Boilerplate JEE5</name>
     <packaging>jar</packaging>
     
     <description>
@@ -58,52 +58,13 @@
                         <configuration>
                             <repositoryDirectory>${project.build.outputDirectory}/repository</repositoryDirectory>
                             <artifacts>
+
                                 <artifact>
                                     <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>ge-activemq-rar</artifactId>
+                                    <artifactId>geronimo-persistence-jpa10</artifactId>
                                     <version>${pom.version}</version>
-                                    <type>rar</type>
-                                </artifact>
-                                
-                                <artifact>
-                                    <groupId>tranql</groupId>
-                                    <artifactId>tranql-connector</artifactId>
-                                    <type>rar</type>
-                                </artifact>
-                                
-                                <artifact>
-                                    <groupId>tranql</groupId>
-                                    <artifactId>tranql-connector-derby-embed-local</artifactId>
-                                    <type>rar</type>
-                                </artifact>
-                                
-                                <artifact>
-                                    <groupId>tranql</groupId>
-                                    <artifactId>tranql-connector-derby-embed-xa</artifactId>
-                                    <type>rar</type>
-                                </artifact>
-                                
-                                <artifact>
-                                    <groupId>tranql</groupId>
-                                    <artifactId>tranql-connector-derby-client-local</artifactId>
-                                    <type>rar</type>
-                                </artifact>
-                                
-                                <artifact>
-                                    <groupId>tranql</groupId>
-                                    <artifactId>tranql-connector-derby-client-xa</artifactId>
-                                    <type>rar</type>
-                                </artifact>
-                                
-                                <artifact>
-                                    <groupId>org.apache.derby</groupId>
-                                    <artifactId>derbyclient</artifactId>
-                                </artifact>
-                                
-                                <artifact>
-                                    <groupId>org.apache.derby</groupId>
-                                    <artifactId>derbytools</artifactId>
                                 </artifact>
+
                             </artifacts>
                         </configuration>
                     </execution>
@@ -124,7 +85,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.assemblies</groupId>
-                                    <artifactId>geronimo-boilerplate-minimal</artifactId>
+                                    <artifactId>geronimo-boilerplate-j2ee</artifactId>
                                     <version>${pom.version}</version>
                                     <type>jar</type>
                                 </artifactItem>

Copied: geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-jetty5-jee5/pom.xml (from r443442, geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-jetty5-jee5/pom.xml?view=diff&rev=443443&p1=geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml&r1=443442&p2=geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-jetty5-jee5/pom.xml&r2=443443
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-jetty5-jee5/pom.xml Thu Sep 14 12:25:19 2006
@@ -23,13 +23,13 @@
     
     <parent>
         <groupId>org.apache.geronimo.assemblies</groupId>
-        <artifactId>assemblies</artifactId>
+        <artifactId>assemblies-jee5</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>geronimo-jetty-j2ee</artifactId>
-    <name>Geronimo Assemblies :: J2EE + Jetty</name>
+    <artifactId>geronimo-jetty5-jee5</artifactId>
+    <name>Geronimo Assemblies :: JEE5 + Jetty5</name>
     <!--
     HACK: See build/resources below...
     <packaging>pom</packaging>
@@ -69,31 +69,31 @@
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-        
+<!--        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-        
+-->        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-        
+  <!--      
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-corba</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-        
+ -->       
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty</artifactId>
+            <artifactId>jetty5-jta11</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
@@ -181,14 +181,14 @@
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-        
+<!--        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb-deployer</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-        
+-->        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis-deployer</artifactId>
@@ -212,11 +212,11 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty-deployer</artifactId>
+            <artifactId>jetty5-jta11-deployer</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-        
+<!--        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>welcome-jetty</artifactId>
@@ -245,7 +245,7 @@
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
-        
+-->        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>shutdown</artifactId>
@@ -302,7 +302,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.assemblies</groupId>
-                                    <artifactId>geronimo-boilerplate-j2ee</artifactId>
+                                    <artifactId>geronimo-boilerplate-jee5</artifactId>
                                     <version>${pom.version}</version>
                                 </artifactItem>
                             </artifactItems>

Modified: geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml?view=diff&rev=443443&r1=443442&r2=443443
==============================================================================
--- geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml (original)
+++ geronimo/sandbox/jee5-jta/assemblies-jee5/geronimo-jetty5-jee5/src/main/var/config/config.xml Thu Sep 14 12:25:19 2006
@@ -22,9 +22,10 @@
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car">
-    </module>
-    
+    <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car"/>
+
+    <module name="org.apache.geronimo.configs/transaction-jta11/${pom.version}/car"/>
+
     <module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
         <gbean name="JaasLoginServiceRemotingServer">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -40,7 +41,7 @@
     
     <module name="org.apache.geronimo.configs/axis/${pom.version}/car"/>
     
-    <module name="org.apache.geronimo.configs/openejb/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/openejb/${pom.version}/car" load="false">
         <gbean name="EJBNetworkService">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanOpenEJBPort}</attribute>
@@ -60,23 +61,23 @@
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/system-database/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/system-database/${pom.version}/car" load="false">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/activemq-broker/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/activemq-broker/${pom.version}/car" load="false">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/activemq/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/activemq/${pom.version}/car" load="false"/>
     
-    <module name="org.apache.geronimo.configs/jetty/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/jetty5-jta11/${pom.version}/car">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPortPrimary}</attribute>
@@ -104,14 +105,16 @@
         </gbean>
     </module>
     
-    <module name="org.apache.geronimo.configs/openejb-deployer/${pom.version}/car">
+    <module name="org.apache.geronimo.configs/connector-deployer/${pom.version}/car" load="false"/>
+
+    <module name="org.apache.geronimo.configs/openejb-deployer/${pom.version}/car" load="false">
         <gbean name="EJBBuilder">
             <attribute name="listener">?name=JettyWebContainer</attribute>
         </gbean>
     </module>
     
     <module name="org.apache.geronimo.configs/client-deployer/${pom.version}/car"/>
-    
+
     <module name="org.apache.geronimo.configs/axis-deployer/${pom.version}/car"/>
     
     <module name="org.apache.geronimo.configs/javamail/${pom.version}/car" load="false">
@@ -128,15 +131,15 @@
         </gbean>
     </module>
 
-    <module name="org.apache.geronimo.configs/jetty-deployer/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/jetty5-jta11-deployer/${pom.version}/car"/>
     
-    <module name="org.apache.geronimo.configs/welcome-jetty/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/welcome-jetty/${pom.version}/car" load="false"/>
     
-    <module name="org.apache.geronimo.configs/webconsole-jetty/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/webconsole-jetty/${pom.version}/car" load="false"/>
     
     <module name="org.apache.geronimo.configs/uddi-jetty/${pom.version}/car" load="false"/>
     
-    <module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car"/>
+    <module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car" load="false"/>
     
     <module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>
     

Copied: geronimo/sandbox/jee5-jta/assemblies-jee5/pom.xml (from r443150, geronimo/server/trunk/assemblies/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/assemblies-jee5/pom.xml?view=diff&rev=443443&p1=geronimo/server/trunk/assemblies/pom.xml&r1=443150&p2=geronimo/sandbox/jee5-jta/assemblies-jee5/pom.xml&r2=443443
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/sandbox/jee5-jta/assemblies-jee5/pom.xml Thu Sep 14 12:25:19 2006
@@ -23,13 +23,13 @@
     
     <parent>
         <groupId>org.apache.geronimo</groupId>
-        <artifactId>geronimo</artifactId>
+        <artifactId>geronimo-jee5</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.assemblies</groupId>
-    <artifactId>assemblies</artifactId>
+    <artifactId>assemblies-jee5</artifactId>
     <name>Geronimo Assemblies</name>
     <packaging>pom</packaging>
     
@@ -62,12 +62,13 @@
     </properties>
     
     <modules>
-        <module>geronimo-boilerplate-minimal</module>
-        <module>geronimo-boilerplate-j2ee</module>
-        <module>geronimo-jetty-j2ee</module>
+        <module>geronimo-boilerplate-jee5</module>
+        <module>geronimo-jetty5-jee5</module>
+<!--
         <module>geronimo-jetty-minimal</module>
         <module>geronimo-tomcat-j2ee</module>
         <module>geronimo-tomcat-minimal</module>
+-->
     </modules>
     
 </project>

Added: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/LICENSE.txt?view=auto&rev=443443
==============================================================================
--- geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/LICENSE.txt (added)
+++ geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/LICENSE.txt Thu Sep 14 12:25:19 2006
@@ -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/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/NOTICE.txt?view=auto&rev=443443
==============================================================================
--- geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/NOTICE.txt (added)
+++ geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/NOTICE.txt Thu Sep 14 12:25:19 2006
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/pom.xml?view=auto&rev=443443
==============================================================================
--- geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/pom.xml (added)
+++ geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/pom.xml Thu Sep 14 12:25:19 2006
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+  
+  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.
+-->
+
+<!-- $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-jee5</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>client-transaction-jee5</artifactId>
+    <name>Geronimo Configs :: J2EE Client transaction :: jta11</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+        
+        <!-- parent config -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>client</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <!-- connector deploys jsr77 beans hence needs j2ee, mgmt -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transaction-jta11</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/plan/plan.xml?view=auto&rev=443443
==============================================================================
--- geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/plan/plan.xml (added)
+++ geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/plan/plan.xml Thu Sep 14 12:25:19 2006
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2004-2005 The Apache Software Foundation
+
+    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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+    <!--client connector support-->
+    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
+    </gbean>
+
+    <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
+        <reference name="SyncPool">
+            <name>DefaultThreadPool</name>
+        </reference>
+        <reference name="StartPool">
+            <name>DefaultThreadPool</name>
+        </reference>
+        <reference name="ScheduledPool">
+            <name>DefaultThreadPool</name>
+        </reference>
+        <reference name="TransactionManager">
+            <name>TransactionManager</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.jta11.GeronimoTransactionManagerJTA11GBean">
+        <!--no transaction log on the client-->
+        <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
+        <reference name="XidFactory">
+            <name>XidFactory</name>
+        </reference>
+        <references name="ResourceManagers">
+            <pattern>
+                <type>JCAManagedConnectionFactory</type>
+            </pattern>
+            <pattern>
+                <type>ActivationSpec</type>
+            </pattern>
+        </references>
+    </gbean>
+
+</module>

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/site/site.xml?view=auto&rev=443443
==============================================================================
--- geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/site/site.xml (added)
+++ geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/site/site.xml Thu Sep 14 12:25:19 2006
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation
+
+    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.
+-->
+
+<!-- $Id: site.xml 432950 2006-08-20 07:30:07Z jdillon $ -->
+
+<project name="${project.name}">
+    
+    <body>
+        
+        ${parentProject}
+        
+        ${modules}
+        
+        ${reports}
+        
+    </body>
+
+</project>
+
+

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/client-transaction-jta11/src/site/site.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11-deployer/pom.xml (from r443442, geronimo/server/trunk/configs/jetty-deployer/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11-deployer/pom.xml?view=diff&rev=443443&p1=geronimo/server/trunk/configs/jetty-deployer/pom.xml&r1=443442&p2=geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11-deployer/pom.xml&r2=443443
==============================================================================
--- geronimo/server/trunk/configs/jetty-deployer/pom.xml (original)
+++ geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11-deployer/pom.xml Thu Sep 14 12:25:19 2006
@@ -23,13 +23,13 @@
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <artifactId>configs-jee5</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>jetty-deployer</artifactId>
-    <name>Geronimo Configs :: Jetty Deployer</name>
+    <artifactId>jetty5-jta11-deployer</artifactId>
+    <name>Geronimo Configs :: Jetty 5 JTA 1.1 Deployer</name>
     <packaging>car</packaging>
     
     <dependencies>
@@ -44,7 +44,7 @@
         <!-- similar thing not needed in tomcat !!! -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty</artifactId>
+            <artifactId>jetty5-jta11</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
             <scope>compile</scope>

Modified: geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11-deployer/src/plan/plan.xml?view=diff&rev=443443&r1=443442&r2=443443
==============================================================================
--- geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11-deployer/src/plan/plan.xml (original)
+++ geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11-deployer/src/plan/plan.xml Thu Sep 14 12:25:19 2006
@@ -54,11 +54,11 @@
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <dependencies>
-                    <dependency>
-                        <groupId>${pom.groupId}</groupId>
-                        <artifactId>j2ee-server</artifactId>
-                        <type>car</type>
-                    </dependency>
+                    <!--<dependency>-->
+                        <!--<groupId>${pom.groupId}</groupId>-->
+                        <!--<artifactId>j2ee-server</artifactId>-->
+                        <!--<type>car</type>-->
+                    <!--</dependency>-->
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
                         <artifactId>jetty</artifactId>

Copied: geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11/pom.xml (from r443442, geronimo/server/trunk/configs/jetty/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11/pom.xml?view=diff&rev=443443&p1=geronimo/server/trunk/configs/jetty/pom.xml&r1=443442&p2=geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11/pom.xml&r2=443443
==============================================================================
--- geronimo/server/trunk/configs/jetty/pom.xml (original)
+++ geronimo/sandbox/jee5-jta/configs-jee5/jetty5-jta11/pom.xml Thu Sep 14 12:25:19 2006
@@ -23,36 +23,44 @@
 
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <artifactId>configs-jee5</artifactId>
         <version>1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>jetty</artifactId>
-    <name>Geronimo Configs :: Jetty</name>
+    <artifactId>jetty5-jta11</artifactId>
+    <name>Geronimo Configs :: Jetty 5 JTA11</name>
     <packaging>car</packaging>
     
     <dependencies>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jetty</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transaction-jta11</artifactId>
             <version>${pom.version}</version>
+            <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-webservices</artifactId>
+            <artifactId>geronimo-jetty</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
+
     </dependencies>
     
 </project>

Added: geronimo/sandbox/jee5-jta/configs-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/configs-jee5/pom.xml?view=auto&rev=443443
==============================================================================
--- geronimo/sandbox/jee5-jta/configs-jee5/pom.xml (added)
+++ geronimo/sandbox/jee5-jta/configs-jee5/pom.xml Thu Sep 14 12:25:19 2006
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation
+    
+    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.
+-->
+
+<!-- $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</groupId>
+        <artifactId>geronimo-jee5</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>configs-jee5</artifactId>
+    <name>Geronimo Configs</name>
+    <packaging>pom</packaging>
+    
+    <properties>
+        <!-- This property is required by the car:package mojo -->
+        <geronimoVersion>${pom.version}</geronimoVersion>
+        
+        <!-- This property is required to process geronimo-plugin.xml (for m2 & m2) -->
+        <pom.currentVersion>${pom.version}</pom.currentVersion>
+        
+        <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car</gbeanDeployer>
+        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car</j2eeDeployer>
+        <clientDeployer>org.apache.geronimo.configs/client-deployer/${pom.version}/car</clientDeployer>
+        <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${pom.version}/car</connectorDeployer>
+        <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${pom.version}/car</openejbDeployer>
+        <axisDeployer>org.apache.geronimo.configs/axis-deployer/${pom.version}/car</axisDeployer>
+        <tomcatDeployer>org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car</tomcatDeployer>
+        <jettyDeployer>org.apache.geronimo.configs/jetty-deployer/${pom.version}/car</jettyDeployer>
+        
+        <!-- Common plan properties -->
+        <PlanServerHostname>localhost</PlanServerHostname>
+        <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
+        <PlanHTTPPort>8080</PlanHTTPPort>
+        <PlanHTTPSPort>8443</PlanHTTPSPort>
+        <PlanHTTPPort2>8090</PlanHTTPPort2>
+        <PlanHTTPSPort2>8453</PlanHTTPSPort2>
+        <PlanAJPPort2>8019</PlanAJPPort2>
+        <PlanOpenEJBPort>4201</PlanOpenEJBPort>
+        <PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
+        <PlanNamingPort>1099</PlanNamingPort>
+        <PlanActiveMQPort>61616</PlanActiveMQPort>
+        <PlanCOSNamingHost>localhost</PlanCOSNamingHost>
+        <PlanCOSNamingPort>1050</PlanCOSNamingPort>
+        <PlanORBSSLHost>localhost</PlanORBSSLHost>
+        <PlanORBSSLPort>2001</PlanORBSSLPort>
+        <PlanJMXPort>9999</PlanJMXPort>
+    </properties>
+    
+    <build>
+        <!--
+        
+        NOTE: Don't add to extentions here, or JCL will freak out about multipule versions.
+        
+        <extensions>
+            <extension>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <version>${pom.version}</version>
+            </extension>
+        </extensions>
+        -->
+        
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.geronimo.plugins</groupId>
+                    <artifactId>car-maven-plugin</artifactId>
+                    <version>${pom.version}</version>
+                    <extensions>true</extensions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                
+                <!-- Install as extention to allow 'car' packaging to be used. -->
+                <extensions>true</extensions>
+                
+                <configuration>
+                    <archive>
+                        <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <modules>
+        <module>client-transaction-jta11</module>
+<!--
+        <module>connector-deployer</module>
+        <module>openejb</module>
+        <module>openejb-deployer</module>
+-->
+        <module>jetty5-jta11</module>
+        <module>jetty5-jta11-deployer</module>
+        <module>transaction-jta11</module>
+    </modules>
+    
+</project>

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/LICENSE.txt?view=auto&rev=443443
==============================================================================
--- geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/LICENSE.txt (added)
+++ geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/LICENSE.txt Thu Sep 14 12:25:19 2006
@@ -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/sandbox/jee5-jta/configs-jee5/transaction-jta11/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/NOTICE.txt?view=auto&rev=443443
==============================================================================
--- geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/NOTICE.txt (added)
+++ geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/NOTICE.txt Thu Sep 14 12:25:19 2006
@@ -0,0 +1,3 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/pom.xml?view=auto&rev=443443
==============================================================================
--- geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/pom.xml (added)
+++ geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/pom.xml Thu Sep 14 12:25:19 2006
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+  
+  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.
+-->
+
+<!-- $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-jee5</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>transaction-jta11</artifactId>
+    <name>Geronimo Configs :: Transaction Manager JTA11</name>
+    <packaging>car</packaging>
+    
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${pom.version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <!-- ThreadPool -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transaction-jta11</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.objectweb.howl</groupId>
+            <artifactId>howl</artifactId>
+        </dependency>
+
+    </dependencies>
+    
+</project>

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/plan/plan.xml?view=auto&rev=443443
==============================================================================
--- geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/plan/plan.xml (added)
+++ geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/plan/plan.xml Thu Sep 14 12:25:19 2006
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2004-2005 The Apache Software Foundation
+
+    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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+        <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="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.jta11.GeronimoTransactionManagerJTA11GBean">
+        <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
+        <reference name="XidFactory">
+            <name>XidFactory</name>
+        </reference>
+        <reference name="TransactionLog">
+            <name>HOWLTransactionLog</name>
+        </reference>
+        <references name="ResourceManagers">
+            <pattern>
+                <type>JCAManagedConnectionFactory</type>
+            </pattern>
+            <pattern>
+                <type>ActivationSpec</type>
+            </pattern>
+        </references>
+    </gbean>
+
+</module>

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/site/site.xml?view=auto&rev=443443
==============================================================================
--- geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/site/site.xml (added)
+++ geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/site/site.xml Thu Sep 14 12:25:19 2006
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation
+
+    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.
+-->
+
+<!-- $Id: site.xml 432950 2006-08-20 07:30:07Z jdillon $ -->
+
+<project name="${project.name}">
+    
+    <body>
+        
+        ${parentProject}
+        
+        ${modules}
+        
+        ${reports}
+        
+    </body>
+
+</project>
+
+

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jee5-jta/configs-jee5/transaction-jta11/src/site/site.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/jee5-jta/modules/geronimo-persistence-jpa10/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jee5-jta/modules/geronimo-persistence-jpa10/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java?view=diff&rev=443443&r1=443442&r2=443443
==============================================================================
--- geronimo/sandbox/jee5-jta/modules/geronimo-persistence-jpa10/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java (original)
+++ geronimo/sandbox/jee5-jta/modules/geronimo-persistence-jpa10/src/test/java/org/apache/geronimo/persistence/PersistenceUnitGBeanTest.java Thu Sep 14 12:25:19 2006
@@ -20,7 +20,7 @@
 import junit.framework.TestCase;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class PersistenceUnitGBeanTest extends TestCase {
 



Mime
View raw message