geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r437247 - in /geronimo/server/trunk: applications/console/geronimo-console-standard/ assemblies/geronimo-boilerplate-j2ee/ assemblies/geronimo-boilerplate-minimal/ configs/client-security/ configs/client-system/ configs/console-jetty/ confi...
Date Sat, 26 Aug 2006 23:37:28 GMT
Author: jdillon
Date: Sat Aug 26 16:37:20 2006
New Revision: 437247

URL: http://svn.apache.org/viewvc?rev=437247&view=rev
Log:
(GERONIMO-2331) Updated configs to pull resources from the standard location, clean up some
remaining config used to use std locations

Added:
    geronimo/server/trunk/configs/console-jetty/src/main/
    geronimo/server/trunk/configs/console-jetty/src/main/resources/
    geronimo/server/trunk/configs/console-jetty/src/main/resources/META-INF/
      - copied from r437231, geronimo/server/trunk/configs/console-jetty/src/conf/
    geronimo/server/trunk/configs/console-tomcat/src/main/
    geronimo/server/trunk/configs/console-tomcat/src/main/resources/
    geronimo/server/trunk/configs/console-tomcat/src/main/resources/META-INF/
      - copied from r437231, geronimo/server/trunk/configs/console-tomcat/src/conf/
    geronimo/server/trunk/configs/directory/src/main/
    geronimo/server/trunk/configs/directory/src/main/resources/
    geronimo/server/trunk/configs/directory/src/main/resources/META-INF/
      - copied from r437231, geronimo/server/trunk/configs/directory/src/conf/
    geronimo/server/trunk/configs/jsp-examples-jetty/src/main/
    geronimo/server/trunk/configs/jsp-examples-jetty/src/main/resources/
    geronimo/server/trunk/configs/jsp-examples-jetty/src/main/resources/META-INF/
      - copied from r437231, geronimo/server/trunk/configs/jsp-examples-jetty/src/conf/
    geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/
    geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/resources/
    geronimo/server/trunk/configs/jsp-examples-tomcat/src/main/resources/META-INF/
      - copied from r437231, geronimo/server/trunk/configs/jsp-examples-tomcat/src/conf/
    geronimo/server/trunk/configs/ldap-demo-jetty/src/main/
    geronimo/server/trunk/configs/ldap-demo-jetty/src/main/resources/
    geronimo/server/trunk/configs/ldap-demo-jetty/src/main/resources/META-INF/
      - copied from r437231, geronimo/server/trunk/configs/ldap-demo-jetty/src/conf/
    geronimo/server/trunk/configs/ldap-demo-tomcat/src/main/
    geronimo/server/trunk/configs/ldap-demo-tomcat/src/main/resources/
    geronimo/server/trunk/configs/ldap-demo-tomcat/src/main/resources/META-INF/
      - copied from r437231, geronimo/server/trunk/configs/ldap-demo-tomcat/src/conf/
    geronimo/server/trunk/configs/ldap-realm/src/main/
    geronimo/server/trunk/configs/ldap-realm/src/main/resources/
    geronimo/server/trunk/configs/ldap-realm/src/main/resources/META-INF/
      - copied from r437231, geronimo/server/trunk/configs/ldap-realm/src/conf/
    geronimo/server/trunk/configs/servlet-examples-jetty/src/main/
    geronimo/server/trunk/configs/servlet-examples-jetty/src/main/resources/
    geronimo/server/trunk/configs/servlet-examples-jetty/src/main/resources/META-INF/
      - copied from r437241, geronimo/server/trunk/configs/servlet-examples-jetty/src/conf/
    geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/
    geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/resources/
    geronimo/server/trunk/configs/servlet-examples-tomcat/src/main/resources/META-INF/
      - copied from r437241, geronimo/server/trunk/configs/servlet-examples-tomcat/src/conf/
    geronimo/server/trunk/configs/welcome-jetty/src/main/
    geronimo/server/trunk/configs/welcome-jetty/src/main/resources/
    geronimo/server/trunk/configs/welcome-jetty/src/main/resources/META-INF/
      - copied from r437231, geronimo/server/trunk/configs/welcome-jetty/src/conf/
    geronimo/server/trunk/configs/welcome-tomcat/src/main/
    geronimo/server/trunk/configs/welcome-tomcat/src/main/resources/
    geronimo/server/trunk/configs/welcome-tomcat/src/main/resources/META-INF/
      - copied from r437231, geronimo/server/trunk/configs/welcome-tomcat/src/conf/
