geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r422048 - in /geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee: pom.xml src/main/assembly/bin.xml
Date Fri, 14 Jul 2006 21:06:53 GMT
Author: jdillon
Date: Fri Jul 14 14:06:53 2006
New Revision: 422048

URL: http://svn.apache.org/viewvc?rev=422048&view=rev
Log:
Using dependency + antrun to avoid the need for custom maven-assembly-plugin

Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml?rev=422048&r1=422047&r2=422048&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml Fri Jul
14 14:06:53 2006
@@ -587,7 +587,7 @@
                 <artifactId>dependency-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack</id>
+                        <id>unpack-scripts</id>
                         <phase>package</phase>
                         <goals>
                             <goal>unpack</goal>
@@ -602,6 +602,105 @@
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/scripts</outputDirectory>
+                        </configuration>
+                    </execution>
+                    
+                    <execution>
+                        <id>unpack-schemas</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-axis-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-client-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-connector-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-j2ee-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-naming-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-security-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-service-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-jetty-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-web-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-j2ee-builder</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>pre-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <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>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml?rev=422048&r1=422047&r2=422048&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/assembly/bin.xml
Fri Jul 14 14:06:53 2006
@@ -68,31 +68,6 @@
         </dependencySet>
         
         <dependencySet>
-            <outputDirectory>schema</outputDirectory>
-            <includes>
-                <include>org.apache.geronimo.modules:geronimo-axis-builder</include>
-                <include>org.apache.geronimo.modules:geronimo-client-builder</include>
-                <include>org.apache.geronimo.modules:geronimo-connector-builder</include>
-                <include>org.apache.geronimo.modules:geronimo-j2ee-builder</include>
-                <include>org.apache.geronimo.modules:geronimo-naming-builder</include>
-                <include>org.apache.geronimo.modules:geronimo-security-builder</include>
-                <include>org.apache.geronimo.modules:geronimo-service-builder</include>
-                <include>org.apache.geronimo.modules:geronimo-jetty-builder</include>
-                <include>org.apache.geronimo.modules:geronimo-web-builder</include>
-                <include>org.apache.geronimo.modules:geronimo-j2ee-schema</include>
-            </includes>
-            <mapper>
-                <type>flatten</type>
-            </mapper>
-            <unpack>
-                <includes>
-                    <include>**/*.xsd</include>
-                    <include>**/*.dtd</include>
-                </includes>
-            </unpack>
-        </dependencySet>
-        
-        <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>server.jar</outputFileNameMapping>
             <includes>
@@ -139,6 +114,7 @@
     </dependencySets>
 
     <fileSets>
+        <!-- Include previously installed CAR files -->
         <fileSet>
             <directory>target/archive-tmp/repository</directory>
             <outputDirectory>repository</outputDirectory>
@@ -148,6 +124,16 @@
                 <exclude>**/*.sha1</exclude>
                 <exclude>**/*.md5</exclude>
             </excludes>
+        </fileSet>
+        
+        <fileSet>
+            <directory>target/schema</directory>
+            <outputDirectory>schema</outputDirectory>
+            <includes>
+                <include>**/*.xsd</include>
+                <include>**/*.dtd</include>
+            </includes>
+            <lineEnding>dos</lineEnding>
         </fileSet>
         
         <fileSet>



Mime
View raw message