Return-Path: 
 <scm-return-41175-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 10110 invoked from network); 6 Apr 2010 13:40:45 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 6 Apr 2010 13:40:45 -0000
Received: (qmail 52109 invoked by uid 500); 6 Apr 2010 13:40:45 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 52066 invoked by uid 500); 6 Apr 2010 13:40:45 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 52059 invoked by uid 99); 6 Apr 2010 13:40:45 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Apr 2010 13:40:45 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Apr 2010 13:40:36 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 2F1ED2388A2D; Tue,  6 Apr 2010 13:40:09 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r931149 [2/6] - in /geronimo/server/branches/2.1: ./
 assemblies/
 assemblies/geronimo-boilerplate-minimal/ assemblies/geronimo-framework/
 assemblies/geronimo-jetty6-javaee5/ assemblies/geronimo-jetty6-minimal/
 assemblies/geronimo-tomcat6-jav...
Date: Tue, 06 Apr 2010 13:40:02 -0000
To: scm@geronimo.apache.org
From: rwonly@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100406134011.2F1ED2388A2D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-deploy-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-deploy-config/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-deploy-config/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-deploy-config/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-deploy-config</artifactId>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml Tue Apr  6 13:39:53 2010
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You 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: 493181 $ $Date: 2007-01-06 07:32:03 +1100 (Sat, 06 Jan 2007) $ -->
-
-<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>
-
-    <parent>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
-    <name>Geronimo Framework, Modules :: Deploy JSR-88 Bootstrapper</name>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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: 493181 $ $Date: 2007-01-06 07:32:03 +1100 (Sat, 06 Jan 2007) $ -->
+
+<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>
+
+    <parent>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>modules</artifactId>
+        <version>2.1.5</version>
+    </parent>
+
+    <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
+    <name>Geronimo Framework, Modules :: Deploy JSR-88 Bootstrapper</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
+

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-deploy-jsr88/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-deploy-jsr88</artifactId>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-deploy-tool/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-deploy-tool</artifactId>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-deployment/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-deployment/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-deployment/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-deployment</artifactId>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-interceptor/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-interceptor/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-interceptor/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-interceptor/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>geronimo-interceptor</artifactId>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-j2ee/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-j2ee/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-j2ee/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-j2ee</artifactId>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-jdbc/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-jdbc/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-jdbc/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-jdbc</artifactId>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-jmx-remoting/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-jmx-remoting/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-jmx-remoting/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-jmx-remoting/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-jmx-remoting</artifactId>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-kernel/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-kernel/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-kernel</artifactId>
@@ -88,17 +88,17 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <delete dir="${project.build.directory}/tmp"/>
-                                <mkdir dir="${project.build.directory}/tmp"/>
+                                <delete dir="${project.build.directory}/tmp" />
+                                <mkdir dir="${project.build.directory}/tmp" />
                                 
-                                <mkdir dir="${project.build.directory}/m1"/>
+                                <mkdir dir="${project.build.directory}/m1" />
                                 <copy todir="${project.build.directory}/m1">
-                                    <fileset dir="${basedir}/src/test/repo/m1"/>
+                                    <fileset dir="${basedir}/src/test/repo/m1" />
                                 </copy>
                                 
-                                <mkdir dir="${project.build.directory}/m2"/>
+                                <mkdir dir="${project.build.directory}/m2" />
                                 <copy todir="${project.build.directory}/m2">
-                                    <fileset dir="${basedir}/src/test/repo/m2"/>
+                                    <fileset dir="${basedir}/src/test/repo/m2" />
                                 </copy>
                             </tasks>
                         </configuration>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-management/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-management/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-management/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-management</artifactId>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-naming/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-naming/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-naming/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-naming</artifactId>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-plugin/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-plugin/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-plugin/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.apache.geronimo.framework</groupId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>geronimo-plugin</artifactId>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-security/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-security/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-security/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-security</artifactId>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-service-builder/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-service-builder/pom.xml Tue Apr  6 13:39:53 2010
@@ -18,13 +18,13 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<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>
 
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-service-builder</artifactId>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-system/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-system/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-system</artifactId>
@@ -121,19 +121,17 @@
                         <configuration>
                             <tasks>
                                 <tstamp>