Removed:
    geronimo/server/trunk/configs/console-jetty/src/conf/
    geronimo/server/trunk/configs/console-tomcat/src/conf/
    geronimo/server/trunk/configs/directory/src/conf/
    geronimo/server/trunk/configs/jsp-examples-jetty/src/conf/
    geronimo/server/trunk/configs/jsp-examples-tomcat/src/conf/
    geronimo/server/trunk/configs/ldap-demo-jetty/src/conf/
    geronimo/server/trunk/configs/ldap-demo-tomcat/src/conf/
    geronimo/server/trunk/configs/ldap-realm/src/conf/
    geronimo/server/trunk/configs/servlet-examples-jetty/src/conf/
    geronimo/server/trunk/configs/servlet-examples-tomcat/src/conf/
    geronimo/server/trunk/configs/welcome-jetty/src/conf/
    geronimo/server/trunk/configs/welcome-tomcat/src/conf/
Modified:
    geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/trunk/configs/client-security/pom.xml
    geronimo/server/trunk/configs/client-system/pom.xml
    geronimo/server/trunk/configs/console-jetty/pom.xml
    geronimo/server/trunk/configs/console-tomcat/pom.xml
    geronimo/server/trunk/configs/directory/pom.xml
    geronimo/server/trunk/configs/j2ee-corba/pom.xml
    geronimo/server/trunk/configs/j2ee-deployer/pom.xml
    geronimo/server/trunk/configs/j2ee-security/pom.xml
    geronimo/server/trunk/configs/j2ee-server/pom.xml
    geronimo/server/trunk/configs/j2ee-system/pom.xml
    geronimo/server/trunk/configs/javamail/pom.xml
    geronimo/server/trunk/configs/jetty-deployer/pom.xml
    geronimo/server/trunk/configs/jetty/pom.xml
    geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml
    geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml
    geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml
    geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml
    geronimo/server/trunk/configs/ldap-realm/pom.xml
    geronimo/server/trunk/configs/online-deployer/pom.xml
    geronimo/server/trunk/configs/openejb-deployer/pom.xml
    geronimo/server/trunk/configs/openejb/pom.xml
    geronimo/server/trunk/configs/rmi-naming/pom.xml
    geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml
    geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml
    geronimo/server/trunk/configs/sharedlib/pom.xml
    geronimo/server/trunk/configs/shutdown/pom.xml
    geronimo/server/trunk/configs/system-database/pom.xml
    geronimo/server/trunk/configs/tomcat-deployer/pom.xml
    geronimo/server/trunk/configs/tomcat/pom.xml
    geronimo/server/trunk/configs/uddi-jetty/pom.xml
    geronimo/server/trunk/configs/uddi-tomcat/pom.xml
    geronimo/server/trunk/configs/unavailable-client-deployer/pom.xml
    geronimo/server/trunk/configs/unavailable-ejb-deployer/pom.xml
    geronimo/server/trunk/configs/unavailable-webservices-deployer/pom.xml
    geronimo/server/trunk/configs/upgrade-cli/pom.xml
    geronimo/server/trunk/configs/upgrade/pom.xml
    geronimo/server/trunk/configs/welcome-jetty/pom.xml
    geronimo/server/trunk/configs/welcome-tomcat/pom.xml
    geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml Sat Aug 26
16:37:20 2006
@@ -143,18 +143,6 @@
     </dependencies>
     
     <build>
-        <!--
-        
-        FIXME:
-        
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/conf</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        -->
-        
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml Sat Aug 26 16:37:20
2006
@@ -37,12 +37,6 @@
     </description>
     
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-            </resource>
-        </resources>
-        
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Sat Aug 26 16:37:20
2006
@@ -37,12 +37,6 @@
     </description>
     
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-            </resource>
-        </resources>
-        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>

Modified: geronimo/server/trunk/configs/client-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-security/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/client-security/pom.xml (original)
+++ geronimo/server/trunk/configs/client-security/pom.xml Sat Aug 26 16:37:20 2006
@@ -33,6 +33,7 @@
     <packaging>car</packaging>
     
     <dependencies>
+        
         <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -70,6 +71,7 @@
             <version>${pom.version}</version>
         </dependency>
         -->
+        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-system/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/configs/client-system/pom.xml Sat Aug 26 16:37:20 2006
@@ -54,12 +54,6 @@
     </dependencies>
     
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-            </resource>
-        </resources>
-        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>

Modified: geronimo/server/trunk/configs/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/console-jetty/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/console-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/console-jetty/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
 
     <dependencies>
 
-        <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
@@ -159,11 +158,7 @@
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/conf</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>geronimo-plugin.xml</include>
-                </includes>
+                <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>

Modified: geronimo/server/trunk/configs/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/console-tomcat/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/console-tomcat/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
 
     <dependencies>
         
-        <!-- parent configs -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
@@ -159,11 +158,7 @@
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/conf</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>geronimo-plugin.xml</include>
-                </includes>
+                <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>

