geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r520263 - in /geronimo/server/trunk/assemblies: geronimo-boilerplate-jee5/ geronimo-framework/ geronimo-framework/src/main/assembly/ geronimo-framework/src/main/resources/ geronimo-framework/src/main/resources/var/ geronimo-framework/src/ma...
Date Tue, 20 Mar 2007 04:05:03 GMT
Author: jdillon
Date: Mon Mar 19 21:05:01 2007
New Revision: 520263

URL: http://svn.apache.org/viewvc?view=rev&rev=520263
Log:
Clean up assembly modules usage of resources, use the same filtering
Only install config.xml as writable in assemblies, none of the other files need that

Added:
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/
      - copied from r520176, geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/resources/var/config/
      - copied from r520262, geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/
      - copied from r520176, geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/
      - copied from r520262, geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/
      - copied from r520176, geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/resources/var/config/
      - copied from r520262, geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/config/
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/
      - copied from r520176, geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/
      - copied from r520262, geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/
      - copied from r520176, geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/resources/var/config/
      - copied from r520262, geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/config/
Removed:
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/var/
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/var/
Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
    geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml?view=diff&rev=520263&r1=520262&r2=520263
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml Mon Mar 19 21:05:01
2007
@@ -43,12 +43,6 @@
         <resources>
             <resource>
                 <directory>${pom.basedir}/src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <includes>
