geronimo-scm mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=421516&view=rev
Log:
Drop maven1 bits
Use dependency plugin to avoid needing version number in assembly desc
Finish moving to more std m2 layout

Added:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/main/var/
      - copied from r421513, geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/var/
Removed:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/maven.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/project.properties
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/project.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/var/
Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/pom.xml
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/main/assembly/bin.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=421516&r1=421515&r2=421516&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:40:06 2006
@@ -595,6 +595,32 @@
     
     <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>

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/main/assembly/bin.xml?rev=421516&r1=421515&r2=421516&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/main/assembly/bin.xml
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/j2ee-jetty-server/src/main/assembly/bin.xml
Wed Jul 12 23:40:06 2006
@@ -36,20 +36,6 @@
 
     <dependencySets>
         <dependencySet>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>org.apache.geronimo.modules:geronimo-scripts</include>
-            </includes>
-            <unpack>
-                <excludes>
-                    <exclude>**/META-INF/**</exclude>
-                </excludes>
-            </unpack>
-            <directoryMode>0755</directoryMode>
-            <fileMode>0755</fileMode>
-        </dependencySet>
-        
-        <dependencySet>
             <outputDirectory>lib</outputDirectory>
             <includes>
                 <include>cglib:cglib-nodep</include>
@@ -164,16 +150,8 @@
             </excludes>
         </fileSet>
         
-        <!--
-        
-        FIXME: Remove the need to have a version listed here!
-        
-        May need to use dependency plugin to pull these in... or force a directory to be
used
-        
-        -->
-        
         <fileSet>
-            <directory>target/assembly/work/geronimo-scripts-1.2-SNAPSHOT.jar</directory>
+            <directory>target/scripts</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>**/*.sh</include>
@@ -183,38 +161,25 @@
         </fileSet>
         
         <fileSet>
-            <directory>target/assembly/work/geronimo-scripts-1.2-SNAPSHOT.jar</directory>
+            <directory>target/scripts</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>**/*.bat</include>
+                <include>*.txt</include>
             </includes>
             <lineEnding>dos</lineEnding>
         </fileSet>
         
         <fileSet>
-            <directory>src/var</directory>
+            <directory>src/main/var</directory>
             <outputDirectory>var</outputDirectory>
         </fileSet>
     </fileSets>
 
     <files>
         <file>
-            <source>${basedir}/src/var/config/config.xml</source>
-            <outputDirectory>var/config</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-        </file>
-        <file>
-            <source>${basedir}/src/var/config/config.xml</source>
-            <outputDirectory>var/config</outputDirectory>
-            <destName>config.xml.orig</destName>
-            <filtered>true</filtered>
-            <fileMode>0644</fileMode>
-        </file>
-        <file>
-            <source>${basedir}/src/var/config/config.xml</source>
+            <source>src/main/var/config/config.xml</source>
             <outputDirectory>var/config</outputDirectory>
-            <destName>offline-deployer-list</destName>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
         </file>



Mime
View raw message