geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r690859 [4/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/debugviews/debugviews-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml Sun Aug 31 23:30:25 2008
@@ -57,11 +57,12 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
+<!--        <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-core</artifactId>
             <version>${version}</version>
         </dependency>
+-->
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
@@ -71,6 +72,7 @@
         </dependency>
 
         <dependency>
+<!-- really? -->
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${version}</version>
@@ -84,38 +86,6 @@
             <type>car</type>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-naming</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-management</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.directwebremoting</groupId>
-            <artifactId>dwr</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
@@ -145,10 +115,6 @@
                     </module>
                     <category>Debug</category>
                     <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -7,11 +7,6 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.directwebremoting</groupId>
-        <artifactId>dwr</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>dojo-legacy-tomcat</artifactId>
         <type>car</type>
@@ -23,37 +18,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-j2ee</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>geronimo-kernel</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-servlet_2.5_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-naming</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-gbean-deployer</artifactId>
         <type>car</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>console-core</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml Sun Aug 31 23:30:25 2008
@@ -41,49 +41,25 @@
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-security</artifactId>
+            <artifactId>geronimo-service-builder</artifactId>
             <version>${version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
+            <artifactId>geronimo-j2ee</artifactId>
             <version>${version}</version>
         </dependency>
-
         <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-finder</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>jee-specs</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-finder</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml Sun Aug 31 23:30:25 2008
@@ -36,7 +36,7 @@
         <!-- XmlBeansUtil is needed --> 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
+            <artifactId>geronimo-deployment</artifactId>
             <version>${version}</version>
         </dependency>
         
@@ -46,11 +46,6 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-        </dependency>
-        
-        <dependency>
             <groupId>org.apache.geronimo.schema</groupId>
             <artifactId>geronimo-schema-jee_5</artifactId>
         </dependency>

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

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-test-ddbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-test-ddbean/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-test-ddbean/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-test-ddbean/pom.xml Sun Aug 31 23:30:25 2008
@@ -33,18 +33,23 @@
     <name>Geronimo Plugins, J2EE :: Test DDBeans</name>
     
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee-schema</artifactId>
-            <version>${version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-j2ee-schema</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
 
         <!-- g-javaee-deployment_1.1MR3_spec comes from this via g-deploy-config -->
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
+            <artifactId>geronimo-deployment</artifactId>
             <version>${version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml Sun Aug 31 23:30:25 2008
@@ -55,6 +55,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -50,7 +50,6 @@
             <artifactId>j2ee-server</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <scope>runtime</scope>
         </dependency>
 
         <dependency>
@@ -58,7 +57,6 @@
             <artifactId>server-security-config</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <scope>runtime</scope>
         </dependency>
 
         <dependency>
@@ -68,8 +66,10 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.schema</groupId>
+            <groupId>org.apache.geronimo.plugins.classloaders</groupId>
             <artifactId>geronimo-schema-jee_5</artifactId>
+            <version>${version}</version>
+            <type>car</type>
         </dependency>
 
         <dependency>
@@ -77,11 +77,11 @@
             <artifactId>geronimo-schema-j2ee_1.4</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-client</artifactId>
-            <version>${version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-client</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -115,9 +115,10 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.xbean</groupId>
+            <groupId>org.apache.geronimo.plugins.classloaders</groupId>
             <artifactId>xbean-finder</artifactId>
-            <scope>runtime</scope>
+            <version>${version}</version>
+            <type>car</type>
         </dependency>
     </dependencies>
 
@@ -127,33 +128,9 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>false</value>
-                    </useMavenDependencies>
                     <category>JavaEE deployment</category>
                     <dependencies>
                         <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-j2ee-schema</artifactId>
-                            <version>2.2-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.schema</groupId>
-                            <artifactId>geronimo-schema-jee_5</artifactId>
-                            <version>1.1</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.schema</groupId>
-                            <artifactId>geronimo-schema-j2ee_1.4</artifactId>
-                            <version>1.2</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>j2ee-server</artifactId>
                             <version>2.2-SNAPSHOT</version>
@@ -161,67 +138,12 @@
                             <import>classes</import>
                         </dependency>
                         <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-test-ddbean</artifactId>
-                            <version>2.2-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-naming-builder</artifactId>
-                            <version>2.2-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-security-builder</artifactId>
-                            <version>2.2-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
                             <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>server-security-config</artifactId>
                             <version>2.2-SNAPSHOT</version>
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-j2ee-builder</artifactId>
-                            <version>2.2-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-gbean-deployer</artifactId>
-                            <version>2.2-SNAPSHOT</version>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-client</artifactId>
-                            <version>2.2-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.xbean</groupId>
-                            <artifactId>xbean-finder</artifactId>
-                            <version>3.4.1</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-web-2.5-builder</artifactId>
-                            <version>2.2-SNAPSHOT</version>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
                     </dependencies>
 
                     <instance>

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -12,24 +12,14 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>j2ee-server</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-naming-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee-schema</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-web-2.5-builder</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+        <artifactId>xbean-finder</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.schema</groupId>
@@ -37,33 +27,38 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>server-security-config</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-j2ee-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.schema</groupId>
-        <artifactId>geronimo-schema-jee_5</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-gbean-deployer</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-finder</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.plugins.classloaders</groupId>
+        <artifactId>geronimo-schema-jee_5</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency start="true">
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>j2ee-server</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-client</artifactId>
+        <artifactId>geronimo-j2ee-schema</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
+    <dependency start="true">
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-gbean-deployer</artifactId>
+        <artifactId>server-security-config</artifactId>
         <type>car</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-web-2.5-builder</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml Sun Aug 31 23:30:25 2008
@@ -77,26 +77,26 @@
             <version>${version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-webservices</artifactId>
-            <version>${version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-webservices</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-reflect</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.xbean</groupId>-->
+            <!--<artifactId>xbean-reflect</artifactId>-->
+        <!--</dependency>-->
 
         <!-- purpose unknown -->
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-commons</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>asm</groupId>-->
+            <!--<artifactId>asm</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>asm</groupId>-->
+            <!--<artifactId>asm-commons</artifactId>-->
+        <!--</dependency>-->
     </dependencies>
     
     <build>
@@ -105,10 +105,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <category>JavaEE</category>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -12,43 +12,8 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-reflect</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>geronimo-core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-common</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>rmi-naming</artifactId>
         <type>car</type>
     </dependency>
-    <dependency>
-        <groupId>asm</groupId>
-        <artifactId>asm-commons</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-webservices</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml Sun Aug 31 23:30:25 2008
@@ -41,6 +41,13 @@
             <scope>runtime</scope>
             <type>car</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>xmlbeans</artifactId>
+            <version>${version}</version>
+            <scope>runtime</scope>
+            <type>car</type>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -55,17 +62,9 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>false</value>
-                    </useMavenDependencies>
+                    <warnOnDependencyChange>true</warnOnDependencyChange>
                     <dependencies>
                         <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-j2ee-builder</artifactId>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
                             <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>jsr88-cli</artifactId>
                             <type>car</type>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml Sun Aug 31 23:30:25 2008
@@ -38,7 +38,6 @@
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jsr88-cli</artifactId>
             <version>${version}</version>
-            <scope>runtime</scope>
             <type>car</type>
         </dependency>
 
@@ -55,17 +54,9 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>false</value>
-                    </useMavenDependencies>
+                    <warnOnDependencyChange>true</warnOnDependencyChange>
                     <dependencies>
                         <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-client-builder</artifactId>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
-                        <dependency>
                             <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>jsr88-cli</artifactId>
                             <type>car</type>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml Sun Aug 31 23:30:25 2008
@@ -38,7 +38,6 @@
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jsr88-cli</artifactId>
             <version>${version}</version>
-            <scope>runtime</scope>
             <type>car</type>
         </dependency>
 
@@ -46,7 +45,6 @@
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
             <version>${version}</version>
-            <scope>runtime</scope>
             <type>car</type>
         </dependency>
     </dependencies>
@@ -57,10 +55,9 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>false</value>
-                    </useMavenDependencies>
+                    <warnOnDependencyChange>true</warnOnDependencyChange>
                     <dependencies>
+                        <!-- should this be the connector-deployer jar??? -->
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>connector-deployer</artifactId>

Modified: geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml Sun Aug 31 23:30:25 2008
@@ -38,7 +38,6 @@
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>jsr88-cli</artifactId>
             <version>${version}</version>
-            <scope>runtime</scope>
             <type>car</type>
         </dependency>
 
@@ -55,17 +54,9 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>false</value>
-                    </useMavenDependencies>
+                    <warnOnDependencyChange>true</warnOnDependencyChange>
                     <dependencies>
                         <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.framework</groupId>
                             <artifactId>jsr88-cli</artifactId>
                             <type>car</type>

Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml Sun Aug 31 23:30:25 2008
@@ -65,30 +65,33 @@
         <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-jsp_2.1_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-el_1.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
         
         <!--
         TODO: See if this logging package is really needed.
         -->
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>juli</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.tomcat</groupId>-->
+            <!--<artifactId>juli</artifactId>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>catalina</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.tomcat</groupId>-->
+            <!--<artifactId>catalina</artifactId>-->
+        <!--</dependency>-->
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -63,9 +63,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>false</value>
-                    </useMavenDependencies>
                     <category>JavaEE deployment</category>
                     <dependencies>
                         <dependency>
@@ -74,17 +71,6 @@
                             <type>car</type>
                             <import>classes</import>
                         </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-jasper-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/jasper/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper/pom.xml Sun Aug 31 23:30:25 2008
@@ -71,21 +71,22 @@
             <version>${version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>jasper</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>jasper-jdt</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>jasper-el</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.tomcat</groupId>-->
+            <!--<artifactId>jasper</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.tomcat</groupId>-->
+            <!--<artifactId>jasper-jdt</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+            <!--<groupId>org.apache.tomcat</groupId>-->
+            <!--<artifactId>jasper-el</artifactId>-->
+        <!--</dependency>-->
 
+        <!-- are these required? -->
         <dependency>
             <groupId>org.apache.tomcat.extras</groupId>
             <artifactId>juli-adapters</artifactId>
@@ -103,10 +104,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <category>Web Framework</category>
                 </configuration>
             </plugin>

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

Modified: geronimo/server/trunk/plugins/javamail/javamail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/javamail/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/javamail/javamail/pom.xml (original)
+++ geronimo/server/trunk/plugins/javamail/javamail/pom.xml Sun Aug 31 23:30:25 2008
@@ -52,11 +52,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.javamail</groupId>
-            <artifactId>geronimo-javamail_1.4_mail</artifactId>
-        </dependency>
-        
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-mail</artifactId>
             <version>${version}</version>
@@ -69,10 +64,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <category>JavaEE</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/plugins/javamail/javamail/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/javamail/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/javamail/javamail/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/javamail/javamail/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -16,9 +16,4 @@
         <artifactId>rmi-naming</artifactId>
         <type>car</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.javamail</groupId>
-        <artifactId>geronimo-javamail_1.4_mail</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml Sun Aug 31 23:30:25 2008
@@ -49,6 +49,11 @@
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-command-api</artifactId>
         </dependency>
+        
+        <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml Sun Aug 31 23:30:25 2008
@@ -38,6 +38,11 @@
             <artifactId>geronimo-naming</artifactId>
             <version>${version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -49,12 +54,17 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         </dependency>
-        
+
         <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-finder</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
         </dependency>
 
+        <!--<dependency>-->
+            <!--<groupId>org.apache.xbean</groupId>-->
+            <!--<artifactId>xbean-finder</artifactId>-->
+        <!--</dependency>-->
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.0_spec</artifactId>
@@ -65,11 +75,11 @@
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-webservices</artifactId>
-            <version>${version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-webservices</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -82,9 +92,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.schema</groupId>
+            <groupId>org.apache.geronimo.plugins.classloaders</groupId>
             <artifactId>geronimo-schema-jee_5</artifactId>
+            <version>${version}</version>
+            <type>car</type>    
         </dependency>
+
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -72,7 +72,7 @@
                             <mainClass>org.apache.geronimo.jaxws.builder.JAXWSToolsCLI</mainClass>
                         </manifest>
                     </archive>
-                    
+                    <warnOnDependencyChange>true</warnOnDependencyChange>
                     <!--
                     NOTE: This list of dependencies is non-transitive.
                     -->

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/pom.xml Sun Aug 31 23:30:25 2008
@@ -46,6 +46,14 @@
         </dependency>
         
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>jee-specs</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <!-- TODO remove this WTF??? why isn't this picked up from geronimo-web-2.5-builder? -->
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml Sun Aug 31 23:30:25 2008
@@ -34,9 +34,10 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jetty6-clustering-wadi</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty6-clustering-wadi</artifactId>
             <version>${version}</version>
+            <type>car</type>
         </dependency>
 
         <!-- xmlbeans, stax-api comes transitively via g-service-builder from this -->

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

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml Sun Aug 31 23:30:25 2008
@@ -46,12 +46,28 @@
             <version>${version}</version>
         </dependency>
 
-        <!-- xbean-reflect, g-management come via g-j2ee from this -->
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-webservices</artifactId>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>jee-specs</artifactId>
             <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>webservices-common</artifactId>
+            <type>car</type>
+            <version>${version}</version>
+        </dependency>
+
+        <!-- xbean-reflect, g-management come via g-j2ee from this -->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-webservices</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<scope>provided</scope>-->
+        <!--</dependency>-->
          
         <dependency>
             <groupId>org.mortbay.jetty</groupId>

Modified: geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6-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>Jetty</category>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>jetty6-deployer</artifactId>
-                            <version>${version}</version>
-                            <type>car</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-jetty6-clustering-builder-wadi</artifactId>
-                            <version>${version}</version>
-                            <type>jar</type>
-                        </dependency>
-
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>jetty6-clustering-wadi</artifactId>
                             <version>${version}</version>
                             <type>car</type>

Modified: geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml Sun Aug 31 23:30:25 2008
@@ -42,12 +42,12 @@
             <version>${version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>jetty6</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -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>Jetty</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -65,11 +65,6 @@
             <version>${version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-web-2.5-builder</artifactId>
-            <version>${version}</version>
-        </dependency>
     </dependencies>
     
     <build>
@@ -78,39 +73,14 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>false</value>
-                    </useMavenDependencies>
                     <category>Jetty</category>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>connector-deployer</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>jetty6</artifactId>
                             <type>car</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.modules</groupId>
-                            <artifactId>geronimo-jetty6-builder</artifactId>
-                            <type>jar</type>
-                            <import>classes</import>
-                        </dependency>
                     </dependencies>
                     <instance>
                         <plugin-artifact>

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

Modified: geronimo/server/trunk/plugins/jetty/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6/pom.xml Sun Aug 31 23:30:25 2008
@@ -65,18 +65,12 @@
             <type>car</type>
         </dependency>
 
-        <!-- This dependency should be retrieved by transitivity -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jetty6</artifactId>
             <version>${version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-
         <!--<dependency>-->
         <!--<groupId>org.apache.geronimo.configs</groupId>-->
         <!--<artifactId>jasper</artifactId>-->
@@ -84,25 +78,25 @@
         <!--<version>${version}</version>-->
         <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.mortbay.jetty</groupId>-->
+            <!--<artifactId>jetty</artifactId>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-ajp</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.mortbay.jetty</groupId>-->
+            <!--<artifactId>jetty-ajp</artifactId>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-sslengine</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.mortbay.jetty</groupId>-->
+            <!--<artifactId>jetty-sslengine</artifactId>-->
+        <!--</dependency>-->
 
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.mortbay.jetty</groupId>-->
+            <!--<artifactId>jetty-util</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -118,62 +112,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>false</value>
-                    </useMavenDependencies>
-                    <category>Jetty</category>
-                    <dependencies>
-                        <dependency start="true">
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>j2ee-server</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency start="true">
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>server-security-config</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency start="true">
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>transaction</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency start="true">
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-jetty6</artifactId>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency start="true">
-                            <groupId>org.slf4j</groupId>
-                            <artifactId>slf4j-api</artifactId>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency start="true">
-                            <groupId>org.mortbay.jetty</groupId>
-                            <artifactId>jetty</artifactId>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency start="true">
-                            <groupId>org.mortbay.jetty</groupId>
-                            <artifactId>jetty-ajp</artifactId>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency start="true">
-                            <groupId>org.mortbay.jetty</groupId>
-                            <artifactId>jetty-sslengine</artifactId>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency start="true">
-                            <groupId>org.mortbay.jetty</groupId>
-                            <artifactId>jetty-util</artifactId>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency start="true">
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>webservices-common</artifactId>
-                            <type>car</type>
-                        </dependency>
-                    </dependencies>
                     <instance>
                         <plugin-artifact>
                             <config-xml-content>

Modified: geronimo/server/trunk/plugins/jetty/jetty6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6/src/main/history/dependencies.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6/src/main/history/dependencies.xml Sun Aug 31 23:30:25 2008
@@ -17,11 +17,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>transaction</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/pom.xml Sun Aug 31 23:30:25 2008
@@ -21,21 +21,21 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>jetty</artifactId>
     <name>Geronimo Plugins, Jetty</name>
     <packaging>pom</packaging>
-    
+
     <description>
         Jetty plugin
     </description>
-    
+
     <dependencyManagement>
         <dependencies>
 
@@ -43,6 +43,12 @@
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty</artifactId>
                 <version>6.1.7</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>servlet-api-2.5</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -63,11 +69,10 @@
                 <version>6.1.7</version>
             </dependency>
 
-	</dependencies>
+        </dependencies>
     </dependencyManagement>
 
 
-
     <modules>
         <module>geronimo-jetty6</module>
         <module>geronimo-jetty6-builder</module>

Modified: geronimo/server/trunk/plugins/monitoring/agent-car-jmx/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-car-jmx/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-car-jmx/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-car-jmx/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>Monitoring</category>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml Sun Aug 31 23:30:25 2008
@@ -55,14 +55,15 @@
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-derby-embed-local</artifactId>
             <type>rar</type>
+            <scope>provided</scope>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>connector-deployer</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
         
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>

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

Modified: geronimo/server/trunk/plugins/monitoring/agent-jmx/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-jmx/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-jmx/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-jmx/pom.xml Sun Aug 31 23:30:25 2008
@@ -33,34 +33,34 @@
 
     <dependencies>
         <!-- TODO get rid of this -->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-kernel</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<scope>provided</scope>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>-->
+            <!--<scope>provided</scope>-->
+        <!--</dependency>-->
         <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-kernel</artifactId>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>agent-jar</artifactId>
             <version>${version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-	        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-	        <artifactId>agent-jar</artifactId>
-	        <version>2.2-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-naming</artifactId>
-            <scope>provided</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.xbean</groupId>-->
+            <!--<artifactId>xbean-naming</artifactId>-->
+            <!--<scope>provided</scope>-->
+        <!--</dependency>-->
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-connector</artifactId>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>agent-ds</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml Sun Aug 31 23:30:25 2008
@@ -47,7 +47,6 @@
             <artifactId>myfaces</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <scope>runtime</scope>
         </dependency>
         
         <dependency>
@@ -63,27 +62,14 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>false</value>
-                    </useMavenDependencies>
                     <category>Web Framework</category>
                     <dependencies>
                         <dependency>
-                            <groupId>org.apache.geronimo.modules</groupId>
-                            <artifactId>geronimo-myfaces-builder</artifactId>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
                             <groupId>org.apache.geronimo.configs</groupId>
                             <artifactId>myfaces</artifactId>
                             <type>car</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/myfaces/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml Sun Aug 31 23:30:25 2008
@@ -95,10 +95,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                     <category>Web Framework</category>
                 </configuration>
             </plugin>

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=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml Sun Aug 31 23:30:25 2008
@@ -33,25 +33,32 @@
     <name>Geronimo Plugins, OpenEJB :: Builder</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-openejb</artifactId>
-            <version>${version}</version>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-openejb</artifactId>-->
+            <!--<version>${version}</version>-->
             <!--
                Hack to avoid a build error in the xmlbeans-plugin on some Windows and Linux machines.
                The OpenEJB 3 container is not needed for geronimo. Something about the container
                pom.xml is messing up the xmlbeans plugin. Excluding the pom allows builds to work.
              -->
-            <exclusions>
-              <exclusion>
-                <groupId>org.apache.openejb</groupId>
-                <artifactId>container</artifactId>
-              </exclusion>
-            </exclusions>
-        </dependency>
+            <!--<exclusions>-->
+              <!--<exclusion>-->
+                <!--<groupId>org.apache.openejb</groupId>-->
+                <!--<artifactId>container</artifactId>-->
+              <!--</exclusion>-->
+            <!--</exclusions>-->
+        <!--</dependency>-->
 
         <!-- g-service-builder coming from this via g-naming-builder -->
         <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices-builder</artifactId>
             <version>${version}</version>

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml Sun Aug 31 23:30:25 2008
@@ -32,15 +32,17 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-openejb-builder</artifactId>
+            <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-wadi</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-clustering-wadi</artifactId>
             <version>${version}</version>
+            <type>car</type>
         </dependency>
     </dependencies>
 

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

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml Sun Aug 31 23:30:25 2008
@@ -36,6 +36,7 @@
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>
+<!--
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.geronimo.framework</groupId>
@@ -78,6 +79,7 @@
                     <artifactId>openjpa-persistence-jdbc</artifactId>
                 </exclusion>
             </exclusions>
+-->
         </dependency>
 
         <dependency>
@@ -126,24 +128,26 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-clustering</artifactId>
-            <version>${version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>clustering</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
         <!-- g-transaction, g-security, g-naming  come transitively from this -->
         <!-- g-j2ee, g-kernel come from this via g-management -->
         <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.modules</groupId>
-            <artifactId>geronimo-persistence-jpa10</artifactId>
-            <version>${version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.modules</groupId>-->
+            <!--<artifactId>geronimo-persistence-jpa10</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml?rev=690859&r1=690858&r2=690859&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/resources/META-INF/geronimo-dependency.xml Sun Aug 31 23:30:25 2008
@@ -17,59 +17,29 @@
 -->
 
 <service xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>openejb-loader</artifactId>
-      <version>${openejbVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>openejb-ejbd</artifactId>
-      <version>${openejbVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>openejb-server</artifactId>
-      <version>${openejbVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>openejb-client</artifactId>
-      <version>${openejbVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>openejb-javaagent</artifactId>
-      <version>${openejbVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>openejb-jee</artifactId>
-      <version>${openejbVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>asm-finder</artifactId>
-      <version>${openejbVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-reflect</artifactId>
-      <version>${xbeanVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.swizzle</groupId>
-      <artifactId>swizzle-stream</artifactId>
-      <version>1.0.1</version>
-    </dependency>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>2.2.3</version>
-    </dependency>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>2.2.3</version>
-    </dependency>
+    <!--<dependency>-->
+      <!--<groupId>org.apache.openejb</groupId>-->
+      <!--<artifactId>asm-finder</artifactId>-->
+      <!--<version>${openejbVersion}</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+      <!--<groupId>org.apache.xbean</groupId>-->
+      <!--<artifactId>xbean-reflect</artifactId>-->
+      <!--<version>${xbeanVersion}</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+      <!--<groupId>org.codehaus.swizzle</groupId>-->
+      <!--<artifactId>swizzle-stream</artifactId>-->
+      <!--<version>1.0.1</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+      <!--<groupId>asm</groupId>-->
+      <!--<artifactId>asm</artifactId>-->
+      <!--<version>2.2.3</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+      <!--<groupId>asm</groupId>-->
+      <!--<artifactId>asm-commons</artifactId>-->
+      <!--<version>2.2.3</version>-->
+    <!--</dependency>-->
 </service>



Mime
View raw message