You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2010/06/08 19:49:27 UTC
svn commit: r952750 - in /geronimo/server/trunk: ./ plugins/connector-1_6/
plugins/connector-1_6/db-connectors/ plugins/connector-1_6/db-connectors/src/
plugins/connector-1_6/db-connectors/src/main/
plugins/connector-1_6/db-connectors/src/main/history/...
Author: dwoods
Date: Tue Jun 8 17:49:26 2010
New Revision: 952750
URL: http://svn.apache.org/viewvc?rev=952750&view=rev
Log:
split TranQL connectors out of sysdb-console and into a db-connectors config, so they can be included in assemblies independent from console support
Added:
geronimo/server/trunk/plugins/connector-1_6/db-connectors/
geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml (with props)
geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/
geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/main/
geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/main/history/
geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/main/history/dependencies.xml (with props)
Modified:
geronimo/server/trunk/plugins/connector-1_6/pom.xml
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-tomcat/pom.xml
geronimo/server/trunk/plugins/system-database/system-database/pom.xml
geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml
geronimo/server/trunk/pom.xml
Added: geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml?rev=952750&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml Tue Jun 8 17:49:26 2010
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev: 942493 $ $Date: 2010-05-09 02:36:39 -0400 (Sun, 09 May 2010) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>connector-1_6</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>db-connectors</artifactId>
+ <name>Geronimo Plugins, Connector 1.6 :: Database Connectors</name>
+ <packaging>car</packaging>
+ <description>
+ Geronimo Database Connectors which are used by the System Database Console and higher level plugingroups to deliver a default set of TranQL connectors in our assemblies.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-deployer</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>connector-deployer-1_6</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>plugin</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-local</artifactId>
+ <type>rar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-xa</artifactId>
+ <type>rar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-ra</artifactId>
+ <type>rar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-client-local</artifactId>
+ <type>rar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-client-xa</artifactId>
+ <type>rar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-db2-xa</artifactId>
+ <type>rar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-informix-xa</artifactId>
+ <type>rar</type>
+ </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-oracle-local</artifactId>
+ <type>rar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-oracle-xa</artifactId>
+ <type>rar</type>
+ </dependency>
+
+ <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>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-postgresql-xa</artifactId>
+ <type>rar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-sqlserver2000-xa</artifactId>
+ <type>rar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
+ <type>rar</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <deploymentConfigs>
+ <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+ <deploymentConfig>${connectorDeployer}</deploymentConfig>
+ </deploymentConfigs>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
+ <category>Geronimo Core</category>
+ <osiApproved>true</osiApproved>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/main/history/dependencies.xml?rev=952750&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/main/history/dependencies.xml Tue Jun 8 17:49:26 2010
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+ <module-id>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>db-connectors</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <type>car</type>
+ </module-id>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-db2-xa</artifactId>
+ <type>rar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-client-local</artifactId>
+ <type>rar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-client-xa</artifactId>
+ <type>rar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-local</artifactId>
+ <type>rar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-xa</artifactId>
+ <type>rar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-informix-xa</artifactId>
+ <type>rar</type>
+ </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-oracle-local</artifactId>
+ <type>rar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-oracle-rac-local</artifactId>
+ <type>rar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-oracle-xa</artifactId>
+ <type>rar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-postgresql-local</artifactId>
+ <type>rar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-postgresql-xa</artifactId>
+ <type>rar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-ra</artifactId>
+ <type>rar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-sqlserver2000-xa</artifactId>
+ <type>rar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
+ <type>rar</type>
+ </dependency>
+</plugin-artifact>
Propchange: geronimo/server/trunk/plugins/connector-1_6/db-connectors/src/main/history/dependencies.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/server/trunk/plugins/connector-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/pom.xml?rev=952750&r1=952749&r2=952750&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/pom.xml Tue Jun 8 17:49:26 2010
@@ -41,6 +41,7 @@
<module>geronimo-connector-builder-1_6</module>
<module>geronimo-transaction-1_6</module>
<module>transaction-1_6</module>
+ <module>db-connectors</module>
</modules>
<profiles>
@@ -54,7 +55,6 @@
<dependencyManagement>
<dependencies>
-
<!-- imports of other plugins -->
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
@@ -100,7 +100,275 @@
<dependency>
<groupId>org.tranql</groupId>
<artifactId>tranql-connector</artifactId>
+ <version>${tranqlVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-ra</artifactId>
+ <version>${tranqlVersion}</version>
+ <type>rar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-xa</artifactId>
+ <version>${tranqlDerbyVersion}</version>
+ <type>rar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-local</artifactId>
+ <version>${tranqlDerbyVersion}</version>
+ <type>rar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-client-local</artifactId>
+ <version>${tranqlDerbyVersion}</version>
+ <type>rar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-client-xa</artifactId>
+ <version>${tranqlDerbyVersion}</version>
+ <type>rar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-db2-xa</artifactId>
+ <version>1.5</version>
+ <type>rar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-db2-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-informix-xa</artifactId>
+ <version>1.3</version>
+ <type>rar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-informix-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-mysql-local</artifactId>
+ <version>1.4</version>
+ <type>rar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-mysql-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-mysql-xa</artifactId>
+ <version>1.4</version>
+ <type>rar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-mysql-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-oracle-local</artifactId>
+ <version>1.6</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-xa</artifactId>
+ <version>1.6</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.6</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-postgresql-local</artifactId>
+ <version>1.3</version>
+ <type>rar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-postgresql-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-postgresql-xa</artifactId>
+ <version>1.3</version>
+ <type>rar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-postgresql-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-sqlserver2000-xa</artifactId>
+ <version>1.2</version>
+ <type>rar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-sqlserver2000-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
+ <version>1.2</version>
+ <type>rar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-sqlserver2005-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugins/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/pom.xml?rev=952750&r1=952749&r2=952750&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/pom.xml Tue Jun 8 17:49:26 2010
@@ -46,10 +46,14 @@
<dependencyManagement>
<dependencies>
+ <!--
+ Only add TranQL depends we need for system-database here.
+ The sysdb-console will import db-connectors for the rest.
+ -->
<dependency>
<groupId>org.tranql</groupId>
<artifactId>tranql-connector-ra</artifactId>
- <version>1.6</version>
+ <version>${tranqlVersion}</version>
<type>rar</type>
<exclusions>
<exclusion>
@@ -62,7 +66,7 @@
<dependency>
<groupId>org.tranql</groupId>
<artifactId>tranql-connector-derby-embed-xa</artifactId>
- <version>1.6</version>
+ <version>${tranqlDerbyVersion}</version>
<type>rar</type>
<exclusions>
<exclusion>
@@ -77,244 +81,6 @@
</dependency>
<dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-local</artifactId>
- <version>1.6</version>
- <type>rar</type>
- <exclusions>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-local</artifactId>
- <version>1.6</version>
- <type>rar</type>
- <exclusions>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-xa</artifactId>
- <version>1.6</version>
- <type>rar</type>
- <exclusions>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-db2-xa</artifactId>
- <version>1.5</version>
- <type>rar</type>
- <exclusions>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-db2-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-informix-xa</artifactId>
- <version>1.3</version>
- <type>rar</type>
- <exclusions>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-informix-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-mysql-local</artifactId>
- <version>1.4</version>
- <type>rar</type>
- <exclusions>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-mysql-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-mysql-xa</artifactId>
- <version>1.4</version>
- <type>rar</type>
- <exclusions>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-mysql-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-local</artifactId>
- <version>1.6</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-xa</artifactId>
- <version>1.6</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.6</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-postgresql-local</artifactId>
- <version>1.3</version>
- <type>rar</type>
- <exclusions>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-postgresql-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-postgresql-xa</artifactId>
- <version>1.3</version>
- <type>rar</type>
- <exclusions>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-postgresql-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2000-xa</artifactId>
- <version>1.2</version>
- <type>rar</type>
- <exclusions>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2000-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
- <version>1.2</version>
- <type>rar</type>
- <exclusions>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2005-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>pluto</artifactId>
<version>${project.version}</version>
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=952750&r1=952749&r2=952750&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 Tue Jun 8 17:49:26 2010
@@ -89,6 +89,13 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>db-connectors</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
<version>${project.version}</version>
@@ -139,101 +146,6 @@
</dependency>
<dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-ra</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-db2-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-informix-xa</artifactId>
- <type>rar</type>
- </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-oracle-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <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>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-postgresql-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2000-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>dwr</artifactId>
</dependency>
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=952750&r1=952749&r2=952750&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 Tue Jun 8 17:49:26 2010
@@ -88,6 +88,13 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>db-connectors</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
<version>${project.version}</version>
@@ -138,101 +145,6 @@
</dependency>
<dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-ra</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-db2-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-informix-xa</artifactId>
- <type>rar</type>
- </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-oracle-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <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>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-postgresql-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2000-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>dwr</artifactId>
</dependency>
Modified: geronimo/server/trunk/plugins/system-database/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database/pom.xml?rev=952750&r1=952749&r2=952750&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database/pom.xml Tue Jun 8 17:49:26 2010
@@ -85,7 +85,6 @@
<groupId>org.tranql</groupId>
<artifactId>tranql-connector-derby-embed-xa</artifactId>
<type>rar</type>
- <scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml?rev=952750&r1=952749&r2=952750&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml Tue Jun 8 17:49:26 2010
@@ -26,4 +26,9 @@
<artifactId>geronimo-derby</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-xa</artifactId>
+ <type>rar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=952750&r1=952749&r2=952750&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Jun 8 17:49:26 2010
@@ -79,8 +79,9 @@
<springVersion>2.5.6</springVersion>
<xbeanVersion>3.7</xbeanVersion>
<jetty>jetty8</jetty>
-
<txmanagerVersion>3.0</txmanagerVersion>
+ <tranqlVersion>1.6</tranqlVersion>
+ <tranqlDerbyVersion>1.6</tranqlDerbyVersion>
<monitoringConsoleVersion>${project.version}</monitoringConsoleVersion>
<pax.logging.version>1.5.0</pax.logging.version>