Author: gawor
Date: Wed Dec  2 17:12:53 2009
New Revision: 886206

URL: http://svn.apache.org/viewvc?rev=886206&view=rev
Log:
some more dependency cleanup

Modified:
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml?rev=886206&r1=886205&r2=886206&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml Wed Dec  2 17:12:53 2009
@@ -53,10 +53,9 @@
 
         <!-- g-service-builder coming from this via g-naming-builder -->
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-openejb</artifactId>
             <version>${version}</version>
-            <type>car</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml?rev=886206&r1=886205&r2=886206&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml Wed Dec  2 17:12:53 2009
@@ -34,11 +34,11 @@
     <name>Geronimo Plugins, Tomcat :: Core</name>
 
     <dependencies>
+
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction-1_6</artifactId>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector-1_6</artifactId>
             <version>${version}</version>
-            <type>car</type>
         </dependency>
 
         <dependency>
@@ -89,14 +89,6 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml?rev=886206&r1=886205&r2=886206&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml Wed Dec  2 17:12:53 2009
@@ -12,11 +12,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>ldapsdk</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-server</artifactId>
         <type>car</type>