geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r690859 [5/6] - in /geronimo/server/trunk: ./ assemblies/geronimo-jetty6-javaee5/ buildsupport/car-maven-plugin/ buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ buildsupport/car-maven-plugin/src/test/java/o...
Date Mon, 01 Sep 2008 06:30:48 GMT
Modified: geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml Sun Aug 31 23:30:25 2008
@@ -59,27 +59,10 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>false</value>
-                    </useMavenDependencies>
                     <category>EJB Container</category>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>openejb-deployer</artifactId>
-                            <version>${version}</version>
-                            <type>car</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-openejb-clustering-builder-wadi</artifactId>
-                            <version>${version}</version>
-                            <type>jar</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>openejb-clustering-wadi</artifactId>
                             <version>${version}</version>
                             <type>car</type>

Modified: geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/pom.xml Sun Aug 31 23:30:25 2008
@@ -61,10 +61,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <category>EJB Container</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -55,7 +55,6 @@
             <artifactId>openejb</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <!--<scope>runtime</scope>-->
         </dependency>
 
         <dependency>
@@ -70,15 +69,6 @@
             <version>${version}</version>
         </dependency>
 
-        <!--dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-axis</artifactId>
-        </dependency-->
-
-        <!--dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-pkgen-builder</artifactId>
-        </dependency-->
     </dependencies>
 
     <build>
@@ -87,35 +77,10 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>false</value>
-                    </useMavenDependencies>
                     <category>EJB Container</category>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>connector-deployer</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-webservices-builder</artifactId>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-openejb-builder</artifactId>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>j2ee-deployer</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>openejb</artifactId>
                             <type>car</type>
                             <import>classes</import>

Modified: geronimo/server/trunk/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/pom.xml Sun Aug 31 23:30:25 2008
@@ -82,40 +82,40 @@
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.geronimo.framework</groupId>
-                    <artifactId>geronimo-security</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.framework</groupId>
-                    <artifactId>geronimo-kernel</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.modules</groupId>
-                    <artifactId>geronimo-connector</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.framework</groupId>
-                    <artifactId>geronimo-interceptor</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.framework</groupId>
-                    <artifactId>geronimo-naming</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.modules</groupId>
-                    <artifactId>geronimo-transaction</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.modules</groupId>
-                    <artifactId>geronimo-timer</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.modules</groupId>
-                    <artifactId>geronimo-webservices</artifactId>
-                </exclusion>
-            </exclusions>
+            <!--<exclusions>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                    <!--<artifactId>geronimo-security</artifactId>-->
+                <!--</exclusion>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                    <!--<artifactId>geronimo-kernel</artifactId>-->
+                <!--</exclusion>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.apache.geronimo.modules</groupId>-->
+                    <!--<artifactId>geronimo-connector</artifactId>-->
+                <!--</exclusion>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                    <!--<artifactId>geronimo-interceptor</artifactId>-->
+                <!--</exclusion>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.apache.geronimo.framework</groupId>-->
+                    <!--<artifactId>geronimo-naming</artifactId>-->
+                <!--</exclusion>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.apache.geronimo.modules</groupId>-->
+                    <!--<artifactId>geronimo-transaction</artifactId>-->
+                <!--</exclusion>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.apache.geronimo.modules</groupId>-->
+                    <!--<artifactId>geronimo-timer</artifactId>-->
+                <!--</exclusion>-->
+                <!--<exclusion>-->
+                    <!--<groupId>org.apache.geronimo.modules</groupId>-->
+                    <!--<artifactId>geronimo-webservices</artifactId>-->
+                <!--</exclusion>-->
+            <!--</exclusions>-->
         </dependency>
 
         <dependency>
@@ -144,8 +144,10 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.xbean</groupId>
+            <groupId>org.apache.geronimo.plugins.classloaders</groupId>
             <artifactId>xbean-finder</artifactId>
+            <version>${version}</version>
+            <type>car</type>
         </dependency>
 
         <dependency>
@@ -160,10 +162,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <category>EJB Container</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -27,6 +27,41 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-loader</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-ejbd</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-server</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-client</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-javaagent</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-jee</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>asm-finder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openjpa</artifactId>
         <type>car</type>
@@ -57,9 +92,9 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
+        <groupId>org.apache.geronimo.plugins.classloaders</groupId>
         <artifactId>xbean-finder</artifactId>
