geronimo-scm mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=422053&view=rev
Log:
Minor hack to get the config.xml filtered w/o the assembly plugin (as its broken until 2.2
is out)

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=422053&r1=422052&r2=422053&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:24:40 2006
@@ -580,8 +580,17 @@
     </dependencies>
     
     <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/var/config</directory>
+                <includes>
+                    <include>config.xml</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        
         <plugins>
-            
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>dependency-maven-plugin</artifactId>
@@ -692,6 +701,7 @@
                         </goals>
                         <configuration>
                             <tasks>
+                                <!-- Flatten all schemas -->
                                 <mkdir dir="${project.build.directory}/schema"/>
                                 <copy todir="${project.build.directory}/schema">
                                     <fileset dir="${project.build.directory}/scratch/schema">
@@ -700,6 +710,10 @@
                                     </fileset>
                                     <mapper type="flatten"/>
                                 </copy>
+                                
+                                <!-- Filter the config.xml -->
+                                <move file="${project.build.directory}/classes/config.xml"
+                                      tofile="${project.build.directory}/scratch/config.xml"/>
                             </tasks>
                         </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=422053&r1=422052&r2=422053&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:24:40 2006
@@ -160,15 +160,15 @@
             <directory>src/main/var</directory>
             <outputDirectory>var</outputDirectory>
         </fileSet>
-    </fileSets>
-
-    <files>
-        <file>
-            <source>src/main/var/config/config.xml</source>
+        
+        <fileSet>
+            <directory>target/scratch</directory>
             <outputDirectory>var/config</outputDirectory>
-            <filtered>true</filtered>
             <fileMode>0644</fileMode>
-        </file>
-    </files>
+            <includes>
+                <include>config.xml</include>
+            </includes>
+        </fileSet>
+    </fileSets>
 
 </assembly>



Mime
View raw message