geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r952785 - in /geronimo/server/trunk/plugins: connector-1_6/db-connectors/pom.xml connector-1_6/pom.xml system-database/pom.xml system-database/system-database/pom.xml system-database/system-database/src/main/history/dependencies.xml
Date Tue, 08 Jun 2010 19:31:55 GMT
Author: dwoods
Date: Tue Jun  8 19:31:55 2010
New Revision: 952785

URL: http://svn.apache.org/viewvc?rev=952785&view=rev
Log:
move derby-embed-local to system-database, as several other plugins depend on system-database
to provide it

Modified:
    geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml
    geronimo/server/trunk/plugins/connector-1_6/pom.xml
    geronimo/server/trunk/plugins/system-database/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

Modified: 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=952785&r1=952784&r2=952785&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/db-connectors/pom.xml Tue Jun  8 19:31:55
2010
@@ -69,17 +69,18 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- These are pulled in/provided by system-database
         <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>

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=952785&r1=952784&r2=952785&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/pom.xml Tue Jun  8 19:31:55 2010
@@ -116,6 +116,7 @@
                 </exclusions>
             </dependency>
 
+            <!-- These are defined in system-database
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-derby-embed-xa</artifactId>
@@ -132,7 +133,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-
             <dependency>
                 <groupId>org.tranql</groupId>
                 <artifactId>tranql-connector-derby-embed-local</artifactId>
@@ -149,6 +149,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            -->
 
             <dependency>
                 <groupId>org.tranql</groupId>

Modified: geronimo/server/trunk/plugins/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/pom.xml?rev=952785&r1=952784&r2=952785&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/pom.xml Tue Jun  8 19:31:55 2010
@@ -81,6 +81,23 @@
             </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.apache.geronimo.plugins</groupId>
                 <artifactId>pluto</artifactId>
                 <version>${project.version}</version>

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=952785&r1=952784&r2=952785&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 19:31:55
2010
@@ -87,6 +87,11 @@
             <type>rar</type>
         </dependency>
 
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-local</artifactId>
+            <type>rar</type>
+        </dependency>
     </dependencies>
 
     <build>

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=952785&r1=952784&r2=952785&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 19:31:55 2010
@@ -28,6 +28,11 @@
     </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>



Mime
View raw message