-        <type>jar</type>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/trunk/plugins/openjpa/geronimo-openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/geronimo-openjpa/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/geronimo-openjpa/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/geronimo-openjpa/pom.xml Sun Aug 31 23:30:25 2008
@@ -37,6 +37,7 @@
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml Sun Aug 31 23:30:25 2008
@@ -38,8 +38,9 @@
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
             <version>${version}</version>
+            <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-transformer</artifactId>
@@ -49,12 +50,38 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.serp</groupId>
+            <artifactId>serp</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl104-over-slf4j</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml Sun Aug 31 23:30:25 2008
@@ -47,11 +47,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-openjpa</artifactId>
             <version>${version}</version>
@@ -94,10 +89,6 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <category>Persistence</category>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -49,17 +49,11 @@
             <version>${version}</version>
         </dependency>
 
-        <!--<dependency>-->
-        <!--<groupId>org.apache.xbean</groupId>-->
-        <!--<artifactId>xbean-finder</artifactId>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction</artifactId>
             <type>car</type>
             <version>${version}</version>
-            <scope>runtime</scope>
         </dependency>
 
         <!--todo get the schema classes in a config -->
@@ -75,9 +69,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>false</value>
-                    </useMavenDependencies>
                     <category>Persistence</category>
                     <dependencies>
                         <dependency>
@@ -86,17 +77,6 @@
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-persistence-jpa10-builder</artifactId>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>j2ee-deployer</artifactId>
-                            <type>car</type>
-                        </dependency>
                     </dependencies>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml Sun Aug 31 23:30:25 2008
@@ -65,12 +65,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-management</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
             <version>${version}</version>
@@ -91,28 +85,6 @@
             <type>car</type>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-test-ddbean</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-core</artifactId>
-            <version>${version}</version>
-        </dependency>
-
         <!-- for jspc. why is this needed? -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -149,10 +121,6 @@
                     </module>
                     <category>Development tools</category>
                     <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -17,41 +17,16 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>commons-fileupload</groupId>
-        <artifactId>commons-fileupload</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console-jetty</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-management</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>plugin</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-test-ddbean</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>console-core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>connector-deployer</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml Sun Aug 31 23:30:25 2008
@@ -65,12 +65,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-management</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
             <version>${version}</version>
@@ -91,27 +85,6 @@
             <type>car</type>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-test-ddbean</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-core</artifactId>
-            <version>${version}</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -144,10 +117,6 @@
                        Plan creator plugin for Tomcat
                     </description>
                     <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -17,36 +17,11 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>commons-fileupload</groupId>
-        <artifactId>commons-fileupload</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-management</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>plugin</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-test-ddbean</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>console-core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>connector-deployer</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml Sun Aug 31 23:30:25 2008
@@ -42,6 +42,14 @@
             <scope>provided</scope>
         </dependency>
             
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>j2ee-system</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- for jspc maven plugin -->
         <dependency>
             <groupId>org.apache.pluto</groupId>

Modified: geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml Sun Aug 31 23:30:25 2008
@@ -125,10 +125,6 @@
                         for portlet applications that are shared across the web container.
                     </description>
                     <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Sun Aug 31 23:30:25 2008
@@ -14,11 +14,7 @@
     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$ $Date$ -->
-
-<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">
+--><!-- $Rev$ $Date$ --><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>
     
@@ -92,7 +88,8 @@
         <module>sharedlib</module>
         <module>welcome</module>
         <module>concurrent</module>
-    </modules>
+    <module>classloaders</module>
+  </modules>
     
     <build>
         <plugins>
@@ -107,12 +104,11 @@
                         <addMavenDescriptor>false</addMavenDescriptor>
                     </archive>
                     <osiApproved>true</osiApproved>
-                    <!--
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
+                        <useTransitiveDependencies>true</useTransitiveDependencies>
                     </useMavenDependencies>
-                    -->
                     <commonInstance>
                         <plugin-artifact>
                             <geronimo-version>${geronimoVersion}</geronimo-version>
@@ -131,4 +127,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file

Modified: geronimo/server/trunk/plugins/spring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/spring/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/spring/pom.xml (original)
+++ geronimo/server/trunk/plugins/spring/pom.xml Sun Aug 31 23:30:25 2008
@@ -80,10 +80,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <category>Geronimo Core</category>
                 </configuration>
             </plugin>

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=690859&r1=690858&r2=690859&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 Sun Aug 31 23:30:25 2008
@@ -206,16 +206,6 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.directwebremoting</groupId>
             <artifactId>dwr</artifactId>
         </dependency>
