geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akulshresh...@apache.org
Subject svn commit: r535351 - /geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml
Date Fri, 04 May 2007 18:56:08 GMT
Author: akulshreshtha
Date: Fri May  4 11:56:07 2007
New Revision: 535351

URL: http://svn.apache.org/viewvc?view=rev&rev=535351
Log:
GERONIMO-3123 reverting 535158

Modified:
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml

Modified: geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml?view=diff&rev=535351&r1=535350&r2=535351
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml Fri May
 4 11:56:07 2007
@@ -43,7 +43,7 @@
         <!--
         NOTE: lib/endorsed/ is picked up from boilerplate.
         -->
-
+        
         <dependencySet>
             <outputDirectory>bin</outputDirectory>
             <outputFileNameMapping>server.jar</outputFileNameMapping>
@@ -99,7 +99,6 @@
             <outputDirectory>/</outputDirectory>
             <excludes>
                 <exclude>META-INF/**</exclude>
-                <exclude>var/**</exclude>
             </excludes>
         </fileSet>
         
@@ -107,7 +106,7 @@
             <directory>target/repository</directory>
             <outputDirectory>repository</outputDirectory>
         </fileSet>
-        
+
         <fileSet>
             <directory>target/schema</directory>
             <outputDirectory>schema</outputDirectory>
@@ -137,15 +136,10 @@
             </includes>
             <lineEnding>dos</lineEnding>
         </fileSet>
-
-        <fileSet>
-            <directory>target/boilerplate/var</directory>
-            <outputDirectory>${templateDir}/var</outputDirectory>
-        </fileSet>
         
         <fileSet>
             <directory>target/classes</directory>
-            <outputDirectory>${templateDir}</outputDirectory>
+            <outputDirectory>/</outputDirectory>
             <includes>
                 <include>var/config/**</include>
             </includes>
@@ -157,30 +151,7 @@
         
         <fileSet>
             <directory>target/classes</directory>
-            <outputDirectory>${templateDir}</outputDirectory>
-            <fileMode>0644</fileMode>
-            <includes>
-                <include>var/config/config.xml</include>
-            </includes>
-        </fileSet>
-
-        <!-- make a copy of var for default server named geronimo0 -->
-        <fileSet>
-            <directory>target/boilerplate/var</directory>
-            <outputDirectory>${defaultServerName}/var</outputDirectory>
-        </fileSet>
-
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>${defaultServerName}</outputDirectory>
-            <includes>
-                <include>var/config/**</include>
-            </includes>
-        </fileSet>
-
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>${defaultServerName}</outputDirectory>
+            <outputDirectory>/</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
                 <include>var/config/config.xml</include>



Mime
View raw message