You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2009/03/09 23:25:55 UTC
svn commit: r751883 - in /geronimo/server/trunk/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-tomcat/...
Author: jbohn
Date: Mon Mar 9 22:25:55 2009
New Revision: 751883
URL: http://svn.apache.org/viewvc?rev=751883&view=rev
Log:
GERONIMO-4297 - Include TranQL connector for Oracle RAC
Modified:
geronimo/server/trunk/plugins/system-database/pom.xml
geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
Modified: geronimo/server/trunk/plugins/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/pom.xml?rev=751883&r1=751882&r2=751883&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/pom.xml Mon Mar 9 22:25:55 2009
@@ -198,7 +198,7 @@
<dependency>
<groupId>org.tranql</groupId>
<artifactId>tranql-connector-oracle-local</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<type>rar</type>
<exclusions>
<exclusion>
@@ -215,7 +215,24 @@
<dependency>
<groupId>org.tranql</groupId>
<artifactId>tranql-connector-oracle-xa</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
+ <type>rar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-oracle-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-oracle-rac-local</artifactId>
+ <version>1.4</version>
<type>rar</type>
<exclusions>
<exclusion>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml?rev=751883&r1=751882&r2=751883&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml Mon Mar 9 22:25:55 2009
@@ -200,6 +200,12 @@
<dependency>
<groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-oracle-rac-local</artifactId>
+ <type>rar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
<artifactId>tranql-connector-postgresql-local</artifactId>
<type>rar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml?rev=751883&r1=751882&r2=751883&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml Mon Mar 9 22:25:55 2009
@@ -22,8 +22,13 @@
<type>car</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-test-ddbean</artifactId>
+ <artifactId>geronimo-converter</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -32,38 +37,33 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-converter</artifactId>
+ <artifactId>geronimo-test-ddbean</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-ra</artifactId>
+ <artifactId>tranql-connector-derby-embed-local</artifactId>
<type>rar</type>
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-db2-xa</artifactId>
+ <artifactId>tranql-connector-ra</artifactId>
<type>rar</type>
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-local</artifactId>
+ <artifactId>tranql-connector-derby-client-local</artifactId>
<type>rar</type>
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-local</artifactId>
+ <artifactId>tranql-connector-derby-client-xa</artifactId>
<type>rar</type>
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-xa</artifactId>
+ <artifactId>tranql-connector-db2-xa</artifactId>
<type>rar</type>
</dependency>
<dependency>
@@ -73,12 +73,17 @@
</dependency>
<dependency>
<groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-mysql-local</artifactId>
+ <type>rar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
<artifactId>tranql-connector-mysql-xa</artifactId>
<type>rar</type>
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-mysql-local</artifactId>
+ <artifactId>tranql-connector-oracle-local</artifactId>
<type>rar</type>
</dependency>
<dependency>
@@ -88,7 +93,7 @@
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-local</artifactId>
+ <artifactId>tranql-connector-oracle-rac-local</artifactId>
<type>rar</type>
</dependency>
<dependency>
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=751883&r1=751882&r2=751883&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 Mon Mar 9 22:25:55 2009
@@ -280,6 +280,14 @@
<attribute name="specific">true</attribute>
<attribute name="RARName">org.tranql/tranql-connector-oracle-xa//rar</attribute>
</gbean>
+ <gbean name="Database20c" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+ <attribute name="name">Oracle RAC</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-rac-local//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>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml?rev=751883&r1=751882&r2=751883&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml Mon Mar 9 22:25:55 2009
@@ -199,6 +199,12 @@
<dependency>
<groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-oracle-rac-local</artifactId>
+ <type>rar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
<artifactId>tranql-connector-postgresql-local</artifactId>
<type>rar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml?rev=751883&r1=751882&r2=751883&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml Mon Mar 9 22:25:55 2009
@@ -27,6 +27,11 @@
<type>car</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-converter</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>plugin</artifactId>
<type>car</type>
@@ -37,9 +42,9 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-converter</artifactId>
- <type>jar</type>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-local</artifactId>
+ <type>rar</type>
</dependency>
<dependency>
<groupId>org.tranql</groupId>
@@ -48,27 +53,27 @@
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-db2-xa</artifactId>
+ <artifactId>tranql-connector-derby-client-local</artifactId>
<type>rar</type>
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-local</artifactId>
+ <artifactId>tranql-connector-derby-client-xa</artifactId>
<type>rar</type>
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-local</artifactId>
+ <artifactId>tranql-connector-db2-xa</artifactId>
<type>rar</type>
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-xa</artifactId>
+ <artifactId>tranql-connector-informix-xa</artifactId>
<type>rar</type>
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-informix-xa</artifactId>
+ <artifactId>tranql-connector-mysql-local</artifactId>
<type>rar</type>
</dependency>
<dependency>
@@ -78,7 +83,7 @@
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-mysql-local</artifactId>
+ <artifactId>tranql-connector-oracle-local</artifactId>
<type>rar</type>
</dependency>
<dependency>
@@ -88,7 +93,7 @@
</dependency>
<dependency>
<groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-local</artifactId>
+ <artifactId>tranql-connector-oracle-rac-local</artifactId>
<type>rar</type>
</dependency>
<dependency>
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=751883&r1=751882&r2=751883&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 Mon Mar 9 22:25:55 2009
@@ -281,6 +281,14 @@
<attribute name="specific">true</attribute>
<attribute name="RARName">org.tranql/tranql-connector-oracle-xa//rar</attribute>
</gbean>
+ <gbean name="Database20c" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
+ <attribute name="name">Oracle RAC</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-rac-local//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>