@@ -226,6 +216,7 @@
             <artifactId>jasper</artifactId>
             <version>${version}</version>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -256,10 +247,6 @@
                     </module>
                     <category>Databases</category>
                     <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

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=690859&r1=690858&r2=690859&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 Sun Aug 31 23:30:25 2008
@@ -7,29 +7,9 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.tranql</groupId>
-        <artifactId>tranql-connector-derby-embed-local</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-postgresql-local</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-postgresql-xa</artifactId>
-        <type>rar</type>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>console-jetty</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
@@ -43,18 +23,13 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-gbean-deployer</artifactId>
+        <artifactId>plugin</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.tranql</groupId>
-        <artifactId>tranql-connector-ra</artifactId>
-        <type>rar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.tranql</groupId>
-        <artifactId>tranql-connector-db2-xa</artifactId>
-        <type>rar</type>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-gbean-deployer</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
@@ -62,9 +37,9 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>jasper</artifactId>
-        <type>car</type>
+        <groupId>org.tranql</groupId>
+        <artifactId>tranql-connector-derby-embed-local</artifactId>
+        <type>rar</type>
     </dependency>
     <dependency>
         <groupId>org.tranql</groupId>
@@ -72,39 +47,29 @@
         <type>rar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-management</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-kernel</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-derby</artifactId>
-        <type>jar</type>
+        <groupId>org.tranql</groupId>
+        <artifactId>tranql-connector-mysql-local</artifactId>
+        <type>rar</type>
     </dependency>
     <dependency>
-        <groupId>org.directwebremoting</groupId>
-        <artifactId>dwr</artifactId>
-        <type>jar</type>
+        <groupId>org.tranql</groupId>
+        <artifactId>tranql-connector-postgresql-local</artifactId>
+        <type>rar</type>
     </dependency>
     <dependency>
-        <groupId>commons-fileupload</groupId>
-        <artifactId>commons-fileupload</artifactId>
-        <type>jar</type>
+        <groupId>org.tranql</groupId>
+        <artifactId>tranql-connector-postgresql-xa</artifactId>
+        <type>rar</type>
     </dependency>
     <dependency>
         <groupId>org.tranql</groupId>
-        <artifactId>tranql-connector-derby-embed-xa</artifactId>
+        <artifactId>tranql-connector-derby-client-local</artifactId>
         <type>rar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>console-jetty</artifactId>
-        <type>car</type>
+        <groupId>org.tranql</groupId>
+        <artifactId>tranql-connector-ra</artifactId>
+        <type>rar</type>
     </dependency>
     <dependency>
         <groupId>org.tranql</groupId>
@@ -112,19 +77,9 @@
         <type>rar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>plugin</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-test-ddbean</artifactId>
-        <type>jar</type>
+        <groupId>org.tranql</groupId>
+        <artifactId>tranql-connector-db2-xa</artifactId>
+        <type>rar</type>
     </dependency>
     <dependency>
         <groupId>org.tranql</groupId>
@@ -132,11 +87,6 @@
         <type>rar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>console-core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.tranql</groupId>
         <artifactId>tranql-connector-oracle-local</artifactId>
         <type>rar</type>

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=690859&r1=690858&r2=690859&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 Sun Aug 31 23:30:25 2008
@@ -201,16 +201,6 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.directwebremoting</groupId>
             <artifactId>dwr</artifactId>
         </dependency>
@@ -243,10 +233,6 @@
                     </module>
                     <category>Databases</category>
                     <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

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=690859&r1=690858&r2=690859&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 Sun Aug 31 23:30:25 2008
@@ -7,29 +7,9 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.tranql</groupId>
-        <artifactId>tranql-connector-derby-embed-local</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-postgresql-local</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-postgresql-xa</artifactId>
-        <type>rar</type>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>console-tomcat</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
@@ -47,14 +27,9 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.tranql</groupId>
-        <artifactId>tranql-connector-ra</artifactId>
-        <type>rar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.tranql</groupId>
-        <artifactId>tranql-connector-db2-xa</artifactId>
-        <type>rar</type>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>plugin</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
@@ -63,37 +38,37 @@
     </dependency>
     <dependency>
         <groupId>org.tranql</groupId>
-        <artifactId>tranql-connector-mysql-xa</artifactId>
+        <artifactId>tranql-connector-derby-embed-local</artifactId>
         <type>rar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>console-tomcat</artifactId>