Modified: geronimo/server/trunk/configs/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/directory/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/directory/pom.xml (original)
+++ geronimo/server/trunk/configs/directory/pom.xml Sat Aug 26 16:37:20 2006
@@ -33,7 +33,7 @@
     <packaging>car</packaging>
     
     <dependencies>
-        <!-- parent -->
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
@@ -46,16 +46,13 @@
             <artifactId>geronimo-directory</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        
     </dependencies>
     
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/conf</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>geronimo-plugin.xml</include>
-                </includes>
+                <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>

Modified: geronimo/server/trunk/configs/j2ee-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-corba/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-corba/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-corba/pom.xml Sat Aug 26 16:37:20 2006
@@ -33,7 +33,7 @@
     <packaging>car</packaging>
 
     <dependencies>
-        <!-- parent config -->
+    
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
@@ -54,6 +54,7 @@
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
+        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/configs/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/pom.xml Sat Aug 26 16:37:20 2006
@@ -115,6 +115,7 @@
             <artifactId>geronimo-security</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-security/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-security/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-security/pom.xml Sat Aug 26 16:37:20 2006
@@ -81,6 +81,7 @@
             <artifactId>geronimo-util</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/configs/j2ee-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-server/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-server/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-server/pom.xml Sat Aug 26 16:37:20 2006
@@ -33,7 +33,7 @@
     <packaging>car</packaging>
     
     <dependencies>
-        <!-- parent config -->
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>

Modified: geronimo/server/trunk/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-system/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-system/pom.xml Sat Aug 26 16:37:20 2006
@@ -51,12 +51,6 @@
     </dependencies>
     
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-            </resource>
-        </resources>
-        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>

Modified: geronimo/server/trunk/configs/javamail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/javamail/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/javamail/pom.xml (original)
+++ geronimo/server/trunk/configs/javamail/pom.xml Sat Aug 26 16:37:20 2006
@@ -33,7 +33,7 @@
     <packaging>car</packaging>
     
     <dependencies>
-        <!-- parent -->
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>
@@ -52,6 +52,7 @@
             <artifactId>geronimo-mail</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/configs/jetty-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty-deployer/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jetty-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty-deployer/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
         
-        <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>

Modified: geronimo/server/trunk/configs/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
         
-        <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>

Modified: geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
 
     <dependencies>
         
-        <!-- to enforce build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty</artifactId>
@@ -55,11 +54,7 @@
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/conf</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>geronimo-plugin.xml</include>
-                </includes>
+                <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>

Modified: geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
         
-        <!-- To enforce build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat-deployer</artifactId>
@@ -55,11 +54,7 @@
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/conf</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>geronimo-plugin.xml</include>
-                </includes>
+                <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>

Modified: geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
         
-        <!-- to enforce build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty</artifactId>
@@ -55,11 +54,7 @@
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/conf</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>geronimo-plugin.xml</include>
-                </includes>
+                <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>

Modified: geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml Sat Aug 26 16:37:20 2006
@@ -35,7 +35,6 @@
     <dependencies>
         
         <dependency>
-            <!-- To enforce build order -->
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat-deployer</artifactId>
             <version>${pom.version}</version>
@@ -48,18 +47,14 @@
             <artifactId>geronimo-ldap-demo</artifactId>
             <version>${pom.version}</version>
             <type>war</type>
-            
         </dependency>
+        
     </dependencies>
     
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/conf</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>geronimo-plugin.xml</include>
-                </includes>
+                <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>

Modified: geronimo/server/trunk/configs/ldap-realm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-realm/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/ldap-realm/pom.xml (original)
+++ geronimo/server/trunk/configs/ldap-realm/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
         
-        <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
@@ -54,11 +53,7 @@
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/conf</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>geronimo-plugin.xml</include>
-                </includes>
+                <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>

Modified: geronimo/server/trunk/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/online-deployer/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/online-deployer/pom.xml Sat Aug 26 16:37:20 2006
@@ -33,12 +33,6 @@
     <packaging>car</packaging>
     
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-            </resource>
-        </resources>
-        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>

Modified: geronimo/server/trunk/configs/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-deployer/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/openejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb-deployer/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
     
-        <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>

Modified: geronimo/server/trunk/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/openejb/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
     
-        <!-- parents -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>

Modified: geronimo/server/trunk/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/rmi-naming/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/configs/rmi-naming/pom.xml Sat Aug 26 16:37:20 2006
@@ -35,7 +35,6 @@
     
     <dependencies>
         
-        <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-system</artifactId>

Modified: geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/servlet-examples-jetty/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
         
