geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r417903 [2/2] - in /geronimo/trunk: ./ applications/ applications/console/ applications/console/console-core/ applications/console/console-ear/ applications/console/console-framework/ applications/console/console-standard/ applications/demo...
Date Wed, 28 Jun 2006 23:39:46 GMT
Modified: geronimo/trunk/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-system/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-system/pom.xml (original)
+++ geronimo/trunk/configs/j2ee-system/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +16,21 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>j2ee-system</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>System Configuration for the J2EE Server</name>
+    
     <build>
         <plugins>
             <plugin>
@@ -40,21 +42,21 @@
                     <!-- uses default DeploymentConfig=geronimo-gbean-deployer -->
                     <!-- written to Manifest.mf -->
                     <classPath>\
-    ../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar \
-    ../lib/geronimo-common-${geronimoVersion}.jar \
-    ../lib/geronimo-kernel-${geronimoVersion}.jar \
-    ../lib/geronimo-system-${geronimoVersion}.jar \
-    ../lib/geronimo-util-${geronimoVersion}.jar \
-    ../lib/cglib-nodep-${cglibVersion}.jar \
-    ../lib/commons-cli-${commonsCliVersion}.jar \
-    ../lib/commons-logging-${commonsLoggingVersion}.jar \
-    ../lib/log4j-${log4jVersion}.jar \
-    ../lib/mx4j-${mx4jVersion}.jar \
-    ../lib/mx4j-remote-${mx4jVersion}.jar \
-    ../lib/endorsed/xercesImpl-${xercesVersion}.jar \
-    ../lib/endorsed/xmlParserAPIs-${xmlParserApisVersion}.jar \
-    ../lib/xpp3-${xpp3Version}.jar \
-    ../lib/xstream-${xstreamVersion}.jar</classPath>
+                        ../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar \
+                        ../lib/geronimo-common-${geronimoVersion}.jar \
+                        ../lib/geronimo-kernel-${geronimoVersion}.jar \
+                        ../lib/geronimo-system-${geronimoVersion}.jar \
+                        ../lib/geronimo-util-${geronimoVersion}.jar \
+                        ../lib/cglib-nodep-${cglibVersion}.jar \
+                        ../lib/commons-cli-${commonsCliVersion}.jar \
+                        ../lib/commons-logging-${commonsLoggingVersion}.jar \
+                        ../lib/log4j-${log4jVersion}.jar \
+                        ../lib/mx4j-${mx4jVersion}.jar \
+                        ../lib/mx4j-remote-${mx4jVersion}.jar \
+                        ../lib/endorsed/xercesImpl-${xercesVersion}.jar \
+                        ../lib/endorsed/xmlParserAPIs-${xmlParserApisVersion}.jar \
+                        ../lib/xpp3-${xpp3Version}.jar \
+                        ../lib/xstream-${xstreamVersion}.jar</classPath>
                      <mainClass>org.apache.geronimo.system.main.Daemon</mainClass>
                      <logLevel>DEBUG</logLevel>
                      <!-- default endorsedDirs and extensionDirs -->

Modified: geronimo/trunk/configs/javamail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/javamail/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/javamail/pom.xml (original)
+++ geronimo/trunk/configs/javamail/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,16 +16,18 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>javamail</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>Security Configuration for the J2EE server</name>
 

Modified: geronimo/trunk/configs/jetty-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jetty-deployer/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/pom.xml (original)
+++ geronimo/trunk/configs/jetty-deployer/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,10 +24,10 @@
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jetty-deployer</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>Jetty Deployer Configuration for performing J2EE deployments</name>
 

Modified: geronimo/trunk/configs/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jetty/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty/pom.xml (original)
+++ geronimo/trunk/configs/jetty/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,11 +24,11 @@
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jetty</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>Jetty Configuration for the J2EE Server</name>
 

Modified: geronimo/trunk/configs/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jsp-examples-jetty/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-jetty/pom.xml (original)
+++ geronimo/trunk/configs/jsp-examples-jetty/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,11 +24,11 @@
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jsp-examples-jetty</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>JSP Examples Jetty</name>
 