-                    <include>var/config/**</include>
-                </includes>
                 <filtering>true</filtering>
             </resource>
         </resources>

Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?view=diff&rev=520263&r1=520262&r2=520263
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Mon Mar 19 21:05:01 2007
@@ -135,12 +135,7 @@
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/main/var/config</directory>
-                <includes>
-                    <include>config.xml</include>
-                    <include>offline-deployer-config.xml</include>
-                    <include>jsr88-configurer-config.xml</include>
-                </includes>
+                <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>

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=520263&r1=520262&r2=520263
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml Mon Mar
19 21:05:01 2007
@@ -138,13 +138,23 @@
         </fileSet>
         
         <fileSet>
-            <directory>target/scratch</directory>
-            <outputDirectory>var/config</outputDirectory>
+            <directory>target/classes</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>var/config/**</include>
+            </includes>
+        </fileSet>
+        
+        <!--
+        NOTE: config.xml must be marked as writable or the server will complain when booting.
+        -->
+        
+        <fileSet>
+            <directory>target/classes</directory>
+            <outputDirectory>/</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
-                <include>config.xml</include>
-                <include>jsr88-configurer-config.xml</include>
-                <include>offline-deployer-config.xml</include>
+                <include>var/config/config.xml</include>
             </includes>
         </fileSet>
     </fileSets>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml?view=diff&rev=520263&r1=520262&r2=520263
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml Mon Mar 19 21:05:01 2007
@@ -408,7 +408,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-clustering-wadi</artifactId> 
+            <artifactId>jetty6-clustering-wadi</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -417,20 +417,8 @@
     
     <build>
         <resources>
-            <!--
-            HACK: Because this is a pom packaging and assembly files/file is broke
-                  we need to filter with the resources plugin... and must be a jar packaging
-                  because for some reason maven-resources-plugin can not
-                  be attached!!!!
-            -->
             <resource>
-                <directory>${pom.basedir}/src/main/var/config</directory>
-                <includes>
-                    <include>config.xml</include>
-                    <include>offline-deployer-config.xml</include>
-                    <include>jsr88-configurer-config.xml</include>
-                    <include>artifact_aliases.properties</include>
-                </includes>
+                <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>
@@ -499,16 +487,6 @@
                                     </fileset>
                                     <mapper type="flatten"/>
                                 </copy>
-                                
-                                <!-- Move filtered files -->
-                                <move todir="${project.build.directory}/scratch">
-                                    <fileset dir="${project.build.directory}/classes">
-                                        <include name="config.xml"/>
-                                        <include name="offline-deployer-config.xml"/>
-                                        <include name="jsr88-configurer-config.xml"/>
-                                        <include name="artifact_aliases.properties"/>
-                                    </fileset>
-                                </move>
                             </tasks>
                         </configuration>
                     </execution>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml?view=diff&rev=520263&r1=520262&r2=520263
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml Mon Mar
19 21:05:01 2007
@@ -146,18 +146,23 @@
         </fileSet>
         
         <fileSet>
-            <directory>src/main/var</directory>
-            <outputDirectory>var</outputDirectory>
+            <directory>target/classes</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>var/config/**</include>
+            </includes>
         </fileSet>
         
+        <!--
+        NOTE: config.xml must be marked as writable or the server will complain when booting.
+        -->
+        
         <fileSet>
-            <directory>target/scratch</directory>
-            <outputDirectory>var/config</outputDirectory>
+            <directory>target/classes</directory>
+            <outputDirectory>/</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
-                <include>config.xml</include>
-                <include>jsr88-configurer-config.xml</include>
-                <include>offline-deployer-config.xml</include>
+                <include>var/config/config.xml</include>
             </includes>
         </fileSet>
     </fileSets>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml?view=diff&rev=520263&r1=520262&r2=520263
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml Mon Mar 19 21:05:01 2007
@@ -198,12 +198,7 @@
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/main/var/config</directory>
-                <includes>
-                    <include>config.xml</include>
-                    <include>offline-deployer-config.xml</include>
-                    <include>jsr88-configurer-config.xml</include>
-                </includes>
+                <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>
@@ -272,15 +267,6 @@
                                     </fileset>
                                     <mapper type="flatten"/>
                                 </copy>
-                                
-                                <!-- Move filtered files -->
-                                <move todir="${project.build.directory}/scratch">
-                                    <fileset dir="${project.build.directory}/classes">
-                                        <include name="config.xml"/>
-                                        <include name="offline-deployer-config.xml"/>
-                                        <include name="jsr88-configurer-config.xml"/>
-                                    </fileset>
-                                </move>
                             </tasks>
                         </configuration>
                     </execution>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml?view=diff&rev=520263&r1=520262&r2=520263
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml Mon
Mar 19 21:05:01 2007
@@ -138,13 +138,23 @@
         </fileSet>
         
         <fileSet>
-            <directory>target/scratch</directory>
-            <outputDirectory>var/config</outputDirectory>
+            <directory>target/classes</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>var/config/**</include>
+            </includes>
+        </fileSet>
+        
+        <!--
+        NOTE: config.xml must be marked as writable or the server will complain when booting.
+        -->
+        
+        <fileSet>
+            <directory>target/classes</directory>
+            <outputDirectory>/</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
-                <include>config.xml</include>
-                <include>jsr88-configurer-config.xml</include>
-                <include>offline-deployer-config.xml</include>
+                <include>var/config/config.xml</include>
             </includes>
         </fileSet>
     </fileSets>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml?view=diff&rev=520263&r1=520262&r2=520263
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml Mon Mar 19 21:05:01 2007
@@ -232,12 +232,14 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis2-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf-deployer</artifactId>
@@ -383,12 +385,7 @@
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/main/var/config</directory>
-                <includes>
-                    <include>config.xml</include>
-                    <include>offline-deployer-config.xml</include>
-                    <include>jsr88-configurer-config.xml</include>
-                </includes>
+                <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>
@@ -457,15 +454,6 @@
                                     </fileset>
                                     <mapper type="flatten"/>
                                 </copy>
-
-                                <!-- Move filtered files -->
-                                <move todir="${project.build.directory}/scratch">
-                                    <fileset dir="${project.build.directory}/classes">
-                                        <include name="config.xml"/>
-                                        <include name="offline-deployer-config.xml"/>
-                                        <include name="jsr88-configurer-config.xml"/>
-                                    </fileset>
-                                </move>
                             </tasks>
                         </configuration>
                     </execution>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml?view=diff&rev=520263&r1=520262&r2=520263
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml Mon Mar
19 21:05:01 2007
@@ -146,18 +146,23 @@
         </fileSet>
         
         <fileSet>
-            <directory>src/main/var</directory>
-            <outputDirectory>var</outputDirectory>
+            <directory>target/classes</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>var/config/**</include>
+            </includes>
         </fileSet>
         
+        <!--
+        NOTE: config.xml must be marked as writable or the server will complain when booting.
+        -->
+        
         <fileSet>
-            <directory>target/scratch</directory>
-            <outputDirectory>var/config</outputDirectory>
+            <directory>target/classes</directory>
+            <outputDirectory>/</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
-                <include>config.xml</include>
-                <include>jsr88-configurer-config.xml</include>
-                <include>offline-deployer-config.xml</include>
+                <include>var/config/config.xml</include>
             </includes>
         </fileSet>
     </fileSets>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml?view=diff&rev=520263&r1=520262&r2=520263
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml Mon Mar 19 21:05:01
2007
@@ -198,12 +198,7 @@
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/main/var/config</directory>
-                <includes>
-                    <include>config.xml</include>
-                    <include>offline-deployer-config.xml</include>
-                    <include>jsr88-configurer-config.xml</include>
-                </includes>
+                <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>
@@ -272,15 +267,6 @@
                                     </fileset>
                                     <mapper type="flatten"/>
                                 </copy>
-                                
-                                <!-- Move filtered files -->
-                                <move todir="${project.build.directory}/scratch">
-                                    <fileset dir="${project.build.directory}/classes">
-                                        <include name="config.xml"/>
-                                        <include name="offline-deployer-config.xml"/>
-                                        <include name="jsr88-configurer-config.xml"/>
-                                    </fileset>
-                                </move>
                             </tasks>
                         </configuration>
                     </execution>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml?view=diff&rev=520263&r1=520262&r2=520263
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml Mon
Mar 19 21:05:01 2007
@@ -138,13 +138,23 @@
         </fileSet>
         
         <fileSet>
-            <directory>target/scratch</directory>
-            <outputDirectory>var/config</outputDirectory>
+            <directory>target/classes</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>var/config/**</include>
+            </includes>
+        </fileSet>
+        
+        <!--
+        NOTE: config.xml must be marked as writable or the server will complain when booting.
+        -->
+        
+        <fileSet>
+            <directory>target/classes</directory>
+            <outputDirectory>/</outputDirectory>
             <fileMode>0644</fileMode>
             <includes>
-                <include>config.xml</include>
-                <include>jsr88-configurer-config.xml</include>
-                <include>offline-deployer-config.xml</include>
+                <include>var/config/config.xml</include>
             </includes>
         </fileSet>
     </fileSets>



Mime
View raw message