geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r615094 - in /geronimo/server/trunk: plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml pom.xml
Date Fri, 25 Jan 2008 01:28:42 GMT
Author: djencks
Date: Thu Jan 24 17:28:38 2008
New Revision: 615094

URL: http://svn.apache.org/viewvc?rev=615094&view=rev
Log:
GERONIMO-3596 upgrade to newest mysql tranql wrappers and resurrect the db config gbeans that
got lost in 2.0.2

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

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml?rev=615094&r1=615093&r2=615094&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
Thu Jan 24 17:28:38 2008
@@ -85,11 +85,11 @@
     </gbean>
     <gbean name="Database2" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
         <attribute name="name">DB2</attribute>
-        <attribute name="URLPrototype">jdbc:db2://{Host}:{Port}/{Database}</attribute>
-        <attribute name="driverClassName">com.ibm.db2.jcc.DB2Driver</attribute>
-        <attribute name="defaultPort">50000</attribute>
-        <attribute name="specific">false</attribute>
-        <attribute name="RARName">org.tranql/tranql-connector-ra//rar</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-db2-xa//rar</attribute>
     </gbean>
     <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
         <attribute name="name">DB2 (DataDirect)</attribute>
@@ -229,13 +229,38 @@
     </gbean>
     <gbean name="Database19" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
         <attribute name="name">MySQL</attribute>
-        <attribute name="URLPrototype">jdbc:mysql://{Host}:{Port}/{Database}</attribute>
-        <attribute name="driverClassName">com.mysql.jdbc.Driver</attribute>
-        <attribute name="defaultPort">3306</attribute>
-        <attribute name="specific">false</attribute>
-        <attribute name="RARName">org.tranql/tranql-connector-ra//rar</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-mysql-local//rar</attribute>
+        <attribute name="dependencyFilterStrings">mysql/mysql-connector-java//jar</attribute>
+    </gbean>
+    <gbean name="Database19a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+        <attribute name="name">MySQL-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-mysql-xa//rar</attribute>
         <attribute name="dependencyFilterStrings">mysql/mysql-connector-java//jar</attribute>
     </gbean>
+    <gbean name="Database20a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+        <attribute name="name">Oracle Local</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-oracle-local//rar</attribute>
+    </gbean>
+    <gbean name="Database20b" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+        <attribute name="name">Oracle 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-oracle-xa//rar</attribute>
+    </gbean>
     <gbean name="Database20" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
         <attribute name="name">Oracle Thin</attribute>
         <attribute name="URLPrototype">jdbc:oracle:thin:@{Host}:{Port}:{SID}</attribute>
@@ -277,12 +302,21 @@
         <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
     </gbean>
     <gbean name="Database25" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
-        <attribute name="name">PostgreSQL</attribute>
-        <attribute name="URLPrototype">jdbc:postgresql://{Host}:{Port}/{Database}</attribute>
-        <attribute name="driverClassName">org.postgresql.Driver</attribute>
-        <attribute name="defaultPort">5432</attribute>
-        <attribute name="specific">false</attribute>
-        <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+        <attribute name="name">PostgreSQL Local</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-postgresql-local//rar</attribute>
+        <attribute name="dependencyFilterStrings">postgresql/postgresql//jar,postgresql/postgresql-7.3//jar,postgresql/postgresql-7.4//jar,postgresql/postgresql-8.0//jar,postgresql/postgresql-8.1//jar,postgresql/postgresql-8.2//jar</attribute>
+    </gbean>
+    <gbean name="Database25a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+        <attribute name="name">PostgreSQL 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-postgresql-xa//rar</attribute>
         <attribute name="dependencyFilterStrings">postgresql/postgresql//jar,postgresql/postgresql-7.3//jar,postgresql/postgresql-7.4//jar,postgresql/postgresql-8.0//jar,postgresql/postgresql-8.1//jar,postgresql/postgresql-8.2//jar</attribute>
     </gbean>
     <gbean name="Database26" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml?rev=615094&r1=615093&r2=615094&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
