geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r505819 - in /geronimo/server/trunk: assemblies/geronimo-boilerplate-minimal/pom.xml configs/client-transaction/pom.xml configs/client-transaction/src/plan/plan.xml configs/persistence-jpa10-deployer/src/plan/plan.xml pom.xml
Date Sun, 11 Feb 2007 01:57:42 GMT
Author: djencks
Date: Sat Feb 10 17:57:42 2007
New Revision: 505819

URL: http://svn.apache.org/viewvc?view=rev&rev=505819
Log:
GERONIMO-2454 upgrade xerces/xalan etc, also GERONIMO-2600  fix derby problems, fix persistence
unit and ref builder problems in app client

Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/trunk/configs/client-transaction/pom.xml
    geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml
    geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?view=diff&rev=505819&r1=505818&r2=505819
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Sat Feb 10 17:57:42
2007
@@ -152,6 +152,17 @@
                                     <groupId>xerces</groupId>
                                     <artifactId>xercesImpl</artifactId>
                                 </artifactItem>
+                                
+                                <artifactItem>
+                                    <groupId>xml-apis</groupId>
+                                    <artifactId>xml-apis</artifactId>
+                                </artifactItem>
+
+                                <artifactItem>
+                                    <groupId>xalan</groupId>
+                                    <artifactId>xalan</artifactId>
+                                </artifactItem>
+
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/classes/lib/endorsed</outputDirectory>
                         </configuration>

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=505819&r1=505818&r2=505819
==============================================================================
--- geronimo/server/trunk/configs/client-transaction/pom.xml (original)
+++ geronimo/server/trunk/configs/client-transaction/pom.xml Sat Feb 10 17:57:42 2007
@@ -55,6 +55,12 @@
             <artifactId>geronimo-transaction</artifactId>
             <version>${version}</version>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transaction-jta11</artifactId>
+            <version>${version}</version>
+        </dependency>
 
     </dependencies>
 

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=505819&r1=505818&r2=505819
==============================================================================
--- geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-transaction/src/plan/plan.xml Sat Feb 10 17:57:42
2007
@@ -48,7 +48,7 @@
         <attribute name="tmId">71,84,77,73,68</attribute>
     </gbean>
 
-    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.GeronimoTransactionManagerGBean">
+    <gbean name="TransactionManager" class="org.apache.geronimo.transaction.jta11.GeronimoTransactionManagerJTA11GBean">
         <!--no transaction log on the client-->
         <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
         <reference name="XidFactory">
@@ -62,6 +62,21 @@
                 <type>ActivationSpec</type>
             </pattern>
         </references>
+    </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>

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=505819&r1=505818&r2=505819
==============================================================================
--- geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/persistence-jpa10-deployer/src/plan/plan.xml Sat Feb 10
17:57:42 2007
@@ -60,4 +60,31 @@
         </xml-attribute>
     </gbean>
 
+    <gbean name="ClientPersistenceUnitBuilder" class="org.apache.geronimo.persistence.builder.PersistenceUnitBuilder">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>client-transaction</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+    <gbean name="ClientEntityManagerFactoryRefBuilder" class="org.apache.geronimo.persistence.builder.PersistenceUnitRefBuilder">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>client-transaction</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
 </module>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=505819&r1=505818&r2=505819
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sat Feb 10 17:57:42 2007
@@ -446,6 +446,12 @@
 
             <!-- org.apache.xml.serialize.XMLSerializer is used by castor, hence this
is still needed -->
             <dependency>
+                <groupId>xalan</groupId>
+                <artifactId>xalan</artifactId>
+                <version>2.6.0</version>
+            </dependency>
+
+            <dependency>
                 <groupId>xerces</groupId>
                 <artifactId>xercesImpl</artifactId>
                 <version>2.8.1</version>
@@ -626,7 +632,7 @@
             <dependency>
                 <groupId>commons-digester</groupId>
                 <artifactId>commons-digester</artifactId>
-                <version>1.6</version>
+                <version>1.8</version>
             </dependency>
 
             <dependency>
@@ -735,28 +741,28 @@
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-derby-embed-xa</artifactId>
-                <version>1.2</version>
+                <version>1.3-SNAPSHOT</version>
                 <type>rar</type>
             </dependency>
 
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-derby-embed-local</artifactId>
-                <version>1.2</version>
+                <version>1.3-SNAPSHOT</version>
                 <type>rar</type>
             </dependency>
 
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-derby-client-local</artifactId>
-                <version>1.2</version>
+                <version>1.3-SNAPSHOT</version>
                 <type>rar</type>
             </dependency>
 
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-derby-client-xa</artifactId>
-                <version>1.2</version>
+                <version>1.3-SNAPSHOT</version>
                 <type>rar</type>
             </dependency>
 



Mime
View raw message