-        <!-- to enforce build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty</artifactId>
@@ -55,11 +54,7 @@
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/conf</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>geronimo-plugin.xml</include>
-                </includes>
+                <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>

Modified: geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/servlet-examples-tomcat/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
     
-        <!-- To enforce build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat-deployer</artifactId>
@@ -55,11 +54,7 @@
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/conf</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>geronimo-plugin.xml</include>
-                </includes>
+                <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>

Modified: geronimo/server/trunk/configs/sharedlib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/sharedlib/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/sharedlib/pom.xml (original)
+++ geronimo/server/trunk/configs/sharedlib/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
         
-        <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>

Modified: geronimo/server/trunk/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/shutdown/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/shutdown/pom.xml (original)
+++ geronimo/server/trunk/configs/shutdown/pom.xml Sat Aug 26 16:37:20 2006
@@ -33,12 +33,6 @@
     <packaging>car</packaging>
     
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-            </resource>
-        </resources>
-        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.plugins</groupId>

Modified: geronimo/server/trunk/configs/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/system-database/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/system-database/pom.xml (original)
+++ geronimo/server/trunk/configs/system-database/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
         
-        <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>

Modified: geronimo/server/trunk/configs/tomcat-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat-deployer/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/tomcat-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat-deployer/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
         
-        <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>

Modified: geronimo/server/trunk/configs/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
         
-        <!-- parent -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>rmi-naming</artifactId>
@@ -53,7 +52,8 @@
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices</artifactId>
             <version>${pom.version}</version>
-        </dependency> -->
+        </dependency>
+        -->
         
     </dependencies>
 

Modified: geronimo/server/trunk/configs/uddi-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/uddi-jetty/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/uddi-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/uddi-jetty/pom.xml Sat Aug 26 16:37:20 2006
@@ -40,6 +40,7 @@
     </properties>
 
     <dependencies>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
@@ -75,6 +76,7 @@
             <groupId>scout</groupId>
             <artifactId>scout</artifactId>
         </dependency>
+        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/configs/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/uddi-tomcat/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/uddi-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/uddi-tomcat/pom.xml Sat Aug 26 16:37:20 2006
@@ -40,6 +40,7 @@
     </properties>
 
     <dependencies>
+        
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
@@ -80,6 +81,7 @@
             <groupId>scout</groupId>
             <artifactId>scout</artifactId>
         </dependency>
+        
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/configs/unavailable-client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/unavailable-client-deployer/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/unavailable-client-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/unavailable-client-deployer/pom.xml Sat Aug 26 16:37:20
2006
@@ -34,7 +34,6 @@
     
     <dependencies>
         
-        <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>

Modified: geronimo/server/trunk/configs/unavailable-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/unavailable-ejb-deployer/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/unavailable-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/unavailable-ejb-deployer/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
         
-        <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>

Modified: geronimo/server/trunk/configs/unavailable-webservices-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/unavailable-webservices-deployer/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/unavailable-webservices-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/unavailable-webservices-deployer/pom.xml Sat Aug 26 16:37:20
2006
@@ -34,7 +34,6 @@
     
     <dependencies>
         
-        <!-- parent config -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>

Modified: geronimo/server/trunk/configs/upgrade-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/upgrade-cli/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/upgrade-cli/pom.xml (original)
+++ geronimo/server/trunk/configs/upgrade-cli/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
         
-        <!-- needed to enforce build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>

Modified: geronimo/server/trunk/configs/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/upgrade/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/upgrade/pom.xml (original)
+++ geronimo/server/trunk/configs/upgrade/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
         
-        <!-- needed to enforce build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>

Modified: geronimo/server/trunk/configs/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-jetty/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/welcome-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/welcome-jetty/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
         
-        <!-- to enforce build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty</artifactId>
@@ -55,11 +54,7 @@
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/conf</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>geronimo-plugin.xml</include>
-                </includes>
+                <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>

Modified: geronimo/server/trunk/configs/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/welcome-tomcat/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/configs/welcome-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/welcome-tomcat/pom.xml Sat Aug 26 16:37:20 2006
@@ -34,7 +34,6 @@
     
     <dependencies>
         
-        <!-- to enforce build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat-deployer</artifactId>
@@ -55,11 +54,7 @@
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/conf</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>geronimo-plugin.xml</include>
-                </includes>
+                <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>

Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml?rev=437247&r1=437246&r2=437247&view=diff
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml Sat Aug 26 16:37:20 2006
@@ -128,15 +128,6 @@
     </dependencies>
     
     <build>
-        <!-- FIXME: Remove when the default is to use the m2 standard layout -->
-        <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
-        
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-            </resource>
-        </resources>
-        
         <plugins>
             <plugin>
                 <artifactId>maven-plugin-plugin</artifactId>



Mime
View raw message