geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r694978 - in /geronimo/server/trunk: assemblies/geronimo-framework/ assemblies/geronimo-jetty6-javaee5/ assemblies/geronimo-jetty6-minimal/ assemblies/geronimo-tomcat6-javaee5/ assemblies/geronimo-tomcat6-minimal/ buildsupport/car-maven-plu...
Date Sat, 13 Sep 2008 16:13:59 GMT
Author: djencks
Date: Sat Sep 13 09:13:58 2008
New Revision: 694978

URL: http://svn.apache.org/viewvc?rev=694978&view=rev
Log:
GERONIMO-4300 allow c-m-p to generate plugins with no classloader, dependending on absence
of plan

Removed:
    geronimo/server/trunk/plugingroups/client/src/main/plan/
    geronimo/server/trunk/plugingroups/clustering/src/main/plan/
    geronimo/server/trunk/plugingroups/ejb/src/main/plan/
    geronimo/server/trunk/plugingroups/framework/src/main/plan/
    geronimo/server/trunk/plugingroups/jms/src/main/plan/
    geronimo/server/trunk/plugingroups/persistence/src/main/plan/
    geronimo/server/trunk/plugingroups/web-jetty/src/main/plan/
    geronimo/server/trunk/plugingroups/web-tomcat/src/main/plan/
    geronimo/server/trunk/plugingroups/webservices-axis2/src/main/plan/
    geronimo/server/trunk/plugingroups/webservices-cxf/src/main/plan/
Modified:
    geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
    geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
    geronimo/server/trunk/plugingroups/client/pom.xml
    geronimo/server/trunk/plugingroups/clustering/pom.xml
    geronimo/server/trunk/plugingroups/ejb/pom.xml
    geronimo/server/trunk/plugingroups/jms/pom.xml
    geronimo/server/trunk/plugingroups/persistence/pom.xml
    geronimo/server/trunk/plugingroups/web-jetty/pom.xml
    geronimo/server/trunk/plugingroups/web-tomcat/pom.xml
    geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml
    geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?rev=694978&r1=694977&r2=694978&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Sat Sep 13 09:13:58 2008