-                                    <format property="build.year" pattern="yyyy"/>
+                                    <format property="build.year" pattern="yyyy" />
                                 </tstamp>
 
-                                <mkdir dir="${project.build.outputDirectory}/org/apache/geronimo/system/serverinfo"/>
+                                <mkdir dir="${project.build.outputDirectory}/org/apache/geronimo/system/serverinfo" />
 
-                                <propertyfile
-                                        file="${project.build.outputDirectory}/org/apache/geronimo/system/serverinfo/geronimo-version.properties"
-                                        comment="Geronimo version information (generated, do not modify)">
-
-                                    <entry key="version" value="${version}"/>
-                                    <entry key="build.date" type="date" value="now" pattern="yyyy.MM.dd"/>
-                                    <entry key="build.time" type="date" value="now" pattern="HH:mm:ss.SSSZ"/>
-                                    <entry key="copyright" value="Copyright (C) 2003-${build.year}, The Apache Software Foundation"/>
+                                <propertyfile file="${project.build.outputDirectory}/org/apache/geronimo/system/serverinfo/geronimo-version.properties" comment="Geronimo version information (generated, do not modify)">
+
+                                    <entry key="version" value="${version}" />
+                                    <entry key="build.date" type="date" value="now" pattern="yyyy.MM.dd" />
+                                    <entry key="build.time" type="date" value="now" pattern="HH:mm:ss.SSSZ" />
+                                    <entry key="copyright" value="Copyright (C) 2003-${build.year}, The Apache Software Foundation" />
                                 </propertyfile>
                             </tasks>
                         </configuration>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-transformer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-transformer/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-transformer/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-transformer/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-transformer</artifactId>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-upgrade/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-upgrade/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-upgrade/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>modules</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-upgrade</artifactId>

Modified: geronimo/server/branches/2.1/framework/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>framework</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>modules</artifactId>

Modified: geronimo/server/branches/2.1/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo</groupId>
         <artifactId>geronimo</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.framework</groupId>

Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-broker/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-broker/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-broker/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-console-jetty/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-console-jetty/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-console-jetty/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>activemq-console-jetty</artifactId>

Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-console-tomcat/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-console-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-console-tomcat/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>activemq-console-tomcat</artifactId>

Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-portlets/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>activemq-portlets</artifactId>
@@ -120,9 +120,9 @@
                             <tasks>
                                 <copy overwrite="true" todir="target/classes">
                                     <fileset dir="src/main/resources">
-                                        <include name="*_en.properties"/>
+                                        <include name="*_en.properties" />
                                     </fileset>
-                                    <mapper type="glob" from="*_en.properties" to="*.properties"/>
+                                    <mapper type="glob" from="*_en.properties" to="*.properties" />
                                 </copy>
                             </tasks>
                         </configuration>

Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-ra/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-ra/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-ra/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1/plugins/activemq/geronimo-activemq-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/geronimo-activemq-management/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/geronimo-activemq-management/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/activemq/geronimo-activemq-management/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/activemq/geronimo-activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/geronimo-activemq-ra/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/geronimo-activemq-ra/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/activemq/geronimo-activemq-ra/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/activemq/geronimo-activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/geronimo-activemq/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/geronimo-activemq/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/activemq/geronimo-activemq/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/activemq/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>activemq</artifactId>

Modified: geronimo/server/branches/2.1/plugins/axis/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis/axis-deployer/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis/axis-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis/axis-deployer/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1/plugins/axis/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis/axis/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis/axis/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis/axis/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1/plugins/axis/geronimo-axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis/geronimo-axis-builder/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis/geronimo-axis-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis/geronimo-axis-builder/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/axis/geronimo-axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis/geronimo-axis/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis/geronimo-axis/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis/geronimo-axis/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>axis</artifactId>