@@ -41,7 +41,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
-<moduleFile>${settings.localRepository}/geronimo-samples/geronimo-jsp-examples-tomcat/${tomcatVersion}/geronimo-jsp-examples-tomcat-${tomcatVersion}.war</moduleFile>
+                    <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-jsp-examples-tomcat/${tomcatVersion}/geronimo-jsp-examples-tomcat-${tomcatVersion}.war</moduleFile>
                 </configuration>
             </plugin>
         </plugins>
@@ -50,6 +50,7 @@
     <!-- ============ -->
     <!-- Dependencies -->
     <!-- ============ -->
+    
     <dependencies>
         <!-- to enforce build order --> 
         <dependency>

Modified: geronimo/trunk/configs/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jsp-examples-tomcat/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/trunk/configs/jsp-examples-tomcat/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,11 +24,11 @@
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jsp-examples-tomcat</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>JSP Examples Tomcat</name>
 
@@ -41,7 +41,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
-<moduleFile>${settings.localRepository}/geronimo-samples/geronimo-jsp-examples-tomcat/${tomcatVersion}/geronimo-jsp-examples-tomcat-${tomcatVersion}.war</moduleFile>
+                    <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-jsp-examples-tomcat/${tomcatVersion}/geronimo-jsp-examples-tomcat-${tomcatVersion}.war</moduleFile>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/trunk/configs/ldap-demo-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/ldap-demo-jetty/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-jetty/pom.xml (original)
+++ geronimo/trunk/configs/ldap-demo-jetty/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,11 +24,11 @@
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>ldap-demo-jetty</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>LDAP Demo for Jetty</name>
 
@@ -41,7 +41,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
-<moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-ldap-demo/${geronimoVersion}/geronimo-ldap-demo-${geronimoVersion}.war</moduleFile>
+                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-ldap-demo/${geronimoVersion}/geronimo-ldap-demo-${geronimoVersion}.war</moduleFile>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/trunk/configs/ldap-demo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/ldap-demo-tomcat/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-demo-tomcat/pom.xml (original)
+++ geronimo/trunk/configs/ldap-demo-tomcat/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,11 +24,11 @@
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>ldap-demo-tomcat</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>LDAP Demo for Tomcat</name>
 
@@ -41,7 +41,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
-<moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-ldap-demo/${geronimoVersion}/geronimo-ldap-demo-${geronimoVersion}.war</moduleFile>
+                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-ldap-demo/${geronimoVersion}/geronimo-ldap-demo-${geronimoVersion}.war</moduleFile>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/trunk/configs/ldap-realm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/ldap-realm/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/ldap-realm/pom.xml (original)
+++ geronimo/trunk/configs/ldap-realm/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +16,21 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>ldap-realm</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>LDAP Security Realm</name>
+    
     <build>
         <plugins>
             <plugin>

Modified: geronimo/trunk/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/online-deployer/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/online-deployer/pom.xml (original)
+++ geronimo/trunk/configs/online-deployer/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,19 +16,22 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>online-deployer</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>Online Deployer Configuration</name>
     <!-- This is deployer.jar -->
+    
     <build>
         <plugins>
             <plugin>                
@@ -40,21 +42,21 @@
                     <!-- uses default DeploymentConfig=geronimo-gbean-deployer -->
                     <!-- written to Manifest.mf -->
                     <classPath>../lib/geronimo-deployment-${geronimoVersion}.jar \
