geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r422822 - in /geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee: pom.xml src/main/assembly/bin.xml
Date Mon, 17 Jul 2006 19:49:15 GMT
Author: jdillon
Date: Mon Jul 17 12:49:15 2006
New Revision: 422822

URL: http://svn.apache.org/viewvc?rev=422822&view=rev
Log:
Just use target/boilerplate

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=422822&r1=422821&r2=422822&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 Mon Jul
17 12:49:15 2006
@@ -623,7 +623,7 @@
                 <artifactId>dependency-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack-common</id>
+                        <id>unpack-boilerplate</id>
                         <phase>package</phase>
                         <goals>
                             <goal>unpack</goal>
@@ -637,7 +637,7 @@
                                     <type>jar</type>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${project.build.directory}/boilerplate-j2ee</outputDirectory>
+                            <outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
                         </configuration>
                     </execution>
                     

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=422822&r1=422821&r2=422822&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
Mon Jul 17 12:49:15 2006
@@ -109,6 +109,14 @@
     </dependencySets>
 
     <fileSets>
+        <fileSet>
+            <directory>target/boilerplate</directory>
+            <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>META-INF/**</exclude>
+            </excludes>
+        </fileSet>
+        
         <!-- Include previously installed CAR files -->
         <fileSet>
             <directory>target/archive-tmp/repository</directory>
@@ -149,14 +157,6 @@
                 <include>*.txt</include>
             </includes>
             <lineEnding>dos</lineEnding>
-        </fileSet>
-        
-        <fileSet>
-            <directory>target/boilerplate-j2ee</directory>
-            <outputDirectory>/</outputDirectory>
-            <excludes>
-                <exclude>META-INF/**</exclude>
-            </excludes>
         </fileSet>
         
         <fileSet>



Mime
View raw message