geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r656891 - in /geronimo/server/trunk/assemblies: geronimo-jetty6-javaee5/pom.xml geronimo-jetty6-minimal/pom.xml geronimo-tomcat6-javaee5/pom.xml geronimo-tomcat6-minimal/pom.xml
Date Thu, 15 May 2008 23:03:33 GMT
Author: jdillon
Date: Thu May 15 16:03:33 2008
New Revision: 656891

URL: http://svn.apache.org/viewvc?rev=656891&view=rev
Log:
Remove unused schema build muck
Make sure that we unpack the zip framework assembly to avoid extra build muck and problems
when /tmp is not on the same disk

Modified:
    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

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=656891&r1=656890&r2=656891&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Thu May 15 16:03:33 2008
@@ -576,20 +576,12 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack-base</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>unpack</goal>
@@ -600,31 +592,13 @@
                                     <groupId>org.apache.geronimo.assemblies</groupId>
                                     <artifactId>geronimo-framework</artifactId>
                                     <version>${version}</version>
-                                    <type>tar.gz</type>
+                                    <type>zip</type>
                                     <classifier>bin</classifier>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/unpack</outputDirectory>
                         </configuration>
                     </execution>
-
-                    <execution>
-                        <id>unpack-schemas</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-jetty6-builder</artifactId>
-                                    <version>${version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
 
@@ -633,7 +607,6 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-framework</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>run</goal>
@@ -649,27 +622,6 @@
                             </tasks>
                         </configuration>
                     </execution>
-                    
-                    <execution>
-                        <id>copy-schemas</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <!-- Flatten all schemas -->
-                                <mkdir dir="${project.build.directory}/schema"/>
-                                <copy todir="${project.build.directory}/schema">
-                                    <fileset dir="${project.build.directory}/scratch/schema">
-                                        <include name="**/*.xsd"/>
-                                        <include name="**/*.dtd"/>
-                                    </fileset>
-                                    <mapper type="flatten"/>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
         </plugins>

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=656891&r1=656890&r2=656891&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Thu May 15 16:03:33 2008
@@ -230,20 +230,12 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack-boilerplate</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>unpack</goal>
@@ -254,31 +246,13 @@
                                     <groupId>org.apache.geronimo.assemblies</groupId>
                                     <artifactId>geronimo-framework</artifactId>
                                     <version>${version}</version>
-                                    <type>tar.gz</type>
+                                    <type>zip</type>
                                     <classifier>bin</classifier>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/unpack</outputDirectory>
                         </configuration>
                     </execution>
-
-                    <execution>
-                        <id>unpack-schemas</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-jetty6-builder</artifactId>
-                                    <version>${version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
 
@@ -287,7 +261,6 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-framework</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>run</goal>
@@ -303,27 +276,6 @@
                             </tasks>
                         </configuration>
                     </execution>
-                    
-                    <execution>
-                        <id>copy-schemas</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <!-- Flatten all schemas -->
-                                <mkdir dir="${project.build.directory}/schema"/>
-                                <copy todir="${project.build.directory}/schema">
-                                    <fileset dir="${project.build.directory}/scratch/schema">
-                                        <include name="**/*.xsd"/>
-                                        <include name="**/*.dtd"/>
-                                    </fileset>
-                                    <mapper type="flatten"/>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
         </plugins>

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=656891&r1=656890&r2=656891&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Thu May 15 16:03:33
2008
@@ -545,24 +545,15 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack-boilerplate</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>unpack</goal>
@@ -573,31 +564,13 @@
                                     <groupId>org.apache.geronimo.assemblies</groupId>
                                     <artifactId>geronimo-framework</artifactId>
                                     <version>${version}</version>
-                                    <type>tar.gz</type>
+                                    <type>zip</type>
                                     <classifier>bin</classifier>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/unpack</outputDirectory>
                         </configuration>
                     </execution>
-
-                    <execution>
-                        <id>unpack-schemas</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-tomcat6-builder</artifactId>
-                                    <version>${version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
 
@@ -606,7 +579,6 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-framework</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>run</goal>
@@ -622,26 +594,6 @@
                             </tasks>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>copy-schemas</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <!-- Flatten all schemas -->
-                                <mkdir dir="${project.build.directory}/schema"/>
-                                <copy todir="${project.build.directory}/schema">
-                                    <fileset dir="${project.build.directory}/scratch/schema">
-                                        <include name="**/*.xsd"/>
-                                        <include name="**/*.dtd"/>
-                                    </fileset>
-                                    <mapper type="flatten"/>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
         </plugins>

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=656891&r1=656890&r2=656891&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml Thu May 15 16:03:33
2008
@@ -230,20 +230,12 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack-boilerplate</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>unpack</goal>
@@ -254,31 +246,13 @@
                                     <groupId>org.apache.geronimo.assemblies</groupId>
                                     <artifactId>geronimo-framework</artifactId>
                                     <version>${version}</version>
-                                    <type>tar.gz</type>
+                                    <type>zip</type>
                                     <classifier>bin</classifier>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/unpack</outputDirectory>
                         </configuration>
                     </execution>
-
-                    <execution>
-                        <id>unpack-schemas</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-tomcat6-builder</artifactId>
-                                    <version>${version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
 
@@ -287,7 +261,6 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-framework</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>run</goal>
@@ -303,26 +276,6 @@
                             </tasks>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>copy-schemas</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <!-- Flatten all schemas -->
-                                <mkdir dir="${project.build.directory}/schema"/>
-                                <copy todir="${project.build.directory}/schema">
-                                    <fileset dir="${project.build.directory}/scratch/schema">
-                                        <include name="**/*.xsd"/>
-                                        <include name="**/*.dtd"/>
-                                    </fileset>
-                                    <mapper type="flatten"/>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
         </plugins>



Mime
View raw message