-    ../lib/xpp3-${xpp3_version}.jar \
-    ../lib/xstream-${xstream_version}.jar \
-    ../lib/geronimo-deploy-jsr88-${geronimoVersion}.jar \
-    ../lib/geronimo-deploy-tool-${geronimoVersion}.jar \
-    ../lib/geronimo-j2ee-deployment_${geronimoSpecJ2eeDeploymentVersion}_spec.jar \
-    ../lib/geronimo-common-${geronimoVersion}.jar \
-    ../lib/geronimo-kernel-${geronimoVersion}.jar \
-    ../lib/geronimo-system-${geronimoVersion}.jar \
-    ../lib/geronimo-util-${geronimoVersion}.jar \
-    ../lib/cglib-nodep-${cglibVersion}.jar \
-    ../lib/commons-cli-${commonsCliVersion}.jar \
-    ../lib/commons-logging-${commonsLoggingVersion}.jar \
-    ../lib/log4j-${log4jVersion}.jar \
-    ../lib/mx4j-${mx4jVersion}.jar \
-    ../lib/mx4j-remote-${mx4jVersion}.jar</classPath>
+                        ../lib/xpp3-${xpp3_version}.jar \
+                        ../lib/xstream-${xstream_version}.jar \
+                        ../lib/geronimo-deploy-jsr88-${geronimoVersion}.jar \
+                        ../lib/geronimo-deploy-tool-${geronimoVersion}.jar \
+                        ../lib/geronimo-j2ee-deployment_${geronimoSpecJ2eeDeploymentVersion}_spec.jar \
+                        ../lib/geronimo-common-${geronimoVersion}.jar \
+                        ../lib/geronimo-kernel-${geronimoVersion}.jar \
+                        ../lib/geronimo-system-${geronimoVersion}.jar \
+                        ../lib/geronimo-util-${geronimoVersion}.jar \
+                        ../lib/cglib-nodep-${cglibVersion}.jar \
+                        ../lib/commons-cli-${commonsCliVersion}.jar \
+                        ../lib/commons-logging-${commonsLoggingVersion}.jar \
+                        ../lib/log4j-${log4jVersion}.jar \
+                        ../lib/mx4j-${mx4jVersion}.jar \
+                        ../lib/mx4j-remote-${mx4jVersion}.jar</classPath>
                      <mainClass>org.apache.geronimo.deployment.cli.DeployTool</mainClass>
                 </configuration>
             </plugin>

Modified: geronimo/trunk/configs/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/openejb-deployer/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb-deployer/pom.xml (original)
+++ geronimo/trunk/configs/openejb-deployer/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +16,22 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+    
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>openejb-deployer</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>openejb Configuration for performing J2EE deployments</name>
+    
     <build>
         <plugins>
             <plugin>

Modified: geronimo/trunk/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/openejb/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/openejb/pom.xml (original)
+++ geronimo/trunk/configs/openejb/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,11 +24,11 @@
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>openejb</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>openejb Configuration for the J2EE Server</name>
 
@@ -40,6 +40,7 @@
         <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
         <PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
     </properties>
+    
     <build>
         <plugins>
             <plugin>