@@ -38,85 +38,8 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.assemblies</groupId>
-            <artifactId>geronimo-boilerplate</artifactId>
-            <version>${version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>gshell-framework</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>gshell-geronimo</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <!--
-        HACK: This should really only be included in the full assemblies, but due
-              to the limited fashion which GShell currently sets up its classloaders
-              (via hard-coded classworlds entries pointing at repository locations)
-              it will add significant complication to the assembly builds to allow
-              the entires to be different for assembly types.
-        -->
-        
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>gshell-remote</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>j2ee-system</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>client-system</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>rmi-naming</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>plugin</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>j2ee-security</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>server-security-config</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>shutdown</artifactId>
+            <groupId>org.apache.geronimo.plugingroups</groupId>
+            <artifactId>framework</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml?rev=694978&r1=694977&r2=694978&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Sat Sep 13 09:13:58 2008
@@ -609,108 +609,115 @@
         <!-- adding geronimo plugin groups for the assemblies -->
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
+            <artifactId>framework</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugingroups</groupId>
             <artifactId>web-jetty</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
             <artifactId>jms</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
             <artifactId>ejb</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
             <artifactId>webservices-axis2</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
             <artifactId>webservices-cxf</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
             <artifactId>persistence</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
             <artifactId>clustering</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.assemblies</groupId>
-                                    <artifactId>geronimo-framework</artifactId>
-                                    <version>${version}</version>
-                                    <type>zip</type>
-                                    <classifier>bin</classifier>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="${project.build.directory}/assembly"/>
-                                <copy todir="${project.build.directory}/assembly">
-                                    <fileset dir="${project.build.directory}/geronimo-framework-${version}"/>
-                                </copy>
-                                <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration"

-                                      fork="yes" failonerror="true">
-                                   <classpath refid="maven.runtime.classpath"/>
-                                   <arg value="${project.build.directory}/assembly"/>
-                                   <arg value="gsh-wsgen.properties"/>
-                                </java>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <!--<build>-->
+        <!--<plugins>-->
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-dependency-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<phase>process-resources</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>unpack</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<artifactItems>-->
+                                <!--<artifactItem>-->
+                                    <!--<groupId>org.apache.geronimo.assemblies</groupId>-->
+                                    <!--<artifactId>geronimo-framework</artifactId>-->
+                                    <!--<version>${version}</version>-->
+                                    <!--<type>zip</type>-->
+                                    <!--<classifier>bin</classifier>-->
+                                <!--</artifactItem>-->
+                            <!--</artifactItems>-->
+                            <!--<outputDirectory>${project.build.directory}</outputDirectory>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
+
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-antrun-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<phase>process-resources</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>run</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<tasks>-->
+                                <!--<mkdir dir="${project.build.directory}/assembly"/>-->
+                                <!--<copy todir="${project.build.directory}/assembly">-->
+                                    <!--<fileset dir="${project.build.directory}/geronimo-framework-${version}"/>-->
+                                <!--</copy>-->
+                                <!--<java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration"
-->
+                                      <!--fork="yes" failonerror="true">-->
+                                   <!--<classpath refid="maven.runtime.classpath"/>-->
+                                   <!--<arg value="${project.build.directory}/assembly"/>-->
+                                   <!--<arg value="gsh-wsgen.properties"/>-->
+                                <!--</java>-->
+                            <!--</tasks>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
+        <!--</plugins>-->
+    <!--</build>-->
 
 </project>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml?rev=694978&r1=694977&r2=694978&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Sat Sep 13 09:13:58 2008
@@ -39,60 +39,66 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
+            <artifactId>framework</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.plugingroups</groupId>
             <artifactId>web-jetty</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
     </dependencies>
 
     <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.assemblies</groupId>
-                                    <artifactId>geronimo-framework</artifactId>
-                                    <version>${version}</version>
-                                    <type>zip</type>
-                                    <classifier>bin</classifier>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+        <!--<plugins>-->
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-dependency-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<phase>process-resources</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>unpack</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<artifactItems>-->
+                                <!--<artifactItem>-->
+                                    <!--<groupId>org.apache.geronimo.assemblies</groupId>-->
+                                    <!--<artifactId>geronimo-framework</artifactId>-->
+                                    <!--<version>${version}</version>-->
+                                    <!--<type>zip</type>-->
+                                    <!--<classifier>bin</classifier>-->
+                                <!--</artifactItem>-->
+                            <!--</artifactItems>-->
+                            <!--<outputDirectory>${project.build.directory}</outputDirectory>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="${project.build.directory}/assembly"/>
-                                <copy todir="${project.build.directory}/assembly">
-                                    <fileset dir="${project.build.directory}/geronimo-framework-${version}"/>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-antrun-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<phase>process-resources</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>run</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<tasks>-->
+                                <!--<mkdir dir="${project.build.directory}/assembly"/>-->
+                                <!--<copy todir="${project.build.directory}/assembly">-->
+                                    <!--<fileset dir="${project.build.directory}/geronimo-framework-${version}"/>-->
+                                <!--</copy>-->
+                            <!--</tasks>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
+        <!--</plugins>-->
     </build>
 
 </project>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml?rev=694978&r1=694977&r2=694978&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Sat Sep 13 09:13:58
2008
@@ -581,108 +581,114 @@
         <!-- adding geronimo plugin groups for the assemblies -->
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
+            <artifactId>framework</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.plugingroups</groupId>
             <artifactId>web-tomcat</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
             <artifactId>jms</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
             <artifactId>ejb</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
             <artifactId>webservices-axis2</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
             <artifactId>webservices-cxf</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
             <artifactId>persistence</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
             <artifactId>clustering</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.assemblies</groupId>
-                                    <artifactId>geronimo-framework</artifactId>
-                                    <version>${version}</version>
-                                    <type>zip</type>
-                                    <classifier>bin</classifier>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="${project.build.directory}/assembly"/>
-                                <copy todir="${project.build.directory}/assembly">
-                                    <fileset dir="${project.build.directory}/geronimo-framework-${version}"/>
-                                </copy>
-                                <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration"

-                                      fork="yes" failonerror="true">
-                                   <classpath refid="maven.runtime.classpath"/>
-                                   <arg value="${project.build.directory}/assembly"/>
-                                   <arg value="gsh-wsgen.properties"/>
-                                </java>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <!--<build>-->
+        <!--<plugins>-->
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-dependency-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<phase>process-resources</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>unpack</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<artifactItems>-->
+                                <!--<artifactItem>-->
+                                    <!--<groupId>org.apache.geronimo.assemblies</groupId>-->
+                                    <!--<artifactId>geronimo-framework</artifactId>-->
+                                    <!--<version>${version}</version>-->
+                                    <!--<type>zip</type>-->
+                                    <!--<classifier>bin</classifier>-->
+                                <!--</artifactItem>-->
+                            <!--</artifactItems>-->
+                            <!--<outputDirectory>${project.build.directory}</outputDirectory>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
+
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-antrun-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<phase>process-resources</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>run</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<tasks>-->
+                                <!--<mkdir dir="${project.build.directory}/assembly"/>-->
+                                <!--<copy todir="${project.build.directory}/assembly">-->
+                                    <!--<fileset dir="${project.build.directory}/geronimo-framework-${version}"/>-->
+                                <!--</copy>-->
+                                <!--<java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration"
-->
+                                      <!--fork="yes" failonerror="true">-->
+                                   <!--<classpath refid="maven.runtime.classpath"/>-->
+                                   <!--<arg value="${project.build.directory}/assembly"/>-->
+                                   <!--<arg value="gsh-wsgen.properties"/>-->
+                                <!--</java>-->
+                            <!--</tasks>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
+        <!--</plugins>-->
+    <!--</build>-->
 
 </project>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml?rev=694978&r1=694977&r2=694978&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml Sat Sep 13 09:13:58
2008
@@ -39,60 +39,66 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
+            <artifactId>framework</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.plugingroups</groupId>
             <artifactId>web-tomcat</artifactId>
             <version>${version}</version>
-            <type>jar</type>
+            <type>car</type>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.assemblies</groupId>
-                                    <artifactId>geronimo-framework</artifactId>
-                                    <version>${version}</version>
-                                    <type>zip</type>
-                                    <classifier>bin</classifier>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+    <!--<build>-->
+        <!--<plugins>-->
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-dependency-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<phase>process-resources</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>unpack</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<artifactItems>-->
+                                <!--<artifactItem>-->
+                                    <!--<groupId>org.apache.geronimo.assemblies</groupId>-->
+                                    <!--<artifactId>geronimo-framework</artifactId>-->
+                                    <!--<version>${version}</version>-->
+                                    <!--<type>zip</type>-->
+                                    <!--<classifier>bin</classifier>-->
+                                <!--</artifactItem>-->
+                            <!--</artifactItems>-->
+                            <!--<outputDirectory>${project.build.directory}</outputDirectory>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <mkdir dir="${project.build.directory}/assembly"/>
-                                <copy todir="${project.build.directory}/assembly">
-                                    <fileset dir="${project.build.directory}/geronimo-framework-${version}"/>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-antrun-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<phase>process-resources</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>run</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<tasks>-->
+                                <!--<mkdir dir="${project.build.directory}/assembly"/>-->
+                                <!--<copy todir="${project.build.directory}/assembly">-->
+                                    <!--<fileset dir="${project.build.directory}/geronimo-framework-${version}"/>-->
+                                <!--</copy>-->
+                            <!--</tasks>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
+        <!--</plugins>-->
+    <!--</build>-->
 
 </project>

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java?rev=694978&r1=694977&r2=694978&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
Sat Sep 13 09:13:58 2008
@@ -180,7 +180,10 @@
 
         try {
             // Incldue the generated artifact contents
-            archiver.getArchiver().addDirectory(getArtifactInRepositoryDir());
+            File artifactDirectory = getArtifactInRepositoryDir();
+            if (artifactDirectory.exists()) {
+                archiver.getArchiver().addDirectory(artifactDirectory);
+            }
 
             // Include the optional classes.resources
             if (classesDirectory.isDirectory()) {

Modified: geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java?rev=694978&r1=694977&r2=694978&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
(original)
+++ geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PlanProcessorMojo.java
Sat Sep 13 09:13:58 2008
@@ -129,6 +129,11 @@
     }
 
     public void execute() throws MojoExecutionException, MojoFailureException {
+        File source = new File(sourceDir, planFileName);
+        if (!source.exists()) {
+            getLog().info("No plan found, plugin will have no classloader");
+            return;
+        }
         try {
 //
             // FIXME: Do not need velocity here, we only need to filter,

Modified: geronimo/server/trunk/plugingroups/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/client/pom.xml?rev=694978&r1=694977&r2=694978&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/client/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/client/pom.xml Sat Sep 13 09:13:58 2008
@@ -30,6 +30,7 @@
     </parent>
 
     <artifactId>client</artifactId>
+    <packaging>car</packaging>
     <name>Geronimo Plugin Group :: Client</name>
 
     <description>

Modified: geronimo/server/trunk/plugingroups/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/clustering/pom.xml?rev=694978&r1=694977&r2=694978&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/clustering/pom.xml Sat Sep 13 09:13:58 2008
@@ -30,6 +30,7 @@
     </parent>
 
     <artifactId>clustering</artifactId>
+    <packaging>car</packaging>
     <name>Geronimo Plugin Group :: WADI Clustering</name>
 
     <description>

Modified: geronimo/server/trunk/plugingroups/ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/ejb/pom.xml?rev=694978&r1=694977&r2=694978&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/ejb/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/ejb/pom.xml Sat Sep 13 09:13:58 2008
@@ -30,6 +30,7 @@
     </parent>
 
     <artifactId>ejb</artifactId>
+    <packaging>car</packaging>
     <name>Geronimo Plugin Group :: EJB</name>
 
     <description>

Modified: geronimo/server/trunk/plugingroups/jms/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/jms/pom.xml?rev=694978&r1=694977&r2=694978&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/jms/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/jms/pom.xml Sat Sep 13 09:13:58 2008
@@ -30,6 +30,7 @@
     </parent>
 
     <artifactId>jms</artifactId>
+    <packaging>car</packaging>
     <name>Geronimo Plugin Group :: JMS</name>
 
     <description>

Modified: geronimo/server/trunk/plugingroups/persistence/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/persistence/pom.xml?rev=694978&r1=694977&r2=694978&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/persistence/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/persistence/pom.xml Sat Sep 13 09:13:58 2008
@@ -30,6 +30,7 @@
     </parent>
 
     <artifactId>persistence</artifactId>
+    <packaging>car</packaging>
     <name>Geronimo Plugin Group :: Persistence</name>
 
     <description>

Modified: geronimo/server/trunk/plugingroups/web-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-jetty/pom.xml?rev=694978&r1=694977&r2=694978&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/web-jetty/pom.xml Sat Sep 13 09:13:58 2008
@@ -30,6 +30,7 @@
     </parent>
 
     <artifactId>web-jetty</artifactId>
+    <packaging>car</packaging>
     <name>Geronimo Plugin Group :: Web Jetty</name>
 
     <description>

Modified: geronimo/server/trunk/plugingroups/web-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/web-tomcat/pom.xml?rev=694978&r1=694977&r2=694978&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/web-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/web-tomcat/pom.xml Sat Sep 13 09:13:58 2008
@@ -30,6 +30,7 @@
     </parent>
 
     <artifactId>web-tomcat</artifactId>
+    <packaging>car</packaging>
     <name>Geronimo Plugin Group :: Web Tomcat</name>
 
     <description>

Modified: geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml?rev=694978&r1=694977&r2=694978&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml Sat Sep 13 09:13:58 2008
@@ -30,6 +30,7 @@
     </parent>
 
     <artifactId>webservices-axis2</artifactId>
+    <packaging>car</packaging>
     <name>Geronimo Plugin Group :: Web Services Axis2</name>
 
     <description>

Modified: geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml?rev=694978&r1=694977&r2=694978&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/webservices-cxf/pom.xml Sat Sep 13 09:13:58 2008
@@ -30,6 +30,7 @@
     </parent>
 
     <artifactId>webservices-cxf</artifactId>
+    <packaging>car</packaging>
     <name>Geronimo Plugin Group :: Web Services CXF</name>
 
     <description>



Mime
View raw message