You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by vi...@apache.org on 2011/10/25 04:39:28 UTC

svn commit: r1188495 - in /geronimo/server/branches/2.1: ./ plugins/system-database/sysdb-console-jetty/ plugins/system-database/sysdb-console-jetty/src/main/plan/ plugins/system-database/sysdb-console-tomcat/ plugins/system-database/sysdb-console-tomc...

Author: violalu
Date: Tue Oct 25 02:39:28 2011
New Revision: 1188495

URL: http://svn.apache.org/viewvc?rev=1188495&view=rev
Log:
GERONIMO-6202 tranql update

Modified:
    geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/pom.xml
    geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
    geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/pom.xml
    geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
    geronimo/server/branches/2.1/pom.xml

Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/pom.xml?rev=1188495&r1=1188494&r2=1188495&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/pom.xml Tue Oct 25 02:39:28 2011
@@ -225,6 +225,12 @@
         
         <dependency>
             <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-sqlserver2008-xa</artifactId>
+            <type>rar</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-db2ISeries-xa</artifactId>
             <type>rar</type>
         </dependency>        

Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml?rev=1188495&r1=1188494&r2=1188495&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml Tue Oct 25 02:39:28 2011
@@ -395,6 +395,14 @@ limitations under the License.
         <attribute name="specific">true</attribute>
         <attribute name="RARName">org.tranql/tranql-connector-sqlserver2005-xa//rar</attribute>
     </gbean>
+     <gbean name="Database283" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+        <attribute name="name">SQL Server 2008 XA</attribute>
+        <attribute name="URLPrototype">null</attribute>
+        <attribute name="driverClassName">null</attribute>
+        <attribute name="defaultPort">0</attribute>
+        <attribute name="specific">true</attribute>
+        <attribute name="RARName">org.tranql/tranql-connector-sqlserver2008-xa//rar</attribute>
+    </gbean>
     <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
         <attribute name="name">SQL Server (jTDS)</attribute>
         <attribute name="URLPrototype">jdbc:jtds:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>

Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/pom.xml?rev=1188495&r1=1188494&r2=1188495&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/pom.xml Tue Oct 25 02:39:28 2011
@@ -226,6 +226,12 @@
         
         <dependency>
             <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-sqlserver2008-xa</artifactId>
+            <type>rar</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-db2ISeries-xa</artifactId>
             <type>rar</type>
         </dependency>        

Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml?rev=1188495&r1=1188494&r2=1188495&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml Tue Oct 25 02:39:28 2011
@@ -104,9 +104,9 @@ limitations under the License.
         <attribute name="RARName">org.tranql/tranql-connector-db2-xa//rar</attribute>
     </gbean>
     <gbean name="Database2a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
-        <attribute name="name">DB2ISeries XA</attribute>
-        <attribute name="URLPrototype">null</attribute>
-        <attribute name="driverClassName">null</attribute>
+        <attribute name="name">DB2ISeries XA(JTOpen)</attribute>
+        <attribute name="URLPrototype">jdbc:as400://{Host}/databasename={Database}</attribute>
+        <attribute name="driverClassName">com.ibm.as400.access.AS400JDBCDriver</attribute>
         <attribute name="defaultPort">0</attribute>
         <attribute name="specific">true</attribute>
         <attribute name="RARName">org.tranql/tranql-connector-db2ISeries-xa//rar</attribute>
@@ -396,6 +396,14 @@ limitations under the License.
         <attribute name="specific">true</attribute>
         <attribute name="RARName">org.tranql/tranql-connector-sqlserver2005-xa//rar</attribute>
     </gbean>
+    <gbean name="Database283" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+        <attribute name="name">SQL Server 2008 XA</attribute>
+        <attribute name="URLPrototype">null</attribute>
+        <attribute name="driverClassName">null</attribute>
+        <attribute name="defaultPort">0</attribute>
+        <attribute name="specific">true</attribute>
+        <attribute name="RARName">org.tranql/tranql-connector-sqlserver2008-xa//rar</attribute>
+    </gbean>
     <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
         <attribute name="name">SQL Server (jTDS)</attribute>
         <attribute name="URLPrototype">jdbc:jtds:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=1188495&r1=1188494&r2=1188495&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Tue Oct 25 02:39:28 2011
@@ -1020,7 +1020,7 @@
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-db2-xa</artifactId>
-                <version>1.6</version>
+                <version>1.7</version>
                 <type>rar</type>
                 <exclusions>
                     <exclusion>
@@ -1032,7 +1032,8 @@
                         <artifactId>tranql-connector</artifactId>
                     </exclusion>
                 </exclusions>
-            </dependency>
+            </dependency>           
+           
             
             <!-- tranql informix -->
             <dependency>
@@ -1210,11 +1211,29 @@
                 </exclusions>
             </dependency>
             
+            <!-- tranql sqlserver2008 -->
+            <dependency>
+                <groupId>org.tranql</groupId>
+                <artifactId>tranql-connector-sqlserver2008-xa</artifactId>
+                <version>1.0</version>
+                <type>rar</type>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.tranql</groupId>
+                        <artifactId>tranql-connector-sqlserver2008-common</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.tranql</groupId>
+                        <artifactId>tranql-connector</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            
             <!-- tranql db2ISeries -->
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-db2ISeries-xa</artifactId>
-                <version>1.0</version>
+                <version>1.1</version>
                 <type>rar</type>
                 <exclusions>
                     <exclusion>