geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r421534 - /geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
Date Thu, 13 Jul 2006 08:03:34 GMT
Author: jdillon
Date: Thu Jul 13 01:03:33 2006
New Revision: 421534

URL: http://svn.apache.org/viewvc?rev=421534&view=rev
Log:
Update to pull from the right places

Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml?rev=421534&r1=421533&r2=421534&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
(original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/assembly/bin.xml
Thu Jul 13 01:03:33 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>
@@ -152,7 +138,7 @@
         </dependencySet>
 
     </dependencySets>
-
+    
     <fileSets>
         <fileSet>
             <directory>target/archive-tmp/repository</directory>
@@ -165,14 +151,8 @@
             </excludes>
         </fileSet>
         
-        <!--
-        
-        FIXME: Remove the need to have a version listed here!
-        
-        -->
-        
         <fileSet>
-            <directory>target/assembly/work/geronimo-scripts-1.2-SNAPSHOT.jar</directory>
+            <directory>target/scripts</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>**/*.sh</include>
@@ -182,43 +162,28 @@
         </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>
+            <source>src/main/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>
-            <outputDirectory>var/config</outputDirectory>
-            <destName>offline-deployer-list</destName>
             <filtered>true</filtered>
             <fileMode>0644</fileMode>
         </file>
     </files>
-
+    
 </assembly>



Mime
View raw message