geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r480326 [1/2] - in /geronimo/server/trunk: configs/activemq/ configs/axis-deployer/ configs/ca-helper-jetty/ configs/ca-helper-tomcat/ configs/client-corba-yoko/ configs/client-deployer/ configs/client-security/ configs/connector-deployer/ ...
Date Wed, 29 Nov 2006 01:48:09 GMT
Author: djencks
Date: Tue Nov 28 17:48:06 2006
New Revision: 480326

URL: http://svn.apache.org/viewvc?view=rev&rev=480326
Log:
GERONIMO-2602,GERONIMO-2603 Fix scope overloading.  Make only transitive dependencies
 visible to PackageMojo (geronimo running on maven repo)

Modified:
    geronimo/server/trunk/configs/activemq/pom.xml
    geronimo/server/trunk/configs/axis-deployer/pom.xml
    geronimo/server/trunk/configs/ca-helper-jetty/pom.xml
    geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml
    geronimo/server/trunk/configs/client-corba-yoko/pom.xml
    geronimo/server/trunk/configs/client-deployer/pom.xml
    geronimo/server/trunk/configs/client-security/pom.xml
    geronimo/server/trunk/configs/connector-deployer/pom.xml
    geronimo/server/trunk/configs/dojo-jetty/pom.xml
    geronimo/server/trunk/configs/dojo-tomcat/pom.xml
    geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml
    geronimo/server/trunk/configs/j2ee-deployer/pom.xml
    geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/j2ee-security/pom.xml
    geronimo/server/trunk/configs/j2ee-system/pom.xml
    geronimo/server/trunk/configs/jetty-deployer/pom.xml
    geronimo/server/trunk/configs/jetty/pom.xml
    geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml
    geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml
    geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml
    geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml
    geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml
    geronimo/server/trunk/configs/openejb-deployer/pom.xml
    geronimo/server/trunk/configs/openejb/pom.xml
    geronimo/server/trunk/configs/openjpa/pom.xml
    geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml
    geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml
    geronimo/server/trunk/configs/remote-deploy-tomcat/pom.xml
    geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml
    geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml
    geronimo/server/trunk/configs/system-database/pom.xml
    geronimo/server/trunk/configs/tomcat-deployer/pom.xml
    geronimo/server/trunk/configs/tomcat/pom.xml
    geronimo/server/trunk/configs/uddi-jetty/pom.xml
    geronimo/server/trunk/configs/uddi-tomcat/pom.xml
    geronimo/server/trunk/configs/webconsole-jetty/pom.xml
    geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
    geronimo/server/trunk/configs/welcome-jetty/pom.xml
    geronimo/server/trunk/configs/welcome-tomcat/pom.xml
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Maven2RepositoryAdapter.java
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
    geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java

Modified: geronimo/server/trunk/configs/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/activemq/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/activemq/pom.xml (original)
+++ geronimo/server/trunk/configs/activemq/pom.xml Tue Nov 28 17:48:06 2006
@@ -44,19 +44,21 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>ge-activemq-rar</artifactId>
             <version>${version}</version>
-            <type>car</type>
+            <type>rar</type>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>ge-activemq-rar</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer</artifactId>
             <version>${version}</version>
-            <type>rar</type>
+            <type>car</type>
+            <scope>provided</scope>
         </dependency>
+
 
     </dependencies>
     

Modified: geronimo/server/trunk/configs/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis-deployer/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/axis-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/axis-deployer/pom.xml Tue Nov 28 17:48:06 2006
@@ -47,7 +47,7 @@
             <artifactId>axis</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <scope>compile</scope>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/configs/ca-helper-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-jetty/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/ca-helper-jetty/pom.xml Tue Nov 28 17:48:06 2006
@@ -34,22 +34,22 @@
     <packaging>car</packaging>
     
     <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.applications</groupId>
+            <artifactId>geronimo-ca-helper</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+            <scope>test</scope>
+        </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty-deployer</artifactId>
-            <version>${pom.version}</version>
+            <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.applications</groupId>
-            <artifactId>geronimo-ca-helper</artifactId>
-            <version>${pom.version}</version>
-            <type>war</type>
-        </dependency>
-        
     </dependencies>
     
     <build>
@@ -69,14 +69,11 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications</groupId>
                         <artifactId>geronimo-ca-helper</artifactId>
-                        <version>${pom.version}</version>
+                        <version>${version}</version>
                         <type>war</type>
                     </module>
                 </configuration>

Modified: geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/ca-helper-tomcat/pom.xml Tue Nov 28 17:48:06 2006
@@ -34,22 +34,22 @@
     <packaging>car</packaging>
     
     <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat-deployer</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
             <artifactId>geronimo-ca-helper</artifactId>
             <version>${pom.version}</version>
             <type>war</type>
