geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r417902 - in /geronimo/trunk/modules: ./ activation/ activemq-embedded-rar/ activemq-gbean-management/ activemq-gbean/ axis-builder/ axis/ client-builder/ client/ common/ connector-builder/ connector/ converter/ core/ deploy-config/ deploy-...
Date Wed, 28 Jun 2006 23:38:45 GMT
Author: jdillon
Date: Wed Jun 28 16:38:43 2006
New Revision: 417902

URL: http://svn.apache.org/viewvc?rev=417902&view=rev
Log:
Applied GERONIMO-2157
Cleaned up pom headers
Added geronimo-interceptor depends into the m2 build


Modified:
    geronimo/trunk/modules/activation/pom.xml
    geronimo/trunk/modules/activemq-embedded-rar/pom.xml
    geronimo/trunk/modules/activemq-gbean-management/pom.xml
    geronimo/trunk/modules/activemq-gbean/pom.xml
    geronimo/trunk/modules/axis-builder/pom.xml
    geronimo/trunk/modules/axis/pom.xml
    geronimo/trunk/modules/client-builder/pom.xml
    geronimo/trunk/modules/client/pom.xml
    geronimo/trunk/modules/common/pom.xml
    geronimo/trunk/modules/connector-builder/pom.xml
    geronimo/trunk/modules/connector/pom.xml
    geronimo/trunk/modules/converter/pom.xml
    geronimo/trunk/modules/core/pom.xml
    geronimo/trunk/modules/deploy-config/pom.xml
    geronimo/trunk/modules/deploy-jsr88/pom.xml
    geronimo/trunk/modules/deploy-tool/pom.xml
    geronimo/trunk/modules/deployment/pom.xml
    geronimo/trunk/modules/derby/pom.xml
    geronimo/trunk/modules/directory/pom.xml
    geronimo/trunk/modules/hot-deploy/pom.xml
    geronimo/trunk/modules/installer-processing/pom.xml
    geronimo/trunk/modules/installer-support/pom.xml
    geronimo/trunk/modules/interceptor/pom.xml
    geronimo/trunk/modules/j2ee-builder/pom.xml
    geronimo/trunk/modules/j2ee-schema/pom.xml
    geronimo/trunk/modules/j2ee/pom.xml
    geronimo/trunk/modules/javamail-transport/pom.xml
    geronimo/trunk/modules/jetty-builder/pom.xml
    geronimo/trunk/modules/jetty/pom.xml
    geronimo/trunk/modules/jmx-remoting/pom.xml
    geronimo/trunk/modules/kernel/pom.xml
    geronimo/trunk/modules/mail/pom.xml
    geronimo/trunk/modules/management/pom.xml
    geronimo/trunk/modules/naming-builder/pom.xml
    geronimo/trunk/modules/naming/pom.xml
    geronimo/trunk/modules/pom.xml
    geronimo/trunk/modules/scripts/pom.xml
    geronimo/trunk/modules/security-builder/pom.xml
    geronimo/trunk/modules/security/pom.xml
    geronimo/trunk/modules/service-builder/pom.xml
    geronimo/trunk/modules/system/pom.xml
    geronimo/trunk/modules/test-ddbean/pom.xml
    geronimo/trunk/modules/timer/pom.xml
    geronimo/trunk/modules/tomcat-builder/pom.xml
    geronimo/trunk/modules/tomcat/pom.xml
    geronimo/trunk/modules/transaction/pom.xml
    geronimo/trunk/modules/upgrade/pom.xml
    geronimo/trunk/modules/util/pom.xml
    geronimo/trunk/modules/web-builder/pom.xml
    geronimo/trunk/modules/webservices/pom.xml

Modified: geronimo/trunk/modules/activation/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activation/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/activation/pom.xml (original)
+++ geronimo/trunk/modules/activation/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,12 +24,13 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-activation</artifactId>
     <name>Geronimo :: Activation</name>