Modified: geronimo/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/pom.xml (original)
+++ geronimo/trunk/configs/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  
     Copyright 2006 The Apache Software Foundation
     
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,119 +18,121 @@
 <!-- $Rev$ $Date$ -->
 
 <project>
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo-parent</artifactId>
-    <version>1.2-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.geronimo.configs</groupId>
-  <artifactId>configs-parent</artifactId>
-  <version>1.2-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>Geronimo Configs</name>
-  <description>Geronimo Configs</description>
-
-  <properties>
-      <pom.currentVersion>${pom.version}</pom.currentVersion>
-      <!-- add from etc/explicit_version.properties here to use filter-->
-      <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
-      <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
-      <clientDeployer>org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car</clientDeployer>
-      <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car</openejbDeployer>
-      <axisDeployer>org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</axisDeployer> 
-      <tomcatDeployer>org.apache.geronimo.configs/tomcat-deployer/${geronimoVersion}/car</tomcatDeployer>
-
-<j2eeTomcatServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/tomcat-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</j2eeTomcatServer>
-<j2eeJettyServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/jetty-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</j2eeJettyServer>
-<!-- no web deployer -->
-<j2eeNowebServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</j2eeNowebServer>
-  </properties>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>geronimo-packaging-plugin</artifactId>
-                <version>${geronimoPackagingPluginVersion}</version>
-            </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-<!--          <module>activemq</module>
-          <module>activemq-broker</module> -->
-          <module>axis</module>
-          <module>axis-deployer</module>
-          <module>client</module>
-          <module>client-corba</module>
-          <module>client-deployer</module>
-          <module>client-security</module>
-          <module>client-system</module>
-<!--          <module>console-jetty</module>
-          <module>console-tomcat</module> -->
-<!--          <module>daytrader-jetty</module>
-          <module>daytrader-tomcat</module> -->
-          <module>directory</module>
-          <module>geronimo-gbean-deployer</module>
-          <module>hot-deployer</module>
-          <module>j2ee-corba</module>
-          <module>j2ee-deployer</module>
-          <module>j2ee-security</module>
-          <module>j2ee-server</module>
-          <module>j2ee-system</module>
-          <module>javamail</module>
-          <module>jetty</module>
-          <module>jetty-deployer</module>
-          <module>jsp-examples-jetty</module>
-          <module>jsp-examples-tomcat</module>
-          <module>ldap-demo-jetty</module>
-          <module>ldap-demo-tomcat</module>
-          <module>ldap-realm</module>
-          <module>online-deployer</module>
-          <module>openejb</module>
-          <module>openejb-deployer</module>
-<!--          <module>remote-deploy-jetty</module>
-          <module>remote-deploy-tomcat</module> -->
-          <module>rmi-naming</module>
-          <module>servlets-examples-jetty</module>
-          <module>servlets-examples-tomcat</module>
-          <module>sharedlib</module>
-          <module>shutdown</module>
-          <module>system-database</module>
-          <module>tomcat</module>
-          <module>tomcat-deployer</module>          
-<!--          <module>uddi-jetty</module>
-          <module>uddi-tomcat</module> -->
-          <module>unavailable-client-deployer</module>
-          <module>unavailable-ejb-deployer</module>
-          <module>unavailable-webservices-deployer</module>
-          <module>upgrade</module>
-          <module>upgrade-cli</module>
-          <module>welcome-jetty</module>
-          <module>welcome-tomcat</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>singlemodule</id>
-      <activation>
-        <property>
-          <name>module</name>
-        </property>
-      </activation>
-      <modules>
-         <module>${module}</module>
-      </modules>
-    </profile>
-  </profiles>
+    <parent>
+        <groupId>org.apache.geronimo</groupId>
+        <artifactId>geronimo-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>configs-parent</artifactId>
+    <packaging>pom</packaging>
+    <name>Geronimo Configs</name>
+    <description>Geronimo Configs</description>
+
+    <properties>
+        <pom.currentVersion>${pom.version}</pom.currentVersion>
+        
+        <!-- add from etc/explicit_version.properties here to use filter-->
+        <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
+        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
+        <clientDeployer>org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car</clientDeployer>
+        <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car</openejbDeployer>
+        <axisDeployer>org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</axisDeployer>
+        <tomcatDeployer>org.apache.geronimo.configs/tomcat-deployer/${geronimoVersion}/car</tomcatDeployer>
+
+        <j2eeTomcatServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/tomcat-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</j2eeTomcatServer>
+        <j2eeJettyServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/jetty-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</j2eeJettyServer>
+        <!-- no web deployer -->
+        <j2eeNowebServer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car,org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</j2eeNowebServer>
+    </properties>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.geronimo.plugins</groupId>
+                    <artifactId>geronimo-packaging-plugin</artifactId>
+                    <version>${geronimoPackagingPluginVersion}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <!-- <module>activemq</module> -->
+                <!-- <module>activemq-broker</module> -->
+                <module>axis</module>
+                <module>axis-deployer</module>
+                <module>client</module>
+                <module>client-corba</module>
+                <module>client-deployer</module>
+                <module>client-security</module>
+                <module>client-system</module>
+                <!-- <module>console-jetty</module> -->
+                <!-- <module>console-tomcat</module> -->
+                <!-- <module>daytrader-jetty</module> -->
+                <!-- <module>daytrader-tomcat</module> -->
+                <module>directory</module>
+                <module>geronimo-gbean-deployer</module>
+                <module>hot-deployer</module>
+                <module>j2ee-corba</module>
+                <module>j2ee-deployer</module>
+                <module>j2ee-security</module>
+                <module>j2ee-server</module>
+                <module>j2ee-system</module>
+                <module>javamail</module>
+                <module>jetty</module>
+                <module>jetty-deployer</module>
+                <module>jsp-examples-jetty</module>
+                <module>jsp-examples-tomcat</module>
+                <module>ldap-demo-jetty</module>
+                <module>ldap-demo-tomcat</module>
+                <module>ldap-realm</module>
+                <module>online-deployer</module>
+                <module>openejb</module>
+                <module>openejb-deployer</module>
+                <!-- <module>remote-deploy-jetty</module> -->
+                <!-- <module>remote-deploy-tomcat</module> -->
+                <module>rmi-naming</module>
+                <module>servlets-examples-jetty</module>
+                <module>servlets-examples-tomcat</module>
+                <module>sharedlib</module>
+                <module>shutdown</module>
+                <module>system-database</module>
+                <module>tomcat</module>
+                <module>tomcat-deployer</module>
+                <!-- <module>uddi-jetty</module> -->
+                <!-- <module>uddi-tomcat</module> -->
+                <module>unavailable-client-deployer</module>
+                <module>unavailable-ejb-deployer</module>
+                <module>unavailable-webservices-deployer</module>
+                <module>upgrade</module>
+                <module>upgrade-cli</module>
+                <module>welcome-jetty</module>
+                <module>welcome-tomcat</module>
+            </modules>
+        </profile>
+        
+        <profile>
+            <id>singlemodule</id>
+            <activation>
+                <property>
+                    <name>module</name>
+                </property>
+            </activation>
+            <modules>
+                <module>${module}</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/trunk/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/rmi-naming/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/rmi-naming/pom.xml (original)
+++ geronimo/trunk/configs/rmi-naming/pom.xml Wed Jun 28 16:39:43 2006
@@ -17,22 +17,26 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>rmi-naming</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>RMI Naming configuration</name>
+    
     <properties>
         <PlanServerHostname>localhost</PlanServerHostname>
         <PlanNamingPort>1099</PlanNamingPort>
     </properties>