+            <scope>test</scope>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -69,9 +69,6 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications</groupId>

Modified: geronimo/server/trunk/configs/client-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-corba-yoko/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/client-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/configs/client-corba-yoko/pom.xml Tue Nov 28 17:48:06 2006
@@ -55,15 +55,6 @@
             <!--<artifactId>geronimo-ejb_2.1_spec</artifactId>-->
         <!--</dependency>-->
 
-        <!-- to enforce build order -->
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb-corba-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices-builder</artifactId>
@@ -105,6 +96,13 @@
             <artifactId>bcel</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-corba-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -118,7 +116,6 @@
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                         <deploymentConfig>${openejbcorbaDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/configs/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-deployer/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/client-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/client-deployer/pom.xml Tue Nov 28 17:48:06 2006
@@ -47,14 +47,14 @@
             <artifactId>client</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <scope>compile</scope>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>client-transaction</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <scope>compile</scope>
+            <scope>runtime</scope>
         </dependency>
 
         <!--<dependency>-->

Modified: geronimo/server/trunk/configs/client-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-security/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/client-security/pom.xml (original)
+++ geronimo/server/trunk/configs/client-security/pom.xml Tue Nov 28 17:48:06 2006
@@ -43,15 +43,6 @@
             <type>car</type>
         </dependency>
         
-        <!-- This is needed to make sure j2ee-deployer was built before -->
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
@@ -78,6 +69,13 @@
         </dependency>
         -->
 
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/configs/connector-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/connector-deployer/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/connector-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/connector-deployer/pom.xml Tue Nov 28 17:48:06 2006
@@ -47,7 +47,7 @@
             <artifactId>transaction</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <scope>compile</scope>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/configs/dojo-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-jetty/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/dojo-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/dojo-jetty/pom.xml Tue Nov 28 17:48:06 2006
@@ -36,20 +36,19 @@
     <dependencies>
         
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
             <artifactId>geronimo-dojo</artifactId>
             <version>${version}</version>
             <type>war</type>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -66,12 +65,8 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications</groupId>

Modified: geronimo/server/trunk/configs/dojo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-tomcat/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/dojo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/dojo-tomcat/pom.xml Tue Nov 28 17:48:06 2006
@@ -34,6 +34,13 @@
     <packaging>car</packaging>
     
     <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.applications</groupId>
+            <artifactId>geronimo-dojo</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+        </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -42,14 +49,6 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.applications</groupId>
-            <artifactId>geronimo-dojo</artifactId>
-            <version>${version}</version>
-            <type>war</type>
-        </dependency>
-        
     </dependencies>
     
     <build>
@@ -69,9 +68,6 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications</groupId>

Modified: geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml Tue Nov 28 17:48:06 2006
@@ -55,7 +55,7 @@
             <artifactId>openejb-corba-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -88,6 +88,13 @@
             <artifactId>bcel</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-corba-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/configs/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/pom.xml Tue Nov 28 17:48:06 2006
@@ -47,7 +47,7 @@
             <artifactId>j2ee-server</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
-            <scope>compile</scope>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
@@ -55,7 +55,7 @@
             <artifactId>j2ee-security</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
-            <scope>compile</scope>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml Tue Nov 28 17:48:06 2006
@@ -129,6 +129,9 @@
                 <name>OpenEjbCorbaRefBuilder</name>
             </pattern>
             <pattern>
+                <name>OpenEjbTSSLinkBuilder</name>
+            </pattern>
+            <pattern>
                 <name>CorbaRefBuilder</name>
             </pattern>
             <pattern>

Modified: geronimo/server/trunk/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-security/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/j2ee-security/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-security/pom.xml Tue Nov 28 17:48:06 2006
@@ -58,6 +58,7 @@
         
     </dependencies>
     
+<!--
     <build>
         <plugins>
             <plugin>
@@ -71,5 +72,6 @@
             </plugin>
         </plugins>
     </build>
-    
+-->
+
 </project>

Modified: geronimo/server/trunk/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-system/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-system/pom.xml Tue Nov 28 17:48:06 2006
@@ -40,7 +40,7 @@
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
         
         <dependency>

Modified: geronimo/server/trunk/configs/jetty-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty-deployer/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/jetty-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty-deployer/pom.xml Tue Nov 28 17:48:06 2006
@@ -56,7 +56,7 @@
             <artifactId>jetty</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <scope>compile</scope>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
@@ -75,6 +75,7 @@
             </resource>
         </resources>
         
+<!--
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
@@ -86,6 +87,7 @@
                 </configuration>
             </plugin>
         </plugins>
+-->
     </build>
 
 </project>

Modified: geronimo/server/trunk/configs/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty/pom.xml Tue Nov 28 17:48:06 2006
@@ -63,7 +63,6 @@
             <type>car</type>
         </dependency>
 
-        <!-- This dependency should be retrieved by transitivity -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jetty</artifactId>
@@ -80,6 +79,7 @@
             </resource>
         </resources>
         
+<!--
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
@@ -91,6 +91,7 @@
                 </configuration>
             </plugin>
         </plugins>
+-->
     </build>
 
 </project>

Modified: geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml Tue Nov 28 17:48:06 2006
@@ -35,14 +35,14 @@
 
     <dependencies>
         
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>jetty-deployer</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+            <!--<scope>test</scope>-->
+        <!--</dependency>-->
+
         <dependency>
             <groupId>org.apache.geronimo.applications.examples</groupId>
             <artifactId>geronimo-jsp-examples</artifactId>
@@ -50,6 +50,13 @@
             <type>war</type>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -69,9 +76,6 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications.examples</groupId>

Modified: geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml Tue Nov 28 17:48:06 2006
@@ -35,14 +35,14 @@
     
     <dependencies>
         
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-        
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>tomcat-deployer</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+            <!--<scope>test</scope>-->
+        <!--</dependency>-->
+
         <dependency>
             <groupId>org.apache.geronimo.applications.examples</groupId>
             <artifactId>geronimo-jsp-examples</artifactId>
@@ -50,6 +50,13 @@
             <type>war</type>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -69,9 +76,6 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications.examples</groupId>

Modified: geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml Tue Nov 28 17:48:06 2006
@@ -35,13 +35,13 @@
     
     <dependencies>
         
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>jetty-deployer</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+            <!--<scope>test</scope>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
@@ -50,6 +50,13 @@
             <type>war</type>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -69,9 +76,6 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications</groupId>

Modified: geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml Tue Nov 28 17:48:06 2006
@@ -35,13 +35,13 @@
     
     <dependencies>
         
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>tomcat-deployer</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+            <!--<scope>test</scope>-->
+        <!--</dependency>-->
         
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
@@ -50,6 +50,13 @@
             <type>war</type>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -69,9 +76,6 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications</groupId>

Modified: geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml Tue Nov 28 17:48:06 2006
@@ -41,14 +41,6 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        <!-- we might need to add this by hand -->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>j2ee-corba-yoko</artifactId>-->
-            <!--<version>${version}</version>-->
-            <!--<type>car</type>-->
-            <!--<scope>compile</scope>-->
-        <!--</dependency>-->
 
         <!-- ideally we wouldn't need this -->
         <dependency>

Modified: geronimo/server/trunk/configs/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-deployer/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/openejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb-deployer/pom.xml Tue Nov 28 17:48:06 2006
@@ -52,7 +52,7 @@
             <artifactId>openejb</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <scope>compile</scope>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/openejb/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb/pom.xml Tue Nov 28 17:48:06 2006
@@ -49,12 +49,12 @@
             <type>car</type>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>transaction</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/trunk/configs/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openjpa/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/openjpa/pom.xml (original)
+++ geronimo/server/trunk/configs/openjpa/pom.xml Tue Nov 28 17:48:06 2006
@@ -73,6 +73,7 @@
             </resource>
         </resources>
 
+<!--
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
@@ -84,6 +85,7 @@
                 </configuration>
             </plugin>
         </plugins>
+-->
     </build>
 
 </project>

Modified: geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml Tue Nov 28 17:48:06 2006
@@ -53,7 +53,7 @@
             <artifactId>transaction</artifactId>
             <type>car</type>
             <version>${pom.version}</version>
-            <scope>compile</scope>
+            <scope>runtime</scope>
         </dependency>
 
         <!--todo get the schema classes in a config -->

Modified: geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml Tue Nov 28 17:48:06 2006
@@ -34,6 +34,14 @@
     
     <dependencies>
     
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>jetty-deployer</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+            <!--<scope>test</scope>-->
+        <!--</dependency>-->
+
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
             <artifactId>geronimo-remote-deploy</artifactId>
@@ -46,6 +54,13 @@
             <artifactId>xbean</artifactId>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -56,12 +71,9 @@
                 <extensions>true</extensions>
                 <configuration>
                     <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications</groupId>

Modified: geronimo/server/trunk/configs/remote-deploy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/remote-deploy-tomcat/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/remote-deploy-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/remote-deploy-tomcat/pom.xml Tue Nov 28 17:48:06 2006
@@ -34,6 +34,13 @@
     
     <dependencies>
     
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>tomcat-deployer</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+            <!--<scope>test</scope>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
             <artifactId>geronimo-remote-deploy</artifactId>
@@ -46,6 +53,13 @@
             <artifactId>xbean</artifactId>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -56,12 +70,9 @@
                 <extensions>true</extensions>
                 <configuration>
                     <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications</groupId>

Modified: geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml Tue Nov 28 17:48:06 2006
@@ -35,13 +35,13 @@
     
     <dependencies>
         
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>jetty-deployer</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+            <!--<scope>test</scope>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.applications.examples</groupId>
@@ -50,6 +50,13 @@
             <type>war</type>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -69,9 +76,6 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications.examples</groupId>

Modified: geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml Tue Nov 28 17:48:06 2006
@@ -35,13 +35,13 @@
     
     <dependencies>
     
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>tomcat-deployer</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+            <!--<scope>test</scope>-->
+        <!--</dependency>-->
         
         <dependency>
             <groupId>org.apache.geronimo.applications.examples</groupId>
@@ -50,6 +50,13 @@
             <type>war</type>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -69,9 +76,6 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications.examples</groupId>

Modified: geronimo/server/trunk/configs/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/system-database/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/system-database/pom.xml (original)
+++ geronimo/server/trunk/configs/system-database/pom.xml Tue Nov 28 17:48:06 2006
@@ -42,7 +42,13 @@
             <type>car</type>
             <scope>test</scope>
         </dependency>
-        
+        <dependency>
+            <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-derby</artifactId>
@@ -71,6 +77,13 @@
             <type>rar</type>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/configs/tomcat-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat-deployer/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/tomcat-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat-deployer/pom.xml Tue Nov 28 17:48:06 2006
@@ -56,7 +56,7 @@
             <artifactId>tomcat</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <scope>compile</scope>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
@@ -75,6 +75,7 @@
             </resource>
         </resources>
         
+<!--
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
@@ -86,6 +87,7 @@
                 </configuration>
             </plugin>
         </plugins>
+-->
     </build>
     
 </project>

Modified: geronimo/server/trunk/configs/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat/pom.xml Tue Nov 28 17:48:06 2006
@@ -72,6 +72,7 @@
             </resource>
         </resources>
         
+<!--
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
@@ -83,6 +84,7 @@
                 </configuration>
             </plugin>
         </plugins>
+-->
     </build>
 
 </project>

Modified: geronimo/server/trunk/configs/uddi-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/uddi-jetty/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/uddi-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/uddi-jetty/pom.xml Tue Nov 28 17:48:06 2006
@@ -34,6 +34,23 @@
 
     <dependencies>
         
+<!--
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>test</scope>
+        </dependency>
+-->
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
@@ -70,6 +87,20 @@
             <artifactId>scout</artifactId>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-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>
     </dependencies>
     
     <build>
@@ -82,9 +113,7 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
                     </deploymentConfigs>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/configs/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/uddi-tomcat/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/uddi-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/uddi-tomcat/pom.xml Tue Nov 28 17:48:06 2006
@@ -33,7 +33,24 @@
     <packaging>car</packaging>
     
     <dependencies>
-        
+
+<!--
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>test</scope>
+        </dependency>
+-->
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
@@ -75,6 +92,20 @@
             <artifactId>scout</artifactId>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat-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>
     </dependencies>
     
     <build>
@@ -87,9 +118,7 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
                     </deploymentConfigs>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/configs/webconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/webconsole-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty/pom.xml Tue Nov 28 17:48:06 2006
@@ -41,7 +41,7 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
@@ -91,7 +91,7 @@
             <artifactId>geronimo-console</artifactId>
             <version>${version}</version>
             <type>ear</type>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -134,7 +134,7 @@
             <groupId>jdom</groupId>
             <artifactId>jdom</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto</artifactId>
@@ -144,7 +144,7 @@
             <groupId>portlet-api</groupId>
             <artifactId>portlet-api</artifactId>
         </dependency>
-        
+
         <!-- Added to eliminate packaging of libraries in WEB-INF/lib in console-standard and console-framework applications -->
         <dependency>
             <groupId>org.apache.pluto</groupId>
@@ -196,8 +196,15 @@
             <artifactId>dwr</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
-    
+
     <build>
         <resources>
             <resource>
@@ -205,7 +212,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
@@ -215,7 +222,7 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
+                        <deploymentConfig>${openejbcorbaDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications.console</groupId>

Modified: geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-tomcat/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/webconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-tomcat/pom.xml Tue Nov 28 17:48:06 2006
@@ -91,7 +91,7 @@
             <artifactId>geronimo-console</artifactId>
             <version>${version}</version>
             <type>ear</type>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -196,6 +196,13 @@
             <artifactId>dwr</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -215,7 +222,6 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications.console</groupId>

Modified: geronimo/server/trunk/configs/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-jetty/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/welcome-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/welcome-jetty/pom.xml Tue Nov 28 17:48:06 2006
@@ -35,13 +35,13 @@
     
     <dependencies>
         
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.configs</groupId>-->
+            <!--<artifactId>jetty-deployer</artifactId>-->
+            <!--<version>${version}</version>-->
+            <!--<type>car</type>-->
+            <!--<scope>test</scope>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
@@ -50,6 +50,13 @@
             <type>war</type>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -69,9 +76,6 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications</groupId>

Modified: geronimo/server/trunk/configs/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-tomcat/pom.xml?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/configs/welcome-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/welcome-tomcat/pom.xml Tue Nov 28 17:48:06 2006
@@ -35,14 +35,16 @@
     
     <dependencies>
         
+<!--
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
-        
+-->
+
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
             <artifactId>geronimo-welcome</artifactId>
@@ -50,6 +52,13 @@
             <type>war</type>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -69,9 +78,6 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
-                        <deploymentConfig>${clientDeployer}</deploymentConfig>
-                        <deploymentConfig>${openejbDeployer}</deploymentConfig>
-                        <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.applications</groupId>

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java Tue Nov 28 17:48:06 2006
@@ -26,6 +26,7 @@
 
 import java.util.Iterator;
 import java.util.Properties;
+import java.util.Map;
 
 import org.apache.geronimo.genesis.MojoSupport;
 import org.apache.geronimo.genesis.util.ArtifactItem;
@@ -78,7 +79,7 @@
     /**
      * @component
      */
-    private DependencyHelper dependencyHelper = null;
+    protected DependencyHelper dependencyHelper = null;
     
     //
     // MojoSupport Hooks
@@ -108,15 +109,14 @@
     /**
      * Generates a properties file with explicit versions of artifacts of the current project transitivly.
      */
-    protected void generateExplicitVersionProperties(final File outputFile) throws MojoExecutionException, IOException {
+    protected void generateExplicitVersionProperties(final File outputFile, DependencyTree dependencies) throws MojoExecutionException, IOException {
         log.debug("Generating explicit version properties: " + outputFile);
 
         // Generate explicit_versions for all our dependencies...
         Properties props = new Properties();
         
         try {
-            DependencyTree dependencies = dependencyHelper.getDependencies(project);
-            
+
             Node root = dependencies.getRootNode();
             
             // Skip the root node
@@ -210,4 +210,88 @@
 
         return "car".equals(artifact.getType());
     }
+
+    protected class ArtifactLookupImpl
+        implements Maven2RepositoryAdapter.ArtifactLookup
+    {
+
+        private final Map resolvedArtifacts;
+
+        public ArtifactLookupImpl(Map resolvedArtifacts) {
+            this.resolvedArtifacts = resolvedArtifacts;
+        }
+
+        public File getBasedir() {
+            String path = getArtifactRepository().getBasedir();
+            return new File(path);
+        }
+
+        private boolean isProjectArtifact(final org.apache.geronimo.kernel.repository.Artifact artifact) {
+            MavenProject project = getProject();
+
+            return artifact.getGroupId().equals(project.getGroupId()) &&
+                   artifact.getArtifactId().equals(project.getArtifactId());
+        }
+
+        public File getLocation(final org.apache.geronimo.kernel.repository.Artifact artifact) {
+            assert artifact != null;
+
+            boolean debug = log.isDebugEnabled();
+
+            Artifact mavenArtifact = (Artifact)resolvedArtifacts.get(artifact);
+
+            // If not cached, then make a new artifact
+            if (mavenArtifact == null) {
+                mavenArtifact = getArtifactFactory().createArtifact(
+                        artifact.getGroupId(),
+                        artifact.getArtifactId(),
+                        artifact.getVersion().toString(),
+                        null,
+                        artifact.getType()
+                );
+            }
+
+            // Do not attempt to resolve an artifact that is the same as the project
+            if (isProjectArtifact(artifact)) {
+                if (debug) {
+                    log.debug("Skipping resolution of project artifact: " + artifact);
+                }
+
+                //
+                // HACK: Still have to return something, otherwise some CAR packaging will fail...
+                //       no idea what is using this file, or if the files does exist if that will be
+                //       used instead of any details we are currently building
+                //
+                return new File(getBasedir(), getArtifactRepository().pathOf(mavenArtifact));
+            }
+
+            File file;
+            try {
+                if (!mavenArtifact.isResolved()) {
+                    if (debug) {
+                        log.debug("Resolving artifact: " + mavenArtifact);
+                    }
+                    mavenArtifact = resolveArtifact(mavenArtifact);
+
+                    // Cache the resolved artifact
+                    resolvedArtifacts.put(artifact, mavenArtifact);
+                }
+
+                //
+                // HACK: Construct the real local filename from the path and resolved artifact file.
+                //       Probably a better way to do this with the Maven API directly, but this is the
+                //       best I can do for now.
+                //
+                String path = getArtifactRepository().pathOf(mavenArtifact);
+                file = new File(getBasedir(), path);
+                file = new File(mavenArtifact.getFile().getParentFile(), file.getName());
+            }
+            catch (MojoExecutionException e) {
+                throw new RuntimeException("Failed to resolve: " + mavenArtifact, e);
+            }
+
+            return file;
+        }
+    }
+    
 }

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/InstallModulesMojo.java Tue Nov 28 17:48:06 2006
@@ -34,6 +34,7 @@
 import org.apache.geronimo.system.repository.Maven2Repository;
 import org.apache.geronimo.system.configuration.RepositoryConfigurationStore;
 import org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver;
+import org.apache.geronimo.genesis.dependency.DependencyTree;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 
@@ -51,6 +52,7 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.zip.ZipEntry;
 import java.util.jar.JarFile;
 
@@ -59,16 +61,14 @@
 /**
  * Installs Geronimo module CAR files into a target repository to support assembly.
  *
- * @goal install-modules
- * 
  * @version $Rev$ $Date$
+ * @goal install-modules
  */
 public class InstallModulesMojo
-    extends AbstractCarMojo
-{
+        extends AbstractCarMojo {
     /**
      * The location of the target repository.
-     * 
+     *
      * @parameter expression="${project.build.directory}/repository"
      * @required
      */
@@ -90,7 +90,7 @@
      * @required
      */
     private ArtifactRepository sourceRepository = null;
-    
+
     /**
      * The location where the properties mapping will be generated.
      *
@@ -101,8 +101,8 @@
 
     /**
      * The Geronimo repository artifact resolver.
-     *
-     * <p>
+     * <p/>
+     * <p/>
      * Using a custom name here to prevent problems that happen when Plexus
      * injects the Maven resolver into the base-class.
      * </p>
@@ -123,31 +123,33 @@
     private Set installedArtifacts = new HashSet();
 
     protected void doExecute() throws Exception {
-        generateExplicitVersionProperties(explicitResolutionProperties);
+        DependencyTree dependencies = dependencyHelper.getDependencies(project);
+        generateExplicitVersionProperties(explicitResolutionProperties, dependencies);
 
         //
         // TODO: Check if we need to use the Maven2RepositoryAdapter here or not...
         //
 
-        sourceRepo = new Maven2Repository(new File(sourceRepository.getBasedir()));
+        Maven2RepositoryAdapter.ArtifactLookup lookup = new ArtifactLookupImpl(new HashMap());
+        sourceRepo = new Maven2RepositoryAdapter(dependencies, lookup);
+//        sourceRepo = new Maven2RepositoryAdapter(new File(sourceRepository.getBasedir()));
         sourceStore = new RepositoryConfigurationStore(sourceRepo);
 
         FileUtils.forceMkdir(targetRepositoryDirectory);
-        
+
         targetRepo = new Maven2Repository(targetRepositoryDirectory);
         targetStore = new RepositoryConfigurationStore(targetRepo);
 
         ArtifactManager artifactManager = new DefaultArtifactManager();
         geronimoArtifactResolver = new ExplicitDefaultArtifactResolver(
-            explicitResolutionProperties.getPath(),
-            artifactManager,
-            Collections.singleton(sourceRepo),
-            null);
+                explicitResolutionProperties.getPath(),
+                artifactManager,
+                Collections.singleton(sourceRepo),
+                null);
 
         if (artifact != null) {
             install(Artifact.create(artifact));
-        }
-        else {
+        } else {
             Iterator iter = getDependencies().iterator();
             while (iter.hasNext()) {
 
@@ -183,17 +185,15 @@
     /**
      * Install the given artifact into the target Geronimo repository.
      *
-     * @param artifact      The artifact to be installed; must not be null
-     *
-     * @throws Exception    Failed to install artifact
+     * @param artifact The artifact to be installed; must not be null
+     * @throws Exception Failed to install artifact
      */
     private void install(final Artifact artifact) throws Exception {
         assert artifact != null;
 
         if (installedArtifacts.contains(artifact)) {
             log.debug("Skipping artifact; already installed: " + artifact);
-        }
-        else {
+        } else {
             // The artifact must exist in the source repository
             if (!sourceRepo.contains(artifact)) {
                 throw new Exception("Missing artifact in source repository: " + artifact);
@@ -201,8 +201,7 @@
 
             if (isModuleArtifact(artifact)) {
                 installModule(artifact);
-            }
-            else {
+            } else {
                 installDependency(artifact);
             }
         }
@@ -211,9 +210,8 @@
     /**
      * Install a Geornimo module artifact.
      *
-     * @param artifact      The Geronimo module artifact to be installed; must not be null, must be a module
-     *
-     * @throws Exception    Failed to insall Geronimo module artifact
+     * @param artifact The Geronimo module artifact to be installed; must not be null, must be a module
+     * @throws Exception Failed to insall Geronimo module artifact
      */
     private void installModule(final Artifact artifact) throws Exception {
         assert artifact != null;
@@ -231,8 +229,7 @@
             if (hasModuleChanged(artifact)) {
                 log.debug("Old module exists in target store; uninstalling: " + artifact);
                 targetStore.uninstall(artifact);
-            }
-            else {
+            } else {
                 log.debug("Same module exists in target store; skipping: " + artifact);
                 install = false;
             }
@@ -260,7 +257,7 @@
                     }
                 };
 
-                targetStore.install(input, (int)file.length(), artifact, monitor);
+                targetStore.install(input, (int) file.length(), artifact, monitor);
 
                 installedArtifacts.add(artifact);
             }
@@ -276,9 +273,8 @@
     /**
      * Install all of the dependencies of the given Geronimo module artifact.
      *
-     * @param artifact      The Geronimo module artifact to be installed; must not be null, must be a module
-     *
-     * @throws Exception    Failed to install Geronimo module dependencies
+     * @param artifact The Geronimo module artifact to be installed; must not be null, must be a module
+     * @throws Exception Failed to install Geronimo module dependencies
      */
     private void installModuleDependencies(final Artifact artifact) throws Exception {
         assert artifact != null;
@@ -310,9 +306,8 @@
     /**
      * Install a dependency artifact into the Geronimo repository.
      *
-     * @param artifact      The artifact to be installed; must not be null, or a module artifact
-     *
-     * @throws Exception    Failed to install artifact dependencies
+     * @param artifact The artifact to be installed; must not be null, or a module artifact
+     * @throws Exception Failed to install artifact dependencies
      */
     private void installDependency(final Artifact artifact) throws Exception {
         assert artifact != null;
@@ -326,8 +321,7 @@
                 File file = targetRepo.getLocation(artifact);
                 log.debug("Old dependency exists in target repo; deleting: " + file);
                 FileUtils.forceDelete(file);
-            }
-            else {
+            } else {
                 log.debug("Same dependency exists in target repo; skipping: " + artifact);
                 install = false;
             }
@@ -353,8 +347,8 @@
                         // empty
                     }
                 };
-                
-                targetRepo.copyToRepository(input, (int)file.length(), artifact, monitor);
+
+                targetRepo.copyToRepository(input, (int) file.length(), artifact, monitor);
 
                 installedArtifacts.add(artifact);
             }
@@ -370,9 +364,8 @@
     /**
      * Install a set of dependency artifacts into the Geronimo repository.
      *
-     * @param dependencies  The set of artifacts to be installed; must not be null.
-     *
-     * @throws Exception    Failed to install artifacts
+     * @param dependencies The set of artifacts to be installed; must not be null.
+     * @throws Exception Failed to install artifacts
      */
     private void installDependencies(final Set/*<Artifact>*/ dependencies) throws Exception {
         assert dependencies != null;
@@ -381,7 +374,7 @@
         Iterator iter = resolved.iterator();
 
         while (iter.hasNext()) {
-            Artifact a = (Artifact)iter.next();
+            Artifact a = (Artifact) iter.next();
             install(a);
         }
     }
@@ -389,10 +382,9 @@
     /**
      * Check if a module has changed by comparing the checksum in the source and target repos.
      *
-     * @param module    The module to inspect; must not be null.
-     * @return          Returns true if the module has changed
-     *
-     * @throws IOException      Failed to load checksum
+     * @param module The module to inspect; must not be null.
+     * @return Returns true if the module has changed
+     * @throws IOException Failed to load checksum
      */
     private boolean hasModuleChanged(final Artifact module) throws IOException {
         assert module != null;
@@ -406,11 +398,10 @@
     /**
      * Load the <tt>config.ser</tt> checksum for the given artifact.
      *
-     * @param repo      The repository to resolve the artifacts location; must not be null.
-     * @param artifact  The artifact to retrieve a checksum for; must not be null.
-     * @return          Thr artifacts checksum
-     *
-     * @throws IOException  Failed to load checksums
+     * @param repo     The repository to resolve the artifacts location; must not be null.
+     * @param artifact The artifact to retrieve a checksum for; must not be null.
+     * @return Thr artifacts checksum
+     * @throws IOException Failed to load checksums
      */
     private String loadChecksum(final Repository repo, final Artifact artifact) throws IOException {
         assert repo != null;
@@ -422,8 +413,7 @@
         if (file.isDirectory()) {
             File serFile = new File(file, "META-INF/config.ser.sha1");
             reader = new BufferedReader(new FileReader(serFile));
-        }
-        else {
+        } else {
             JarFile jarFile = new JarFile(file);
             ZipEntry entry = jarFile.getEntry("META-INF/config.ser.sha1");
             reader = new BufferedReader(new InputStreamReader(jarFile.getInputStream(entry)));
@@ -438,8 +428,8 @@
     /**
      * Check if a dependency has changed by checking the file size and last modified for source and target.
      *
-     * @param artifact  The artifact to check; must not be null
-     * @return          True if the dependency has changed
+     * @param artifact The artifact to check; must not be null
+     * @return True if the dependency has changed
      */
     private boolean hasDependencyChanged(final Artifact artifact) {
         assert artifact != null;
@@ -448,6 +438,6 @@
         File target = targetRepo.getLocation(artifact);
 
         return (source.length() != target.length()) ||
-               (source.lastModified() > target.lastModified());
+                (source.lastModified() > target.lastModified());
     }
 }

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Maven2RepositoryAdapter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Maven2RepositoryAdapter.java?view=diff&rev=480326&r1=480325&r2=480326
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Maven2RepositoryAdapter.java (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/Maven2RepositoryAdapter.java Tue Nov 28 17:48:06 2006
@@ -20,11 +20,16 @@
 package org.apache.geronimo.mavenplugins.car;
 
 import java.io.File;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.Iterator;
 
 import org.apache.geronimo.system.repository.Maven2Repository;
 import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.repository.Version;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.genesis.dependency.DependencyTree;
 
 /**
  * Helps adapt Geronimo repositories to Maven repositories for packaging building.
@@ -36,9 +41,11 @@
 {
     private ArtifactLookup lookup;
 
-    public Maven2RepositoryAdapter(final ArtifactLookup lookup) {
-        super(lookup.getBasedir());
+    private DependencyTree dependencyTree;
 
+    public Maven2RepositoryAdapter(DependencyTree dependencyTree, final ArtifactLookup lookup) {
+        super(lookup.getBasedir());
+        this.dependencyTree = dependencyTree;
         this.lookup = lookup;
     }
 
@@ -48,6 +55,41 @@
         return lookup.getLocation(artifact);
     }
 
+    public SortedSet list() {
+        TreeSet list = new TreeSet();
+        listInternal(list, dependencyTree.getRootNode(), null, null, null, null);
+        return list;
+    }
+
+    public SortedSet list(Artifact query) {
+        TreeSet list = new TreeSet();
+        listInternal(list, dependencyTree.getRootNode(), query.getGroupId(), query.getArtifactId(), query.getVersion(), query.getType());
+        return list;
+    }
+
+    private void listInternal(TreeSet list, DependencyTree.Node node, String groupId, String artifactId, Version version, String type) {
+        if (matches(node.getArtifact(), groupId, artifactId, version, type)) {
+            list.add(mavenToGeronimoArtifact(node.getArtifact()));
+        }
+        for (Iterator iterator = node.getChildren().iterator(); iterator.hasNext();) {
+            DependencyTree.Node childNode = (DependencyTree.Node) iterator.next();
+            listInternal(list, childNode, groupId, artifactId, version, type);
+        }
+    }
+
+    private boolean matches(org.apache.maven.artifact.Artifact artifact, String groupId, String artifactId, Version version, String type) {
+        return (groupId == null || artifact.getGroupId().equals(groupId))
+                && (artifactId == null || artifact.getArtifactId().equals(artifactId))
+                && (version == null || artifact.getVersion().equals(version.toString()))
+                && (type == null || artifact.getType().equals(type));
+    }
+
+    protected org.apache.geronimo.kernel.repository.Artifact mavenToGeronimoArtifact(final org.apache.maven.artifact.Artifact artifact) {
+        assert artifact != null;
+
+        return new org.apache.geronimo.kernel.repository.Artifact(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(), artifact.getType());
+    }
+
     //
     // ArtifactLookup
     //
@@ -68,7 +110,8 @@
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(Maven2RepositoryAdapter.class, "Repository");
         infoFactory.addAttribute("lookup", ArtifactLookup.class, true);
-        infoFactory.setConstructor(new String[]{ "lookup" });
+        infoFactory.addAttribute("dependencies", DependencyTree.class, true);
+        infoFactory.setConstructor(new String[]{"dependencies", "lookup" });
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 



Mime
View raw message