-        <type>car</type>
+        <groupId>org.tranql</groupId>
+        <artifactId>tranql-connector-mysql-xa</artifactId>
+        <type>rar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-management</artifactId>
-        <type>jar</type>
+        <groupId>org.tranql</groupId>
+        <artifactId>tranql-connector-mysql-local</artifactId>
+        <type>rar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-kernel</artifactId>
-        <type>jar</type>
+        <groupId>org.tranql</groupId>
+        <artifactId>tranql-connector-postgresql-local</artifactId>
+        <type>rar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-derby</artifactId>
-        <type>jar</type>
+        <groupId>org.tranql</groupId>
+        <artifactId>tranql-connector-postgresql-xa</artifactId>
+        <type>rar</type>
     </dependency>
     <dependency>
-        <groupId>org.directwebremoting</groupId>
-        <artifactId>dwr</artifactId>
-        <type>jar</type>
+        <groupId>org.tranql</groupId>
+        <artifactId>tranql-connector-derby-client-local</artifactId>
+        <type>rar</type>
     </dependency>
     <dependency>
         <groupId>org.tranql</groupId>
-        <artifactId>tranql-connector-derby-embed-xa</artifactId>
+        <artifactId>tranql-connector-ra</artifactId>
         <type>rar</type>
     </dependency>
     <dependency>
@@ -102,24 +77,9 @@
         <type>rar</type>
     </dependency>
     <dependency>
-        <groupId>commons-fileupload</groupId>
-        <artifactId>commons-fileupload</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>plugin</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-test-ddbean</artifactId>
-        <type>jar</type>
+        <groupId>org.tranql</groupId>
+        <artifactId>tranql-connector-db2-xa</artifactId>
+        <type>rar</type>
     </dependency>
     <dependency>
         <groupId>org.tranql</groupId>
@@ -127,11 +87,6 @@
         <type>rar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>console-core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.tranql</groupId>
         <artifactId>tranql-connector-oracle-local</artifactId>
         <type>rar</type>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml Sun Aug 31 23:30:25 2008
@@ -96,6 +96,11 @@
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl104-over-slf4j</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml Sun Aug 31 23:30:25 2008
@@ -33,11 +33,18 @@
     <name>Geronimo Plugins, Tomcat :: Clustering Builder for WADI Core</name>
     
     <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat6-clustering-wadi</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
         <!-- xmlbeans, stax-api comes transitively via g-service-builder from this -->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-naming-builder</artifactId>
             <version>${version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -49,12 +56,6 @@
 
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-tomcat6-clustering-wadi</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-web-2.5-builder</artifactId>
             <version>${version}</version>
             <scope>test</scope>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml Sun Aug 31 23:30:25 2008
@@ -40,9 +40,10 @@
         </dependency>
 
         <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-tomcat6</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat6-no-ha</artifactId>
             <version>${version}</version>
+            <type>car</type>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/WADIClusteredValve.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/WADIClusteredValve.java?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/WADIClusteredValve.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/WADIClusteredValve.java Sun Aug 31 23:30:25 2008
@@ -33,6 +33,7 @@
 import javax.servlet.ServletInputStream;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
+import javax.servlet.ServletContext;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -234,6 +235,104 @@
             throw new UnsupportedOperationException();
         }
 