+    
     <build>
         <plugins>
             <!-- This plugin needed to support package type car -->

Modified: geronimo/trunk/configs/servlets-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/servlets-examples-jetty/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-jetty/pom.xml (original)
+++ geronimo/trunk/configs/servlets-examples-jetty/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,11 +24,11 @@
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>servlet-examples-jetty</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>Servlet Examples for Jetty</name>
 
@@ -41,7 +41,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
-<moduleFile>${settings.localRepository}/geronimo-samples/geronimo-servlet-examples-tomcat/${tomcatVersion}/geronimo-servlet-examples-tomcat-${tomcatVersion}.war</moduleFile>
+                    <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-servlet-examples-tomcat/${tomcatVersion}/geronimo-servlet-examples-tomcat-${tomcatVersion}.war</moduleFile>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/trunk/configs/servlets-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/servlets-examples-tomcat/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-tomcat/pom.xml (original)
+++ geronimo/trunk/configs/servlets-examples-tomcat/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,11 +24,11 @@
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>servlet-examples-tomcat</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>Servlet Examples for Tomcat</name>
 
@@ -41,7 +41,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
-<moduleFile>${settings.localRepository}/geronimo-samples/geronimo-servlet-examples-tomcat/${tomcatVersion}/geronimo-servlet-examples-tomcat-${tomcatVersion}.war</moduleFile>
+                    <moduleFile>${settings.localRepository}/geronimo-samples/geronimo-servlet-examples-tomcat/${tomcatVersion}/geronimo-servlet-examples-tomcat-${tomcatVersion}.war</moduleFile>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/trunk/configs/sharedlib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/sharedlib/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/sharedlib/pom.xml (original)
+++ geronimo/trunk/configs/sharedlib/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,16 +16,18 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>sharedlib</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>Shared Library GBean</name>
 
@@ -54,4 +55,5 @@
             <type>car</type>
         </dependency>
     </dependencies>
+    
 </project>

