geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r421514 - in /geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server: pom.xml src/assemble/ src/main/ src/main/assembly/ src/main/assembly/bin.xml
Date Thu, 13 Jul 2006 06:23:39 GMT
Author: jdillon
Date: Wed Jul 12 23:23:38 2006
New Revision: 421514

URL: http://svn.apache.org/viewvc?rev=421514&view=rev
Log:
Start to use standard m2 layout

Added:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/main/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/main/assembly/
      - copied from r421412, geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/assemble/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/main/assembly/bin.xml
      - copied unchanged from r421513, geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/assemble/bin.xml
Removed:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/assemble/
Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml?rev=421514&r1=421513&r2=421514&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml Wed Jul
12 23:23:38 2006
@@ -613,34 +613,17 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
-                    <!--
                     <execution>
-                        <id>setup</id>
+                        <id>bin</id>
                         <phase>package</phase>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/assemble/setup.xml</descriptor>
-                            </descriptors>
-                            <intermediaryAssembly>true</intermediaryAssembly>
-                        </configuration>
                         <goals>
-                            <goal>assembly</goal>
+                            <goal>attached</goal>
                         </goals>
-                    </execution>
-                    -->
-                    
-                    <execution>
-                        <id>test</id>
-                        <phase>package</phase>
                         <configuration>
                             <descriptors>
-                                <descriptor>${pom.basedir}/src/assemble/bin.xml</descriptor>
-                                <!-- <finalName>geronimo-${version}</finalName>
-->
+                                <descriptor>${pom.basedir}/src/main/assembly/bin.xml</descriptor>
                             </descriptors>
                         </configuration>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
                     </execution>
                 </executions>
             </plugin>



Mime
View raw message