svn commit: r421529 - in /geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee: ./ src/main/ src/main/assembly/ src/main/var/ src/main/var/config/ src/main/var/log/ src/main/var/security/ src/main/var/shared/ src/main/var/temp/ src/...

[jd...@apache.org]

Author: jdillon
Date: Thu Jul 13 00:52:15 2006
New Revision: 421529

URL: http://svn.apache.org/viewvc?rev=421529&view=rev
Log:
Using standard module layout

Added:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/
      - copied from r421525, geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/assemble/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
      - copied unchanged from r421528, geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/assemble/bin.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/
      - copied from r421525, geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/var/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/
      - copied from r421528, geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/var/config/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/log/
      - copied from r421528, geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/var/log/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/security/
      - copied from r421528, geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/var/security/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/shared/
      - copied from r421528, geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/var/shared/
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/temp/
      - copied from r421528, geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/var/temp/
Removed:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/var/
Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml?rev=421529&r1=421528&r2=421529&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml Thu Jul 13 00:52:15 2006
@@ -583,6 +583,31 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>dependency-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>geronimo-scripts</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/scripts</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>geronimo-assembly-plugin</artifactId>
                 <executions>
@@ -600,34 +625,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>