Modified: geronimo/trunk/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/shutdown/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/shutdown/pom.xml (original)
+++ geronimo/trunk/configs/shutdown/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +16,21 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>shutdown</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>Shutdown Configuration</name>
+    
     <build>
         <plugins>
             <plugin>                
@@ -39,24 +41,20 @@
                     <!-- uses default DeploymentConfig=geronimo-gbean-deployer -->
                     <!-- written to Manifest.mf -->
                     <classPath>../lib/geronimo-deploy-tool-${geronimoVersion}.jar \
-    ../lib/geronimo-common-${geronimoVersion}.jar \
-    ../lib/geronimo-kernel-${geronimoVersion}.jar \
-    ../lib/geronimo-system-${geronimoVersion}.jar \
-    ../lib/geronimo-util-${geronimoVersion}.jar \
-    ../lib/cglib-nodep-${cglibVersion}.jar \
-    ../lib/commons-cli-${commonsCliVersion}.jar \
-    ../lib/commons-logging-${commonsLoggingVersion}.jar \
-    ../lib/log4j-${log4jVersion}.jar \
-    ../lib/mx4j-${mx4jVersion}.jar \
-    ../lib/mx4j-remote-${mx4jVersion}.jar</classPath>
+                        ../lib/geronimo-common-${geronimoVersion}.jar \
+                        ../lib/geronimo-kernel-${geronimoVersion}.jar \
+                        ../lib/geronimo-system-${geronimoVersion}.jar \
+                        ../lib/geronimo-util-${geronimoVersion}.jar \
+                        ../lib/cglib-nodep-${cglibVersion}.jar \
+                        ../lib/commons-cli-${commonsCliVersion}.jar \
+                        ../lib/commons-logging-${commonsLoggingVersion}.jar \
+                        ../lib/log4j-${log4jVersion}.jar \
+                        ../lib/mx4j-${mx4jVersion}.jar \
+                        ../lib/mx4j-remote-${mx4jVersion}.jar</classPath>
                      <mainClass>org.apache.geronimo.deployment.cli.StopServer</mainClass>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-    <!-- none -->
 </project>

Modified: geronimo/trunk/configs/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/system-database/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/system-database/pom.xml (original)
+++ geronimo/trunk/configs/system-database/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,16 +16,19 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+    
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>system-database</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>System Database Configuration for the J2EE Server</name>
 
@@ -38,6 +40,7 @@
         <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
         <PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
     </properties>
+    
     <build>
         <plugins>
             <!-- This plugin needed to support package type car -->

Modified: geronimo/trunk/configs/tomcat-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/tomcat-deployer/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat-deployer/pom.xml (original)
+++ geronimo/trunk/configs/tomcat-deployer/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +16,21 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>tomcat-deployer</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>Tomcat Deployer Configuration for performing J2EE deployments</name>
+    
     <build>
         <plugins>
             <plugin>

Modified: geronimo/trunk/configs/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/tomcat/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat/pom.xml (original)
+++ geronimo/trunk/configs/tomcat/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,24 +16,28 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>tomcat</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>Tomcat Configuration for the J2EE Server</name>
+    
     <properties>
         <PlanHTTPPort2>8090</PlanHTTPPort2>
         <PlanHTTPSPort2>8453</PlanHTTPSPort2>
         <PlanAJPPort2>8019</PlanAJPPort2>
         <PlanServerHostname>localhost</PlanServerHostname>
     </properties>
+    
     <build>
         <plugins>
             <plugin>

Modified: geronimo/trunk/configs/unavailable-client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/unavailable-client-deployer/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/unavailable-client-deployer/pom.xml (original)
+++ geronimo/trunk/configs/unavailable-client-deployer/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +16,21 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>unavailable-client-deployer</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>Configuration for no j2ee app clients</name>
+    
     <build>
         <plugins>
             <plugin>

Modified: geronimo/trunk/configs/unavailable-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/unavailable-ejb-deployer/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/unavailable-ejb-deployer/pom.xml (original)
+++ geronimo/trunk/configs/unavailable-ejb-deployer/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +16,21 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>unavailable-ejb-deployer</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>Configuration for no EJBs</name>
+    
     <build>
         <plugins>
             <plugin>