-    <version>${geronimoVersion}</version>
     <description>Geronimo Activation implements Content Handlers for use in conjuction with the Java Activation Framework.</description>
+    
     <properties>
         <maven.test.skip>true</maven.test.skip>
     </properties>

Modified: geronimo/trunk/modules/activemq-embedded-rar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-embedded-rar/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-embedded-rar/pom.xml (original)
+++ geronimo/trunk/modules/activemq-embedded-rar/pom.xml Wed Jun 28 16:38: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");
@@ -19,50 +18,52 @@
 <!-- $Rev$ $Date$ -->
 
 <project>
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>modules-parent</artifactId>
-    <version>1.2-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>ge-activemq-rar</artifactId>
-  <version>${geronimoVersion}</version>
-  <packaging>rar</packaging>
-  <name>Geronimo :: ActiveMQ Embedded RAR</name>
-  <description>Resource Adapter configuration for using ActiveMQ as a bundled JMS provider.</description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-rar-plugin</artifactId>
-        <version>${mavenRarPluginVersion}</version>
-        <configuration>
-          <raXmlFile>${basedir}/src/rar/META-INF/ra.xml</raXmlFile>
-          <includeJar>false</includeJar>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>activemq</groupId>
-      <artifactId>activemq-core</artifactId>
-      <version>${activeMqVersion}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>activemq</groupId>
-      <artifactId>activemq-ra</artifactId>
-      <version>${activeMqVersion}</version>
-      <!--  Can't be found anywhere -->
-      <exclusions>
-        <exclusion>
-          <groupId>incubator-derby</groupId>
-          <artifactId>derby</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
+    <parent>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>ge-activemq-rar</artifactId>
+    <packaging>rar</packaging>
+    <name>Geronimo :: ActiveMQ Embedded RAR</name>
+    <description>Resource Adapter configuration for using ActiveMQ as a bundled JMS provider.</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-rar-plugin</artifactId>
+                <version>${mavenRarPluginVersion}</version>
+                <configuration>
+                    <raXmlFile>${basedir}/src/rar/META-INF/ra.xml</raXmlFile>
+                    <includeJar>false</includeJar>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <dependencies>
+        <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>${activeMqVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq-ra</artifactId>
+            <version>${activeMqVersion}</version>
+            
+            <!--  Can't be found anywhere -->
+            <exclusions>
+                <exclusion>
+                    <groupId>incubator-derby</groupId>
+                    <artifactId>derby</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
 </project>

Modified: geronimo/trunk/modules/activemq-gbean-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-gbean-management/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-gbean-management/pom.xml (original)
+++ geronimo/trunk/modules/activemq-gbean-management/pom.xml Wed Jun 28 16:38:43 2006
@@ -14,12 +14,14 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <!-- $Rev: 411333 $ $Date: 2006-06-02 18:35:57 -0500 (Fri, 02 Jun 2006) $ -->
+
 <project
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://maven.apache.org/POM/4.0.0">
-  
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://maven.apache.org/POM/4.0.0">
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -30,24 +32,25 @@
     </parent>
 
     <artifactId>geronimo-activemq-gbean-management</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: ActiveMQ :: GBean Interfaces</name>
     <description>ActiveMQ Management Interfaces used by Geronimo</description>
 
     <dependencies>
 
-      <dependency>
-          <groupId>org.apache.geronimo.modules</groupId>
-          <artifactId>geronimo-management</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>backport-util-concurrent</groupId>
-        <artifactId>backport-util-concurrent</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-      </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-management</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
 
-   </dependencies> 
+    </dependencies>
 </project>

Modified: geronimo/trunk/modules/activemq-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-gbean/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-gbean/pom.xml (original)
+++ geronimo/trunk/modules/activemq-gbean/pom.xml Wed Jun 28 16:38:43 2006
@@ -14,12 +14,14 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <!-- $Rev: 411333 $ $Date: 2006-06-02 18:35:57 -0500 (Fri, 02 Jun 2006) $ -->
+
 <project
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://maven.apache.org/POM/4.0.0">
-  
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://maven.apache.org/POM/4.0.0">
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -30,54 +32,54 @@
     </parent>
 
     <artifactId>geronimo-activemq-gbean</artifactId>
-    <version>${geronimoVersion}</version>
     <name>ActiveMQ :: GBeans</name>
     <description>Geronimo ActiveMQ Integration</description>
-      
+
     <dependencies>
 
-      <dependency>
-        <groupId>incubator-activemq</groupId>
-        <artifactId>activemq-core</artifactId>
-        <version>4.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>incubator-activemq</groupId>
-        <artifactId>activeio-core</artifactId>
-        <version>3.0-SNAPSHOT</version>
-      </dependency>  
-      
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-activemq-gbean-management</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-kernel</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-system</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-management</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee</artifactId>
-      </dependency>
-  
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-      </dependency>
-
-      <dependency>
-        <groupId>mx4j</groupId>
-        <artifactId>mx4j</artifactId>
-      </dependency>
+        <dependency>
+            <groupId>incubator-activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>4.0-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>incubator-activemq</groupId>
+            <artifactId>activeio-core</artifactId>
+            <version>3.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-activemq-gbean-management</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-management</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j</artifactId>
+        </dependency>
+
+    </dependencies>
 
-    </dependencies> 
-    
 </project>

Modified: geronimo/trunk/modules/axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis-builder/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/pom.xml (original)
+++ geronimo/trunk/modules/axis-builder/pom.xml Wed Jun 28 16:38:43 2006
@@ -23,16 +23,16 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-axis-builder</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Axis :: Builder</name>
     <description>Geronimo Axis Builder</description>
 
     <build>
         <resources>
-<!-- This schema is NOT compiled to xmlobjects.  Do not remove!  Used by SchemaInfoBuilder -->
+            <!-- This schema is NOT compiled to xmlobjects.  Do not remove!  Used by SchemaInfoBuilder -->
             <resource>
                 <directory>src/schema</directory>
                 <includes>

Modified: geronimo/trunk/modules/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/pom.xml (original)
+++ geronimo/trunk/modules/axis/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,13 +24,14 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-axis</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>jar</packaging>
     <name>Geronimo :: Axis</name>
     <description>Geronimo Axis Integration</description>
+    
     <build>
         <resources>
             <resource>
@@ -37,6 +39,7 @@
             </resource>
         </resources>
     </build>
+    
     <!-- ============ -->
     <!-- Dependencies -->
     <!-- ============ -->

Modified: geronimo/trunk/modules/client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/pom.xml (original)
+++ geronimo/trunk/modules/client-builder/pom.xml Wed Jun 28 16:38: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");
@@ -19,67 +18,71 @@
 <!-- $Rev$ $Date$ -->
 
 <project>
-  <parent>
-    <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>modules-parent</artifactId>
-    <version>1.2-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>geronimo-client-builder</artifactId>
-  <name>Geronimo :: Client Builder</name>
-  <version>${geronimoVersion}</version>
-  <description>Geronimo :: Client Builder</description>
-
-  <build>
-      <resources>
-          <resource>
-              <directory>src/resources2</directory>
-          </resource>
-      </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>xmlbeans-maven-plugin</artifactId>
-        <version>${xmlbeansMavenPluginVersion}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>xmlbeans</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <download>true</download>
-          <sourceSchemas>geronimo-application-client-1.1.xsd</sourceSchemas>
-          <schemaDirectory>src/schema</schemaDirectory>
-          <xmlConfigs>
-            <xmlConfig implementation="java.io.File">src/schema/xmlconfig.xml</xmlConfig>
-          </xmlConfigs>
-          <debug>true</debug>
-          <verbose>true</verbose>
-          <quiet>false</quiet>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>org.apache.geronimo.modules</groupId>
-      <artifactId>geronimo-client</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.geronimo.modules</groupId>
-      <artifactId>geronimo-connector-builder</artifactId>
-    </dependency>
-
-      <!-- tranql uses 1.0.3 -->
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-  </dependencies>
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <artifactId>geronimo-client-builder</artifactId>
+    <name>Geronimo :: Client Builder</name>
+    <description>Geronimo :: Client Builder</description>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/resources2</directory>
+            </resource>
+        </resources>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+                <version>${xmlbeansMavenPluginVersion}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>xmlbeans</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <download>true</download>
+                    <sourceSchemas>geronimo-application-client-1.1.xsd</sourceSchemas>
+                    <schemaDirectory>src/schema</schemaDirectory>
+                    <xmlConfigs>
+                        <xmlConfig implementation="java.io.File">src/schema/xmlconfig.xml</xmlConfig>
+                    </xmlConfigs>
+                    <debug>true</debug>
+                    <verbose>true</verbose>
+                    <quiet>false</quiet>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector-builder</artifactId>
+        </dependency>
+
+        <!-- tranql uses 1.0.3 -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        
+    </dependencies>
 </project>
 

Modified: geronimo/trunk/modules/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/client/pom.xml (original)
+++ geronimo/trunk/modules/client/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,18 +24,19 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-client</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>jar</packaging>
     <name>Geronimo :: Client</name>
 
     <!-- ============ -->
     <!-- Dependencies -->
     <!-- ============ -->
+    
     <dependencies>
-    <!--for GeronimoSecurityException-->
+        <!--for GeronimoSecurityException-->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>

Modified: geronimo/trunk/modules/common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/common/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/common/pom.xml (original)
+++ geronimo/trunk/modules/common/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-common</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Common</name>
     <description>Geronimo Common</description>
 

Modified: geronimo/trunk/modules/connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/pom.xml (original)
+++ geronimo/trunk/modules/connector-builder/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,17 +24,18 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-connector-builder</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Connector :: Builder</name>
 
     <properties>
         <maven.test.skip>true</maven.test.skip>
     </properties>
+    
     <build>
-    <!-- move this to parent pom -->
+        <!-- move this to parent pom -->
         <resources>
             <resource>
                 <directory>src/schema</directory>
@@ -99,6 +101,7 @@
     <!-- ============ -->
     <!-- Dependencies -->
     <!-- ============ -->
+    
     <dependencies>
         <dependency>
             <groupId>xmlbeans</groupId>

Modified: geronimo/trunk/modules/connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/pom.xml (original)
+++ geronimo/trunk/modules/connector/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-connector</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Connector</name>
     <description>Geronimo Connector</description>
 

Modified: geronimo/trunk/modules/converter/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/converter/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/converter/pom.xml (original)
+++ geronimo/trunk/modules/converter/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,11 +24,11 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-converter</artifactId>
     <name>Geronimo :: Configuration Converter</name>
-    <version>${geronimoVersion}</version>
 
     <dependencies>
         <dependency>

Modified: geronimo/trunk/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/core/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/core/pom.xml (original)
+++ geronimo/trunk/modules/core/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-core</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>jar</packaging>
     <name>Geronimo :: Core</name>
     <description>Geronimo Core J2EE Utilities</description>

Modified: geronimo/trunk/modules/deploy-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-config/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-config/pom.xml (original)
+++ geronimo/trunk/modules/deploy-config/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-deploy-config</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>jar</packaging>
     <name>Geronimo :: Deploy :: Common Config</name>
     <description>The deployment module contains basic infrastructure and base classes for module builders / deployers. This module contains infrastructure and base classes for JSR-88 DConfigBeans.</description>
@@ -34,6 +35,7 @@
     <!-- ============ -->
     <!-- Dependencies -->
     <!-- ============ -->
+    
     <dependencies>
         <dependency>
             <groupId>xmlbeans</groupId>

Modified: geronimo/trunk/modules/deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-jsr88/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/pom.xml (original)
+++ geronimo/trunk/modules/deploy-jsr88/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,16 +24,17 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-deploy-jsr88</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>jar</packaging>
     <name>Geronimo :: Deploy :: JSR-88</name>
 
     <!-- ============ -->
     <!-- Dependencies -->
     <!-- ============ -->
+    
     <dependencies>
         <dependency>
             <groupId>xmlbeans</groupId>

Modified: geronimo/trunk/modules/deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-tool/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-tool/pom.xml (original)
+++ geronimo/trunk/modules/deploy-tool/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,14 +24,14 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-deploy-tool</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Deploy :: CLI Tool</name>
 
     <dependencies>
-    <!-- Module Dependencies -->
+        <!-- Module Dependencies -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>

Modified: geronimo/trunk/modules/deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deployment/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/deployment/pom.xml (original)
+++ geronimo/trunk/modules/deployment/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-deployment</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>jar</packaging>
     <name>Geronimo :: Deployment</name>
     <description>Geronimo Deployment</description>
@@ -34,6 +35,7 @@
     <!-- ============ -->
     <!-- Dependencies -->
     <!-- ============ -->
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/trunk/modules/derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/derby/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/derby/pom.xml (original)
+++ geronimo/trunk/modules/derby/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,19 +24,20 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-derby</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Derby</name>
     <description>Wrapper for using Apache Derby as a bundled database.</description>
+    
     <properties>
         <maven.test.skip>true</maven.test.skip>
     </properties>
 
     <dependencies>
         <dependency>
-    <!-- this gets kernel, commons-logging -->
+            <!-- this gets kernel, commons-logging -->
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
         </dependency>

Modified: geronimo/trunk/modules/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/directory/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/directory/pom.xml (original)
+++ geronimo/trunk/modules/directory/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-directory</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Directory</name>
 
     <build>

Modified: geronimo/trunk/modules/hot-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/hot-deploy/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/hot-deploy/pom.xml (original)
+++ geronimo/trunk/modules/hot-deploy/pom.xml Wed Jun 28 16:38: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");
@@ -15,18 +14,21 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+
 <!-- $Rev$ $Date$ -->
+
 <project>
+    <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>geronimo-hot-deploy</artifactId>
     <name>Geronimo :: Deploy :: Hot Deployer</name>
-    <version>${geronimoVersion}</version>
     <description>A GBean that implements a Hot Deploy directory</description>
 
     <dependencies>

Modified: geronimo/trunk/modules/installer-processing/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/installer-processing/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/installer-processing/pom.xml (original)
+++ geronimo/trunk/modules/installer-processing/pom.xml Wed Jun 28 16:38: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");
@@ -15,18 +14,21 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <!-- $Rev$ $Date$ -->
+
 <project>
+    <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
-
-    <modelVersion>4.0.0</modelVersion>
+    
     <artifactId>geronimo-installer-processing</artifactId>
     <name>Geronimo :: Installer :: Processing</name>
-    <version>${geronimoVersion}</version>
 
     <dependencies>
         <dependency>

Modified: geronimo/trunk/modules/installer-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/installer-support/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/installer-support/pom.xml (original)
+++ geronimo/trunk/modules/installer-support/pom.xml Wed Jun 28 16:38: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");
@@ -15,18 +14,21 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <!-- $Rev$ $Date$ -->
+
 <project>
+    <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>geronimo-installer-support</artifactId>
     <name>Geronimo :: Installer :: Support</name>
-    <version>${geronimoVersion}</version>
 
     <properties>
         <izpack_version>3.8.0</izpack_version>

Modified: geronimo/trunk/modules/interceptor/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/interceptor/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/interceptor/pom.xml (original)
+++ geronimo/trunk/modules/interceptor/pom.xml Wed Jun 28 16:38: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,18 +14,26 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.geronimo</groupId>
-    <artifactId>geronimo</artifactId>
-    <version>1.1-SNAPSHOT</version>
-  </parent>
-  <groupId>org.apache.geronimo</groupId>
-  <artifactId>geronimo-interceptor</artifactId>
-  <version>${geronimoVersion}</version>
-  <packaging>jar</packaging>
-  <name>Geronimo :: Interceptor</name>
 
+<!-- $Rev: 411333 $ $Date: 2006-06-02 16:35:57 -0700 (Fri, 02 Jun 2006) $ -->
 
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>modules-parent</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <artifactId>geronimo-interceptor</artifactId>
+    <name>Geronimo :: Interceptor</name>
+    <packaging>jar</packaging>
+    
+    <build>
+        <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
+        <testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory>
+    </build>
+    
 </project>

Modified: geronimo/trunk/modules/j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee-builder/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/pom.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/pom.xml Wed Jun 28 16:38: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");
@@ -15,18 +14,21 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <!-- $Rev$ $Date$ -->
+
 <project>
+    <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>geronimo-j2ee-builder</artifactId>
     <name>Geronimo :: J2EE :: Builder</name>
-    <version>${geronimoVersion}</version>
 
     <build>
         <plugins>

Modified: geronimo/trunk/modules/j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee-schema/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/pom.xml (original)
+++ geronimo/trunk/modules/j2ee-schema/pom.xml Wed Jun 28 16:38: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");
@@ -15,18 +14,21 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <!-- $Rev$ $Date$ -->
+
 <project>
+    <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
-
-    <modelVersion>4.0.0</modelVersion>
+    
     <artifactId>geronimo-j2ee-schema</artifactId>
     <name>Geronimo :: J2EE Schema</name>
-    <version>${geronimoVersion}</version>
     <description>Geronimo J2EE schema</description>
 
     <build>

Modified: geronimo/trunk/modules/j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee/pom.xml (original)
+++ geronimo/trunk/modules/j2ee/pom.xml Wed Jun 28 16:38: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");
@@ -15,8 +14,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <!-- $Rev$ $Date$ -->
+
 <project>
+    <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
@@ -24,10 +27,8 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>geronimo-j2ee</artifactId>
     <name>Geronimo :: J2EE</name>
-    <version>${geronimoVersion}</version>
     <description>Geronimo J2EE Services</description>
 
     <build>
@@ -45,12 +46,12 @@
     <!-- ============ -->
     
     <dependencies>
-    
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>

Modified: geronimo/trunk/modules/javamail-transport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/javamail-transport/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/javamail-transport/pom.xml (original)
+++ geronimo/trunk/modules/javamail-transport/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-javamail-transport</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: JavaMail Transport</name>
     <description>Geronimo JavaMail Transport</description>
 

Modified: geronimo/trunk/modules/jetty-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty-builder/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/pom.xml (original)
+++ geronimo/trunk/modules/jetty-builder/pom.xml Wed Jun 28 16:38: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");
@@ -15,18 +14,21 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <!-- $Rev$ $Date$ -->
+
 <project>
+    <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>geronimo-jetty-builder</artifactId>
     <name>Geronimo :: Jetty :: Builder</name>
-    <version>${geronimoVersion}</version>
 
     <build>
         <plugins>

Modified: geronimo/trunk/modules/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/pom.xml (original)
+++ geronimo/trunk/modules/jetty/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-jetty</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Jetty</name>
     <description>Geronimo Jetty Integration</description>
 

Modified: geronimo/trunk/modules/jmx-remoting/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jmx-remoting/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/jmx-remoting/pom.xml (original)
+++ geronimo/trunk/modules/jmx-remoting/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,21 +24,21 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-jmx-remoting</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: JMX Remoting</name>
     <description>Provides remote access to a Geronimo server using JSR 160 JMX Remoting</description>
 
     <dependencies>
-<!-- gets mx4j transitively -->
+        <!-- gets mx4j transitively -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
         </dependency>
-
-<!-- all the specs should be added to the classpath transitively -->
+        
+        <!-- all the specs should be added to the classpath transitively -->
         <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j-remote</artifactId>

Modified: geronimo/trunk/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/kernel/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/pom.xml (original)
+++ geronimo/trunk/modules/kernel/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,14 +24,14 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-kernel</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Kernel</name>
 
     <build>
-    <!-- move this to parent pom -->
+        <!-- move this to parent pom -->
         <resources>
             <resource>
                 <directory>src/META-INF</directory>

Modified: geronimo/trunk/modules/mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/mail/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/mail/pom.xml (original)
+++ geronimo/trunk/modules/mail/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-mail</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Mail</name>
     <description>Geronimo Mail</description>
 

Modified: geronimo/trunk/modules/management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/management/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/management/pom.xml (original)
+++ geronimo/trunk/modules/management/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-management</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Management API</name>
     <description>Contains interfaces that define the management API for Geronimo</description>
 

Modified: geronimo/trunk/modules/naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/naming-builder/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/naming-builder/pom.xml (original)
+++ geronimo/trunk/modules/naming-builder/pom.xml Wed Jun 28 16:38: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");
@@ -15,18 +14,21 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <!-- $Rev$ $Date$ -->
+
 <project>
+    <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>geronimo-naming-builder</artifactId>
     <name>Geronimo :: Naming :: Builder</name>
-    <version>${geronimoVersion}</version>
     <description>Geronimo Naming Builder</description>
 
     <build>

Modified: geronimo/trunk/modules/naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/naming/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/naming/pom.xml (original)
+++ geronimo/trunk/modules/naming/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,19 +24,26 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-naming</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>jar</packaging>
     <name>Geronimo :: Naming</name>
     <description>Geronimo Naming</description>
 
     <dependencies>
-<!-- only for ComponentContextInterceptor -->
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-interceptor</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/pom.xml (original)
+++ geronimo/trunk/modules/pom.xml Wed Jun 28 16:38: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>
     
@@ -23,11 +24,11 @@
         <groupId>org.apache.geronimo</groupId>
         <artifactId>geronimo-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>modules-parent</artifactId>
-    <version>1.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Geronimo Modules</name>
     <description>Geronimo Modules</description>
@@ -59,6 +60,7 @@
                 <module>hot-deploy</module>
                 <module>installer-processing</module>
                 <!-- <module>installer-support</module> -->
+                <module>interceptor</module>
                 <module>j2ee</module>
                 <module>j2ee-builder</module>
                 <module>j2ee-schema</module>

Modified: geronimo/trunk/modules/scripts/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/scripts/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/scripts/pom.xml (original)
+++ geronimo/trunk/modules/scripts/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-scripts</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Scripts</name>
     <description>Scripts</description>
 </project>

Modified: geronimo/trunk/modules/security-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/security-builder/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/security-builder/pom.xml (original)
+++ geronimo/trunk/modules/security-builder/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-security-builder</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>jar</packaging>
     <name>Geronimo :: Security :: Builder</name>
 

Modified: geronimo/trunk/modules/security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/security/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/security/pom.xml (original)
+++ geronimo/trunk/modules/security/pom.xml Wed Jun 28 16:38: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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-security</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Security</name>
     <description>Geronimo Security</description>
 
@@ -56,22 +57,31 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-core</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-interceptor</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-
-        <!-- mx4j, cglib etc transitive deps -->
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/trunk/modules/service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/service-builder/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/pom.xml (original)
+++ geronimo/trunk/modules/service-builder/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-service-builder</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Service :: Builder</name>
 
     <build>

Modified: geronimo/trunk/modules/system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/system/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/system/pom.xml (original)
+++ geronimo/trunk/modules/system/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-system</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>jar</packaging>
     <name>Geronimo :: System</name>
 

Modified: geronimo/trunk/modules/test-ddbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/test-ddbean/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/test-ddbean/pom.xml (original)
+++ geronimo/trunk/modules/test-ddbean/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-test-ddbean</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Test :: DDBeans</name>
     <description>Geronimo Test DDBeans</description>
 

Modified: geronimo/trunk/modules/timer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/timer/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/timer/pom.xml (original)
+++ geronimo/trunk/modules/timer/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-timer</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Timer</name>
     <description>Geronimo Timer</description>
 

Modified: geronimo/trunk/modules/tomcat-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/tomcat-builder/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/pom.xml (original)
+++ geronimo/trunk/modules/tomcat-builder/pom.xml Wed Jun 28 16:38: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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-tomcat-builder</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Tomcat :: Builder</name>
     
     <properties>
@@ -36,7 +37,7 @@
     </properties>
 
     <build>
-    <!-- move this to parent pom -->
+        <!-- move this to parent pom -->
         <resources>
             <resource>
                 <directory>src/schema</directory>

Modified: geronimo/trunk/modules/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/tomcat/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/pom.xml (original)
+++ geronimo/trunk/modules/tomcat/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-tomcat</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Tomcat</name>
     <description>Geronimo Tomcat integration</description>
 

Modified: geronimo/trunk/modules/transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/transaction/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/pom.xml (original)
+++ geronimo/trunk/modules/transaction/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-transaction</artifactId>
-    <version>${geronimoVersion}</version>
     <packaging>jar</packaging>
     <name>Geronimo :: Transaction</name>
     <description>Geronimo Transaction</description>

Modified: geronimo/trunk/modules/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/upgrade/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/upgrade/pom.xml (original)
+++ geronimo/trunk/modules/upgrade/pom.xml Wed Jun 28 16:38: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");
@@ -15,22 +14,24 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <!-- $Rev$ $Date$ -->
+
 <project>
+    <modelVersion>4.0.0</modelVersion>
+    
     <parent>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>geronimo-upgrade</artifactId>
     <name>Geronimo :: Upgrade</name>
-    <version>${geronimoVersion}</version>
     <description>Geronimo Upgrade</description>
 
     <dependencies>
-
         <dependency>
             <groupId>xmlbeans</groupId>
             <artifactId>xbean</artifactId>
@@ -56,5 +57,6 @@
             <artifactId>geronimo-service-builder</artifactId>
         </dependency>
     </dependencies>
+    
 </project>
 

Modified: geronimo/trunk/modules/util/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/util/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/util/pom.xml (original)
+++ geronimo/trunk/modules/util/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-util</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Util</name>
     <description>Geronimo Util</description>
 

Modified: geronimo/trunk/modules/web-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/web-builder/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/pom.xml (original)
+++ geronimo/trunk/modules/web-builder/pom.xml Wed Jun 28 16:38: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");
@@ -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 @@
 
     <artifactId>geronimo-web-builder</artifactId>
     <name>Geronimo :: Web :: Builder</name>
-    <version>${geronimoVersion}</version>
 
     <description>Geronimo Web Container Deployer</description>
 

Modified: geronimo/trunk/modules/webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/webservices/pom.xml?rev=417902&r1=417901&r2=417902&view=diff
==============================================================================
--- geronimo/trunk/modules/webservices/pom.xml (original)
+++ geronimo/trunk/modules/webservices/pom.xml Wed Jun 28 16:38: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");
@@ -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>
 
@@ -23,10 +24,10 @@
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>modules-parent</artifactId>
         <version>1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-webservices</artifactId>
-    <version>${geronimoVersion}</version>
     <name>Geronimo :: Web Services</name>
     <description>Geronimo Web Services</description>
 
@@ -39,25 +40,35 @@
     </build>
     
     <dependencies>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-
-        <!-- cglib, commons-logging, mx4j -->
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-interceptor</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-core</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>



Mime
View raw message