(original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
Thu Jan 24 17:28:38 2008
@@ -86,11 +86,11 @@
     </gbean>
     <gbean name="Database2" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
         <attribute name="name">DB2</attribute>
-        <attribute name="URLPrototype">jdbc:db2://{Host}:{Port}/{Database}</attribute>
-        <attribute name="driverClassName">com.ibm.db2.jcc.DB2Driver</attribute>
-        <attribute name="defaultPort">50000</attribute>
-        <attribute name="specific">false</attribute>
-        <attribute name="RARName">org.tranql/tranql-connector-ra//rar</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-db2-xa//rar</attribute>
     </gbean>
     <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
         <attribute name="name">DB2 (DataDirect)</attribute>
@@ -230,13 +230,38 @@
     </gbean>
     <gbean name="Database19" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
         <attribute name="name">MySQL</attribute>
-        <attribute name="URLPrototype">jdbc:mysql://{Host}:{Port}/{Database}</attribute>
-        <attribute name="driverClassName">com.mysql.jdbc.Driver</attribute>
-        <attribute name="defaultPort">3306</attribute>
-        <attribute name="specific">false</attribute>
-        <attribute name="RARName">org.tranql/tranql-connector-ra//rar</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-mysql-local//rar</attribute>
+        <attribute name="dependencyFilterStrings">mysql/mysql-connector-java//jar</attribute>
+    </gbean>
+    <gbean name="Database19a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+        <attribute name="name">MySQL-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-mysql-xa//rar</attribute>
         <attribute name="dependencyFilterStrings">mysql/mysql-connector-java//jar</attribute>
     </gbean>
+    <gbean name="Database20a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+        <attribute name="name">Oracle Local</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-oracle-local//rar</attribute>
+    </gbean>
+    <gbean name="Database20b" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+        <attribute name="name">Oracle 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-oracle-xa//rar</attribute>
+    </gbean>
     <gbean name="Database20" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
         <attribute name="name">Oracle Thin</attribute>
         <attribute name="URLPrototype">jdbc:oracle:thin:@{Host}:{Port}:{SID}</attribute>
@@ -278,12 +303,21 @@
         <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
     </gbean>
     <gbean name="Database25" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
-        <attribute name="name">PostgreSQL</attribute>
-        <attribute name="URLPrototype">jdbc:postgresql://{Host}:{Port}/{Database}</attribute>
-        <attribute name="driverClassName">org.postgresql.Driver</attribute>
-        <attribute name="defaultPort">5432</attribute>
-        <attribute name="specific">false</attribute>
-        <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
+        <attribute name="name">PostgreSQL Local</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-postgresql-local//rar</attribute>
+        <attribute name="dependencyFilterStrings">postgresql/postgresql//jar,postgresql/postgresql-7.3//jar,postgresql/postgresql-7.4//jar,postgresql/postgresql-8.0//jar,postgresql/postgresql-8.1//jar,postgresql/postgresql-8.2//jar</attribute>
+    </gbean>
+    <gbean name="Database25a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+        <attribute name="name">PostgreSQL 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-postgresql-xa//rar</attribute>
         <attribute name="dependencyFilterStrings">postgresql/postgresql//jar,postgresql/postgresql-7.3//jar,postgresql/postgresql-7.4//jar,postgresql/postgresql-8.0//jar,postgresql/postgresql-8.1//jar,postgresql/postgresql-8.2//jar</attribute>
     </gbean>
     <gbean name="Database26" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=615094&r1=615093&r2=615094&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Jan 24 17:28:38 2008
@@ -930,14 +930,14 @@
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-mysql-local</artifactId>
-                <version>1.1</version>
+                <version>1.2</version>
                 <type>rar</type>
             </dependency>
 
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-mysql-xa</artifactId>
-                <version>1.1</version>
+                <version>1.2</version>
                 <type>rar</type>
             </dependency>
 



Mime
View raw message