Modified: geronimo/trunk/configs/unavailable-webservices-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/unavailable-webservices-deployer/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/unavailable-webservices-deployer/pom.xml (original)
+++ geronimo/trunk/configs/unavailable-webservices-deployer/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +16,21 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>unavailable-webservices-deployer</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>Unavailable Web Services deployer</name>
+    
     <build>
         <plugins>
             <plugin>

Modified: geronimo/trunk/configs/upgrade-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/upgrade-cli/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/upgrade-cli/pom.xml (original)
+++ geronimo/trunk/configs/upgrade-cli/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,11 +24,11 @@
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>upgrade-cli</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>System Configuration for the command line upgrade</name>
 

Modified: geronimo/trunk/configs/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/upgrade/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/upgrade/pom.xml (original)
+++ geronimo/trunk/configs/upgrade/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,11 +24,11 @@
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>upgrade</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>Geronimo Configuration for upgrading plans</name>
 

Modified: geronimo/trunk/configs/welcome-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/welcome-jetty/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-jetty/pom.xml (original)
+++ geronimo/trunk/configs/welcome-jetty/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,11 +24,11 @@
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>welcome-jetty</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>Welcome app Jetty</name>
 
@@ -41,7 +41,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <deploymentConfig>${j2eeJettyServer}</deploymentConfig>
-<moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-welcome/${geronimoVersion}/geronimo-welcome-${geronimoVersion}.war</moduleFile>
+                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-welcome/${geronimoVersion}/geronimo-welcome-${geronimoVersion}.war</moduleFile>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/trunk/configs/welcome-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/welcome-tomcat/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-tomcat/pom.xml (original)
+++ geronimo/trunk/configs/welcome-tomcat/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  
   Copyright 2006 The Apache Software Foundation
   
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
 -->
 
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,11 +24,11 @@
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>configs-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>welcome-tomcat</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>car</packaging>
     <name>Welcome app Tomcat</name>
 
@@ -41,7 +41,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
-<moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-welcome/${geronimoVersion}/geronimo-welcome-${geronimoVersion}.war</moduleFile>
+                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-welcome/${geronimoVersion}/geronimo-welcome-${geronimoVersion}.war</moduleFile>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/trunk/m2-plugins/geronimo-packaging-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-packaging-plugin/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-packaging-plugin/pom.xml (original)
+++ geronimo/trunk/m2-plugins/geronimo-packaging-plugin/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -10,7 +29,6 @@
 
     <artifactId>geronimo-packaging-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <version>${geronimoPackagingPluginVersion}</version>
     <name>Geronimo :: Maven2 Packaging Plugin</name>
     <url>http://geronimo.apache.org</url>
 

Modified: geronimo/trunk/m2-plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/pom.xml (original)
+++ geronimo/trunk/m2-plugins/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  
     Copyright 2006 The Apache Software Foundation
     
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +14,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
     
@@ -28,7 +29,6 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>plugins-parent</artifactId>
-    <version>1.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Geronimo Plugins</name>
     <description>Geronimo Plugins</description>

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     Copyright 2006 The Apache Software Foundation
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,16 +14,20 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <!-- $Rev$ $Date$ -->
+
 <project>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.apache.geronimo</groupId>
     <artifactId>geronimo-parent</artifactId>
-    <version>1.2-SNAPSHOT</version>
-    <packaging>pom</packaging>
     <name>Geronimo</name>
     <description>Geronimo parent</description>
+    
+    <version>1.2-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    
     <url>http://geronimo.apache.org</url>
 
     <issueManagement>
@@ -380,7 +383,9 @@
             <dependency>
                 <groupId>org.objectweb.howl</groupId>
                 <artifactId>howl</artifactId>
-                <version>${howlVersion}</version>
+                <version>1.0.1-1</version>
+                <type>jar</type>
+                <scope>compile</scope>
             </dependency>
 
             <dependency>



Mime
View raw message