Modified: geronimo/server/branches/2.1/plugins/axis2/axis2-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis2/axis2-deployer/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis2/axis2-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis2/axis2-deployer/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis2</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
@@ -92,8 +92,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')"/>
-                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')"/>
+                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')" />
+                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')" />
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/branches/2.1/plugins/axis2/axis2-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis2/axis2-ejb-deployer/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis2/axis2-ejb-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis2/axis2-ejb-deployer/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis2</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
@@ -108,8 +108,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')"/>
-                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')"/>
+                            <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')" />
+                            <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')" />
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/branches/2.1/plugins/axis2/axis2-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis2/axis2-ejb/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis2/axis2-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis2/axis2-ejb/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis2</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1/plugins/axis2/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis2/axis2/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis2/axis2/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis2/axis2/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis2</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2-builder/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2-builder/pom.xml Tue Apr  6 13:39:53 2010
@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You 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: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
-
-<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>
-
-    <parent>
-        <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>axis2</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-axis2-builder</artifactId>
-    <name>Geronimo Plugins, AXIS2 :: Builder</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jaxws-builder</artifactId>
-            <version>${version}</version>
-        </dependency>
-        
-        <!-- xbean-finder, g-service-builder comes transitively from this -->
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee-builder</artifactId>
-            <version>${version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-naming-builder</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-       <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-axis2</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-       <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-       </dependency>
-
-        <!-- add the following for wsgen -->
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-tools</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-xjc</artifactId>
-        </dependency>
-        <!--end add for wsgen-->
-    </dependencies>
-
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
+
+<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>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>axis2</artifactId>
+        <version>2.1.5</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>geronimo-axis2-builder</artifactId>
+    <name>Geronimo Plugins, AXIS2 :: Builder</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jaxws-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <!-- xbean-finder, g-service-builder comes transitively from this -->
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+       <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-axis2</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+       <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+       </dependency>
+
+        <!-- add the following for wsgen -->
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-tools</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-rt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-xjc</artifactId>
+        </dependency>
+        <!--end add for wsgen-->
+    </dependencies>
+
+</project>

Modified: geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2-ejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2-ejb-builder/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2-ejb-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2-ejb-builder/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis2</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2-ejb/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2-ejb/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis2</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>axis2</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis2/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis2/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis2/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>axis2</artifactId>

Modified: geronimo/server/branches/2.1/plugins/ca-helper/ca-helper-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/ca-helper/ca-helper-jetty/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/ca-helper/ca-helper-jetty/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/ca-helper/ca-helper-jetty/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>ca-helper</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1/plugins/ca-helper/ca-helper-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/ca-helper/ca-helper-tomcat/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/ca-helper/ca-helper-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/ca-helper/ca-helper-tomcat/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>ca-helper</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1/plugins/ca-helper/geronimo-ca-helper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/ca-helper/geronimo-ca-helper/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/ca-helper/geronimo-ca-helper/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/ca-helper/geronimo-ca-helper/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>ca-helper</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>geronimo-ca-helper</artifactId>

Modified: geronimo/server/branches/2.1/plugins/ca-helper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/ca-helper/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/ca-helper/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/ca-helper/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>ca-helper</artifactId>

Modified: geronimo/server/branches/2.1/plugins/client/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/client/client-deployer/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/client/client-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/client/client-deployer/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>client</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
@@ -123,8 +123,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default"/>
-                            <config-xml-content server="offline"/>
+                            <config-xml-content server="default" />
+                            <config-xml-content server="offline" />
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/branches/2.1/plugins/client/client-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/client/client-security/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/client/client-security/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/client/client-security/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>client</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
@@ -75,7 +75,7 @@
                     </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                             <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-security//car">org.apache.geronimo.configs/client-security/${version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-security/${version}/car">org.apache.geronimo.configs/client-security/${version}/car</artifact-alias>
                         </plugin-artifact>

Modified: geronimo/server/branches/2.1/plugins/client/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/client/client/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/client/client/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/client/client/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>client</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>
@@ -141,7 +141,7 @@
                     </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                             <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-server//car">org.apache.geronimo.configs/client/${version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-server/${version}/car">org.apache.geronimo.configs/client/${version}/car</artifact-alias>
                         </plugin-artifact>

Modified: geronimo/server/branches/2.1/plugins/client/geronimo-client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/client/geronimo-client-builder/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/client/geronimo-client-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/client/geronimo-client-builder/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>client</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/client/geronimo-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/client/geronimo-client/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/client/geronimo-client/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/client/geronimo-client/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>client</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/client/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/client/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/client/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>client</artifactId>

Modified: geronimo/server/branches/2.1/plugins/clustering/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/clustering/clustering/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/clustering/clustering/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/clustering/clustering/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>clustering</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1/plugins/clustering/farming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/clustering/farming/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/clustering/farming/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/clustering/farming/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>clustering</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1/plugins/clustering/geronimo-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/clustering/geronimo-clustering-wadi/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/clustering/geronimo-clustering-wadi/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/clustering/geronimo-clustering-wadi/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>clustering</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/clustering/geronimo-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/clustering/geronimo-clustering/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/clustering/geronimo-clustering/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/clustering/geronimo-clustering/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>clustering</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>clustering</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/clustering/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/clustering/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/clustering/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>clustering</artifactId>

Modified: geronimo/server/branches/2.1/plugins/clustering/wadi-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/clustering/wadi-clustering/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/clustering/wadi-clustering/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/clustering/wadi-clustering/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>clustering</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1/plugins/connector/client-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/client-transaction/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/connector/client-transaction/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/connector/client-transaction/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>connector</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -108,7 +108,7 @@
                     </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                             <artifact-alias server="client" key="org.apache.geronimo.configs/transaction//car">org.apache.geronimo.configs/client-transaction/${version}/car</artifact-alias>
                             <artifact-alias server="client" key="org.apache.geronimo.configs/transaction/${version}/car">org.apache.geronimo.configs/client-transaction/${version}/car</artifact-alias>
                         </plugin-artifact>

Modified: geronimo/server/branches/2.1/plugins/connector/connector-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/connector-deployer/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/connector/connector-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/connector/connector-deployer/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>connector</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -129,7 +129,7 @@
                                     </attribute>
                                 </gbean>
                             </config-xml-content>
-                            <config-xml-content server="offline"/>
+                            <config-xml-content server="offline" />
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>connector</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
@@ -92,7 +92,7 @@
                         <phase>process-test-resources</phase>
                         <configuration>
                             <tasks>
-                                <ant antfile="${pom.basedir}/src/test/script/test-setup.xml"/>
+                                <ant antfile="${pom.basedir}/src/test/script/test-setup.xml" />
                             </tasks>
                         </configuration>
                         <goals>

Modified: geronimo/server/branches/2.1/plugins/connector/geronimo-connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/geronimo-connector/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/connector/geronimo-connector/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/connector/geronimo-connector/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>connector</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/connector/geronimo-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/geronimo-transaction/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/connector/geronimo-transaction/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/connector/geronimo-transaction/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>connector</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/connector/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/connector/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <artifactId>connector</artifactId>

Modified: geronimo/server/branches/2.1/plugins/connector/transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/transaction/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/connector/transaction/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/connector/transaction/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>connector</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -134,7 +134,7 @@
                             <config-substitution key="TmId">71,84,77,73,68</config-substitution>
                             <config-substitution key="ResourceBindingsFormat">{groupId}/{artifactId}/{j2eeType}/{name}</config-substitution>
                             <config-substitution key="ResourceBindingsNameInNamespace">jca:</config-substitution>
-                            <config-substitution key="ResourceBindingsNamePattern"></config-substitution>
+                            <config-substitution key="ResourceBindingsNamePattern" />
                             <config-substitution key="ResourceBindingsQuery">?#org.apache.geronimo.naming.ResourceSource</config-substitution>
                         </plugin-artifact>
                     </instance>

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>console-base-portlets</artifactId>
@@ -174,9 +174,9 @@
                       <tasks>
                           <copy overwrite="true" todir="target/classes">
                               <fileset dir="src/main/resources">
-                                  <include name="*_en.properties"/>
+                                  <include name="*_en.properties" />
                               </fileset>
-                              <mapper type="glob" from="*_en.properties" to="*.properties"/>
+                              <mapper type="glob" from="*_en.properties" to="*.properties" />
                           </copy>
                       </tasks>
                   </configuration>

Modified: geronimo/server/branches/2.1/plugins/console/console-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-core/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-core/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/console-core/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>console-core</artifactId>

Modified: geronimo/server/branches/2.1/plugins/console/console-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-ear/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-ear/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/console-ear/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>console-ear</artifactId>

Modified: geronimo/server/branches/2.1/plugins/console/console-filter/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-filter/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-filter/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/console-filter/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>console-filter</artifactId>

Modified: geronimo/server/branches/2.1/plugins/console/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-jetty/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-jetty/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/console-jetty/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>console-jetty</artifactId>

Modified: geronimo/server/branches/2.1/plugins/console/console-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-portal-driver/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/console-portal-driver/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>console-portal-driver</artifactId>
@@ -98,9 +98,9 @@
                             <tasks>
                                 <copy overwrite="true" todir="target/classes">
                                     <fileset dir="src/main/resources">
-                                        <include name="*_en.properties"/>
+                                        <include name="*_en.properties" />
                                     </fileset>
-                                    <mapper type="glob" from="*_en.properties" to="*.properties"/>
+                                    <mapper type="glob" from="*_en.properties" to="*.properties" />
                                 </copy>
                             </tasks>
                         </configuration>

Modified: geronimo/server/branches/2.1/plugins/console/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-tomcat/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/console-tomcat/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>console-tomcat</artifactId>

Modified: geronimo/server/branches/2.1/plugins/console/geronimo-converter/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/geronimo-converter/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/geronimo-converter/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/geronimo-converter/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/console/plugin-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-console-jetty/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-console-jetty/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-console-jetty/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>plugin-console-jetty</artifactId>

Modified: geronimo/server/branches/2.1/plugins/console/plugin-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-console-tomcat/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-console-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-console-tomcat/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>plugin-console-tomcat</artifactId>

Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>plugin-portlets</artifactId>
@@ -183,9 +183,9 @@
                             <tasks>
                                 <copy overwrite="true" todir="target/classes">
                                     <fileset dir="src/main/resources">
-                                        <include name="*_en.properties"/>
+                                        <include name="*_en.properties" />
                                     </fileset>
-                                    <mapper type="glob" from="*_en.properties" to="*.properties"/>
+                                    <mapper type="glob" from="*_en.properties" to="*.properties" />
                                 </copy>
                             </tasks>
                         </configuration>

Modified: geronimo/server/branches/2.1/plugins/console/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>console</artifactId>

Modified: geronimo/server/branches/2.1/plugins/corba/client-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/corba/client-corba-yoko/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/corba/client-corba-yoko/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/corba/client-corba-yoko/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>corba</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -130,7 +130,7 @@
                     </useMavenDependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content load="false"/>
+                            <config-xml-content load="false" />
                             <artifact-alias server="client" key="${groupId}/${artifactId}//car">${groupId}/${artifactId}/${version}/car</artifact-alias>
                             <artifact-alias server="client" key="${groupId}/${artifactId}/2.1.4/car">${groupId}/${artifactId}/${version}/car</artifact-alias>
                             <artifact-alias server="client" key="${groupId}/${artifactId}/2.1.3/car">${groupId}/${artifactId}/${version}/car</artifact-alias>

Modified: geronimo/server/branches/2.1/plugins/corba/geronimo-corba-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/corba/geronimo-corba-builder/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/corba/geronimo-corba-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/corba/geronimo-corba-builder/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>corba</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/corba/geronimo-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/corba/geronimo-corba/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/corba/geronimo-corba/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/corba/geronimo-corba/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>corba</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/corba/geronimo-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/corba/geronimo-yoko/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/corba/geronimo-yoko/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/corba/geronimo-yoko/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>corba</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/2.1/plugins/corba/j2ee-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/corba/j2ee-corba-yoko/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/corba/j2ee-corba-yoko/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/corba/j2ee-corba-yoko/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>corba</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/2.1/plugins/corba/openejb-corba-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/corba/openejb-corba-deployer/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/corba/openejb-corba-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/corba/openejb-corba-deployer/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>corba</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
@@ -106,8 +106,8 @@
                     </dependencies>
                     <instance>
                         <plugin-artifact>
-                            <config-xml-content server="default"/>
-                            <config-xml-content server="offline"/>
+                            <config-xml-content server="default" />
+                            <config-xml-content server="offline" />
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/branches/2.1/plugins/corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/corba/pom.xml?rev=931149&r1=931148&r2=931149&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/corba/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/corba/pom.xml Tue Apr  6 13:39:53 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>2.1.5-SNAPSHOT</version>
+        <version>2.1.5</version>
     </parent>
 
     <artifactId>corba</artifactId>