+        /**
+         * Get the servlet context the request-response pair was last dispatched through.
+         *
+         * @return the latest ServletContext on the dispatch chain.
+         * @since 3.0
+         */
+        public ServletContext getServletContext() {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * Gets the associated servlet response.
+         *
+         * @return the ServletResponse associated with this request.
+         * @since 3.0
+         */
+        public ServletResponse getServletResponse() {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * complete a suspended request.
+         *
+         * @throws IllegalStateException
+         * @since 3.0
+         */
+        public void complete() throws IllegalStateException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * Suspend request processing.  Must be called by a thread that is processing this request.
+         *
+         * @param timeoutMilliseconds new timeout period, in milliseconds
+         * @throws IllegalStateException if called by a thread not processing this request or after error dispatch
+         * @see #complete
+         * @see #resume
+         * @since 3.0
+         */
+        public void suspend(long timeoutMilliseconds) throws IllegalStateException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * Similar to suspend(timeoutMilliseconds) but with a container supplied timeout period.
+         *
+         * @throws IllegalStateException
+         * @see #complete
+         * @see #resume
+         * @since 3.0
+         */
+        public void suspend() throws IllegalStateException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * Resume a suspended request
+         *
+         * @throws IllegalStateException if the request is not suspended
+         * @see #suspend
+         * @since 3.0
+         */
+        public void resume() throws IllegalStateException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * @return if the request is suspended
+         * @since 3.0
+         */
+        public boolean isSuspended() {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * @return if the request is resumed
+         * @since 3.0
+         */
+        public boolean isResumed() {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * @return if the request is timed out
+         * @since 3.0
+         */
+        public boolean isTimeout() {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * @return if the request has never been suspended (or resumed)
+         * @since 3.0
+         */
+        public boolean isInitial() {
+            throw new UnsupportedOperationException();
+        }
+
         public Locale getLocale() {
             throw new UnsupportedOperationException();
         }

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=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml Sun Aug 31 23:30:25 2008
@@ -33,29 +33,31 @@
     <name>Geronimo Plugins, Tomcat :: Core</name>
     
     <dependencies>
-        <!-- g-transaction, g-system comes from this -->
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-connector</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transaction</artifactId>
             <version>${version}</version>
+            <type>car</type>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-naming</artifactId>
-            <version>${version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>rmi-naming</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-webservices</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>webservices-common</artifactId>
+            <type>car</type>
             <version>${version}</version>
         </dependency>
 
         <!-- g-security comes from this -->
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-security-builder</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-security</artifactId>
             <version>${version}</version>
         </dependency>
 
@@ -87,14 +89,27 @@
             <artifactId>coyote</artifactId>
         </dependency>
         
+        <!--<dependency>-->
+            <!--<groupId>org.apache.tomcat.extras</groupId>-->
+            <!--<artifactId>juli</artifactId>-->
+        <!--</dependency>-->
+
         <dependency>
             <groupId>org.apache.tomcat.extras</groupId>
-            <artifactId>juli</artifactId>
+            <artifactId>juli-adapters</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tomcat.extras</groupId>
-            <artifactId>juli-adapters</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl104-over-slf4j</artifactId>
+            <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>
 

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/StaticMemberGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/StaticMemberGBean.java?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/StaticMemberGBean.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/cluster/StaticMemberGBean.java Sun Aug 31 23:30:25 2008
@@ -18,15 +18,14 @@
 
 import java.util.Map;
 
-import org.apache.catalina.tribes.ChannelInterceptor;
 import org.apache.catalina.tribes.membership.StaticMember;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.tomcat.BaseGBean;
 import org.apache.geronimo.tomcat.ObjectRetriever;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Rev$ $Date$
@@ -34,7 +33,7 @@
 public class StaticMemberGBean extends BaseGBean implements
         GBeanLifecycle, ObjectRetriever {
 
-    private static final Log log = LogFactory.getLog(StaticMemberGBean.class);
+    private static final Logger log = LoggerFactory.getLogger(StaticMemberGBean.class);
 
     public static final String J2EE_TYPE = "StaticMember";
 

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml Sun Aug 31 23:30:25 2008
@@ -63,27 +63,10 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>false</value>
-                    </useMavenDependencies>
                     <category>Tomcat</category>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>tomcat6-deployer</artifactId>
-                            <version>${version}</version>
-                            <type>car</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-tomcat6-clustering-builder-wadi</artifactId>
-                            <version>${version}</version>
-                            <type>jar</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>tomcat6-clustering-wadi</artifactId>
                             <version>${version}</version>
                             <type>car</type>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/pom.xml Sun Aug 31 23:30:25 2008
@@ -63,10 +63,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <category>Tomcat</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -66,11 +66,11 @@
             <version>${version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-web-2.5-builder</artifactId>
-            <version>${version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-web-2.5-builder</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
     </dependencies>
 
     <build>
@@ -86,35 +86,10 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>false</value>
-                    </useMavenDependencies>
                     <category>Tomcat</category>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>connector-deployer</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-tomcat6-builder</artifactId>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>j2ee-deployer</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-web-2.5-builder</artifactId>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>tomcat6</artifactId>
                             <type>car</type>
                             <import>classes</import>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -18,11 +18,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-web-2.5-builder</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-tomcat6-builder</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-no-ha/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-no-ha/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-no-ha/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-no-ha/pom.xml Sun Aug 31 23:30:25 2008
@@ -65,10 +65,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <category>Tomcat</category>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml Sun Aug 31 23:30:25 2008
@@ -80,13 +80,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>webservices-common</artifactId>
-            <type>car</type>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>catalina</artifactId>
         </dependency>
@@ -138,10 +131,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <category>Tomcat</category>
                     <instance>
                         <plugin-artifact>

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=690859&r1=690858&r2=690859&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 Sun Aug 31 23:30:25 2008
@@ -22,23 +22,8 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.tomcat.extras</groupId>
-        <artifactId>juli</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.tomcat</groupId>
-        <artifactId>coyote</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.tomcat.extras</groupId>
-        <artifactId>juli-adapters</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.tomcat</groupId>
-        <artifactId>catalina-ha</artifactId>
+        <artifactId>tribes</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -57,13 +42,18 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.tomcat</groupId>
+        <artifactId>catalina-ha</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>webservices-common</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.tomcat</groupId>
-        <artifactId>tribes</artifactId>
+        <artifactId>coyote</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/pom.xml Sun Aug 31 23:30:25 2008
@@ -36,6 +36,30 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty6-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -59,12 +83,14 @@
             <artifactId>geronimo-uddi-server</artifactId>
             <version>${version}</version>
             <type>war</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-derby-embed-local</artifactId>
             <type>rar</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -74,30 +100,6 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -118,10 +120,6 @@
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <category>Web Services</category>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -12,16 +12,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.tranql</groupId>
-        <artifactId>tranql-connector-derby-embed-local</artifactId>
-        <type>rar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>geronimo-uddi-server</artifactId>
-        <type>war</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>axis</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/pom.xml Sun Aug 31 23:30:25 2008
@@ -36,6 +36,30 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat6-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -59,17 +83,14 @@
             <artifactId>geronimo-uddi-server</artifactId>
             <version>${version}</version>
             <type>war</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-derby-embed-local</artifactId>
             <type>rar</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -79,30 +100,6 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
             <version>${version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -12,16 +12,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.tranql</groupId>
-        <artifactId>tranql-connector-derby-embed-local</artifactId>
-        <type>rar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>geronimo-uddi-server</artifactId>
-        <type>war</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>axis</artifactId>
         <type>car</type>
@@ -41,9 +31,4 @@
         <artifactId>system-database</artifactId>
         <type>car</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.derby</groupId>
-        <artifactId>derby</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml Sun Aug 31 23:30:25 2008
@@ -51,15 +51,15 @@
             <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-saaj_1.3_spec</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-saaj_1.3_spec</artifactId>-->
+        <!--</dependency>-->
         
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>asm</groupId>-->
+            <!--<artifactId>asm</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>wsdl4j</groupId>

Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml Sun Aug 31 23:30:25 2008
@@ -60,16 +60,19 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
@@ -82,10 +85,10 @@
             <artifactId>wsdl4j</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.ws.scout</groupId>
-            <artifactId>scout</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.ws.scout</groupId>-->
+            <!--<artifactId>scout</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -110,6 +113,11 @@
             <artifactId>geronimo-activation_1.1_spec</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl104-over-slf4j</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml Sun Aug 31 23:30:25 2008
@@ -76,28 +76,28 @@
             <artifactId>geronimo-webservices</artifactId>
             <version>${version}</version>
         </dependency>
-
+<!--
         <dependency>
             <groupId>org.apache.geronimo.schema</groupId>
             <artifactId>geronimo-schema-jee_5</artifactId>
         </dependency>
-
+-->
         <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
         </dependency>
 
         <!-- StAX implementation -->
-        <dependency>
-            <groupId>woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.codehaus.woodstox</groupId>-->
+            <!--<artifactId>wstx-asl</artifactId>-->
+        <!--</dependency>-->
 
         <!-- JAXB implementation -->
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>com.sun.xml.bind</groupId>-->
+            <!--<artifactId>jaxb-impl</artifactId>-->
+        <!--</dependency>-->
 
         <!-- default SAAJ 1.3 implementation -->
         <dependency>
@@ -112,10 +112,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <category>Web Services</category>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/webservices/webservices-common/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -7,16 +7,6 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.schema</groupId>
-        <artifactId>geronimo-schema-jee_5</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>woodstox</groupId>
-        <artifactId>wstx-asl</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>j2ee-security</artifactId>
         <type>car</type>
@@ -32,8 +22,8 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
+        <groupId>org.codehaus.castor</groupId>
+        <artifactId>castor</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -56,4 +46,9 @@
         <artifactId>wsdl4j</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+        <artifactId>geronimo-schema-jee_5</artifactId>
+        <type>car</type>
+    </dependency>
 </plugin-artifact>



Mime
View raw message