geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From viol...@apache.org
Subject svn commit: r1188546 - in /geronimo/server/branches/2.2/plugins/system-database: ./ sysdb-console-jetty/ sysdb-console-jetty/src/main/history/ sysdb-console-jetty/src/main/plan/ sysdb-console-tomcat/ sysdb-console-tomcat/src/main/history/ sysdb-console...
Date Tue, 25 Oct 2011 07:23:06 GMT
Author: violalu
Date: Tue Oct 25 07:23:05 2011
New Revision: 1188546

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

Modified:
    geronimo/server/branches/2.2/plugins/system-database/pom.xml
    geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/pom.xml
    geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
    geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
    geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/pom.xml
    geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
    geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
    geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java

Modified: geronimo/server/branches/2.2/plugins/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/pom.xml?rev=1188546&r1=1188545&r2=1188546&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/system-database/pom.xml Tue Oct 25 07:23:05 2011
@@ -130,7 +130,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>
@@ -312,11 +312,28 @@
                 </exclusions>
             </dependency>
             
+            <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>

Modified: geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/pom.xml?rev=1188546&r1=1188545&r2=1188546&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/pom.xml Tue Oct
25 07:23:05 2011
@@ -229,6 +229,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.2/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml?rev=1188546&r1=1188545&r2=1188546&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
Tue Oct 25 07:23:05 2011
@@ -126,4 +126,9 @@
         <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
         <type>rar</type>
     </dependency>
+    <dependency>
+        <groupId>org.tranql</groupId>
+        <artifactId>tranql-connector-sqlserver2008-xa</artifactId>
+        <type>rar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml?rev=1188546&r1=1188545&r2=1188546&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
Tue Oct 25 07:23:05 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.2/plugins/system-database/sysdb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/pom.xml?rev=1188546&r1=1188545&r2=1188546&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/pom.xml Tue
Oct 25 07:23:05 2011
@@ -228,6 +228,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.2/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml?rev=1188546&r1=1188545&r2=1188546&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
Tue Oct 25 07:23:05 2011
@@ -126,4 +126,9 @@
         <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
         <type>rar</type>
     </dependency>
+    <dependency>
+        <groupId>org.tranql</groupId>
+        <artifactId>tranql-connector-sqlserver2008-xa</artifactId>
+        <type>rar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml?rev=1188546&r1=1188545&r2=1188546&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
(original)
+++ geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
Tue Oct 25 07:23:05 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.2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=1188546&r1=1188545&r2=1188546&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
(original)
+++ geronimo/server/branches/2.2/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Tue Oct 25 07:23:05 2011
@@ -213,6 +213,7 @@ public class DatabasePoolPortlet extends
         usageView = portletConfig.getPortletContext().getRequestDispatcher(USAGE_VIEW);
         rarPathMap = new HashMap<String, String>();
         rarPathMap.put("TranQL XA Resource Adapter for DB2", "tranql-connector-db2-xa");
+         rarPathMap.put("TranQL XA Resource Adapter for DB2ISeries", "tranql-connector-db2ISeries-xa");
         rarPathMap.put("TranQL Client Local Transaction Resource Adapter for Apache Derby",
"tranql-connector-derby-client-local");
         rarPathMap.put("TranQL Client XA Resource Adapter for Apache Derby", "tranql-connector-derby-client-xa");
 //      rarPathMap.put("TranQL Embedded Local Transaction Resource Adapter for Apache Derby",
"tranql-connector-derby-embed-local");
@@ -227,6 +228,7 @@ public class DatabasePoolPortlet extends
         rarPathMap.put("TranQL XA Resource Adapter for PostgreSQL", "tranql-connector-postgresql-xa");
         rarPathMap.put("TranQL XA Resource Adapter for SQLServer 2000", "tranql-connector-sqlserver2000-xa");
         rarPathMap.put("TranQL XA Resource Adapter for SQLServer 2005", "tranql-connector-sqlserver2005-xa");
+        rarPathMap.put("TranQL XA Resource Adapter for SQLServer 2008", "tranql-connector-sqlserver2008-xa");
     }
 
     public void destroy() {



Mime
View raw message