Return-Path: 
 <scm-return-43073-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 14552 invoked from network); 9 Jun 2010 09:43:13 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 9 Jun 2010 09:43:13 -0000
Received: (qmail 76756 invoked by uid 500); 9 Jun 2010 09:43:12 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 76504 invoked by uid 500); 9 Jun 2010 09:43:12 -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 76175 invoked by uid 99); 9 Jun 2010 09:43:11 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Jun 2010 09:43:11 +0000
X-ASF-Spam-Status: No, hits=-1998.3 required=10.0
	tests=ALL_TRUSTED,HK_RANDOM_ENVFROM,HK_RANDOM_FROM
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; Wed, 09 Jun 2010 09:42:58 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 88B032388A74; Wed,  9 Jun 2010 09:42:15 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r952928 [4/6] - in /geronimo/server/branches/3.0-M1: ./
 assemblies/ assemblies/geronimo-jetty8-javaee6/
 assemblies/geronimo-jetty8-minimal/ assemblies/geronimo-tomcat7-javaee6/
 assemblies/geronimo-tomcat7-minimal/ framework/ framework/assem...
Date: Wed, 09 Jun 2010 09:42:07 -0000
To: scm@geronimo.apache.org
From: rickmcguire@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100609094215.88B032388A74@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: geronimo/server/branches/3.0-M1/plugins/myfaces/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/myfaces/myfaces/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/myfaces/myfaces/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/myfaces/myfaces/pom.xml Wed Jun  9 09:41:58 2010
@@ -18,14 +18,15 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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>myfaces</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/3.0-M1/plugins/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/myfaces/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/myfaces/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/myfaces/pom.xml Wed Jun  9 09:41:58 2010
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>myfaces</artifactId>

Modified: geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-builder/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-builder/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-builder/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openejb</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml Wed Jun  9 09:41:58 2010
@@ -1,106 +1,106 @@
-<?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.
--->
-<!-- $Revision: 590482 $ $Date: 2007-10-31 08:51:54 +1100 (Wed, 31 Oct 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.plugins</groupId>
-        <artifactId>openejb</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-openejb-clustering-builder-wadi</artifactId>
-    <packaging>bundle</packaging>
-    <name>Geronimo Plugins, OpenEJB :: Clustering Builder for WADI</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb-deployer</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb-clustering-wadi</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
-                        <Import-Package>
-                            org.apache.geronimo.xbeans.javaee.impl,
-                            org.apache.geronimo.xbeans.javaee,
-                            org.apache.geronimo.xbeans.persistence.impl,
-                            org.apache.geronimo.xbeans.persistence,
-                            org.apache.geronimo.xbeans.j2ee.impl,
-                            org.apache.geronimo.xbeans.j2ee,
-                            org.w3.xml.x1998.namespace.impl,
-                            org.w3.xml.x1998.namespace,
-                            org.apache.geronimo.deployment.xbeans.impl,
-                            org.apache.geronimo.deployment.javabean.xbeans.impl,
-                            org.apache.geronimo.deployment.xbeans,
-                            org.apache.geronimo.deployment.javabean.xbeans,
-                            org.apache.geronimo.deployment.dconfigbean,
-                            org.apache.geronimo.deployment.service,
-                            org.apache.geronimo.deployment.service.jsr88,
-                            org.apache.geronimo.openejb.deployment,
-                            org.apache.geronimo.openejb.xbeans.ejbjar,
-                            org.apache.geronimo.openejb.xbeans.ejbjar.impl,
-                            org.apache.geronimo.xbeans.geronimo.j2ee,
-                            org.apache.geronimo.xbeans.geronimo.j2ee.impl,
-                            org.apache.geronimo.j2ee.deployment,
-                            org.apache.geronimo.j2ee.deployment.annotation,
-                            org.apache.geronimo.j2ee.jsr88,
-                            org.apache.geronimo.xbeans.geronimo.naming,
-                            org.apache.geronimo.xbeans.geronimo.naming.impl,
-                            org.apache.geronimo.naming.deployment,
-                            org.apache.geronimo.naming.deployment.jsr88,
-                            org.apache.xmlbeans.impl.schema;version="2.4",
-                            *
-                        </Import-Package>
-                        <Export-Package>
-                            org.apache.geronimo.openejb.deployment.cluster,
-                            org.apache.geronimo.xbeans.openejb.cluster.wadi,
-                            org.apache.geronimo.xbeans.openejb.cluster.wadi.impl
-                        </Export-Package>
-                        <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
-                        <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</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.
+-->
+<!-- $Revision: 590482 $ $Date: 2007-10-31 08:51:54 +1100 (Wed, 31 Oct 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.plugins</groupId>
+        <artifactId>openejb</artifactId>
+        <version>3.0-M1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>geronimo-openejb-clustering-builder-wadi</artifactId>
+    <packaging>bundle</packaging>
+    <name>Geronimo Plugins, OpenEJB :: Clustering Builder for WADI</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-clustering-wadi</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                        <Import-Package>
+                            org.apache.geronimo.xbeans.javaee.impl,
+                            org.apache.geronimo.xbeans.javaee,
+                            org.apache.geronimo.xbeans.persistence.impl,
+                            org.apache.geronimo.xbeans.persistence,
+                            org.apache.geronimo.xbeans.j2ee.impl,
+                            org.apache.geronimo.xbeans.j2ee,
+                            org.w3.xml.x1998.namespace.impl,
+                            org.w3.xml.x1998.namespace,
+                            org.apache.geronimo.deployment.xbeans.impl,
+                            org.apache.geronimo.deployment.javabean.xbeans.impl,
+                            org.apache.geronimo.deployment.xbeans,
+                            org.apache.geronimo.deployment.javabean.xbeans,
+                            org.apache.geronimo.deployment.dconfigbean,
+                            org.apache.geronimo.deployment.service,
+                            org.apache.geronimo.deployment.service.jsr88,
+                            org.apache.geronimo.openejb.deployment,
+                            org.apache.geronimo.openejb.xbeans.ejbjar,
+                            org.apache.geronimo.openejb.xbeans.ejbjar.impl,
+                            org.apache.geronimo.xbeans.geronimo.j2ee,
+                            org.apache.geronimo.xbeans.geronimo.j2ee.impl,
+                            org.apache.geronimo.j2ee.deployment,
+                            org.apache.geronimo.j2ee.deployment.annotation,
+                            org.apache.geronimo.j2ee.jsr88,
+                            org.apache.geronimo.xbeans.geronimo.naming,
+                            org.apache.geronimo.xbeans.geronimo.naming.impl,
+                            org.apache.geronimo.naming.deployment,
+                            org.apache.geronimo.naming.deployment.jsr88,
+                            org.apache.xmlbeans.impl.schema;version="2.4",
+                            *
+                        </Import-Package>
+                        <Export-Package>
+                            org.apache.geronimo.openejb.deployment.cluster,
+                            org.apache.geronimo.xbeans.openejb.cluster.wadi,
+                            org.apache.geronimo.xbeans.openejb.cluster.wadi.impl
+                        </Export-Package>
+                        <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
+                        <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Modified: geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml Wed Jun  9 09:41:58 2010
@@ -1,50 +1,50 @@
-<?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.
--->
-<!-- $Revision: 590482 $ $Date: 2007-10-31 08:51:54 +1100 (Wed, 31 Oct 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.plugins</groupId>
-        <artifactId>openejb</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-openejb-clustering-wadi</artifactId>
-    <packaging>bundle</packaging>
-    <name>Geronimo Plugins, OpenEJB :: Clustering over WADI</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>wadi-clustering</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </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.
+-->
+<!-- $Revision: 590482 $ $Date: 2007-10-31 08:51:54 +1100 (Wed, 31 Oct 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.plugins</groupId>
+        <artifactId>openejb</artifactId>
+        <version>3.0-M1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>geronimo-openejb-clustering-wadi</artifactId>
+    <packaging>bundle</packaging>
+    <name>Geronimo Plugins, OpenEJB :: Clustering over WADI</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>wadi-clustering</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+</project>

Modified: geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-server/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-server/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-server/pom.xml Wed Jun  9 09:41:58 2010
@@ -15,12 +15,13 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<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/xsd/maven-4.0.0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>openejb</artifactId>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>geronimo-openejb-server</artifactId>

Modified: geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openejb</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/3.0-M1/plugins/openejb/openejb-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/openejb-clustering-builder-wadi/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/openejb-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/openejb-clustering-builder-wadi/pom.xml Wed Jun  9 09:41:58 2010
@@ -1,109 +1,109 @@
-<?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.
--->
-<!-- $Revision: 590482 $ $Date: 2007-10-31 08:51:54 +1100 (Wed, 31 Oct 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.plugins</groupId>
-        <artifactId>openejb</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>openejb-clustering-builder-wadi</artifactId>
-    <name>Geronimo Plugins, OpenEJB :: Clustering Builder for WADI</name>
-    <packaging>car</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb-deployer</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-openejb-clustering-builder-wadi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb-clustering-wadi</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <category>EJB Container</category>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>openejb-clustering-wadi</artifactId>
-                            <version>${project.version}</version>
-                            <type>car</type>
-                            <import>classes</import>
-                        </dependency>
-                    </dependencies>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
-                        <Import-Package>
-                            org.apache.geronimo.xbeans.javaee.impl,
-                            org.apache.geronimo.xbeans.javaee,
-                            org.apache.geronimo.xbeans.persistence.impl,
-                            org.apache.geronimo.xbeans.persistence,
-                            org.apache.geronimo.xbeans.j2ee.impl,
-                            org.apache.geronimo.xbeans.j2ee,
-                            org.w3.xml.x1998.namespace.impl,
-                            org.w3.xml.x1998.namespace,
-                            org.apache.geronimo.deployment.xbeans.impl,
-                            org.apache.geronimo.deployment.javabean.xbeans.impl,
-                            org.apache.geronimo.deployment.xbeans,
-                            org.apache.geronimo.deployment.javabean.xbeans,
-                            org.apache.geronimo.deployment.dconfigbean,
-                            org.apache.geronimo.deployment.service,
-                            org.apache.geronimo.deployment.service.jsr88,
-                            org.apache.geronimo.openejb.deployment,
-                            org.apache.geronimo.openejb.xbeans.ejbjar,
-                            org.apache.geronimo.openejb.xbeans.ejbjar.impl,
-                            org.apache.xmlbeans.impl.schema;version="2.4",
-                            *
-                        </Import-Package>
-                        <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</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.
+-->
+<!-- $Revision: 590482 $ $Date: 2007-10-31 08:51:54 +1100 (Wed, 31 Oct 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.plugins</groupId>
+        <artifactId>openejb</artifactId>
+        <version>3.0-M1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>openejb-clustering-builder-wadi</artifactId>
+    <name>Geronimo Plugins, OpenEJB :: Clustering Builder for WADI</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-openejb-clustering-builder-wadi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-clustering-wadi</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <category>EJB Container</category>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.geronimo.configs</groupId>
+                            <artifactId>openejb-clustering-wadi</artifactId>
+                            <version>${project.version}</version>
+                            <type>car</type>
+                            <import>classes</import>
+                        </dependency>
+                    </dependencies>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                        <Import-Package>
+                            org.apache.geronimo.xbeans.javaee.impl,
+                            org.apache.geronimo.xbeans.javaee,
+                            org.apache.geronimo.xbeans.persistence.impl,
+                            org.apache.geronimo.xbeans.persistence,
+                            org.apache.geronimo.xbeans.j2ee.impl,
+                            org.apache.geronimo.xbeans.j2ee,
+                            org.w3.xml.x1998.namespace.impl,
+                            org.w3.xml.x1998.namespace,
+                            org.apache.geronimo.deployment.xbeans.impl,
+                            org.apache.geronimo.deployment.javabean.xbeans.impl,
+                            org.apache.geronimo.deployment.xbeans,
+                            org.apache.geronimo.deployment.javabean.xbeans,
+                            org.apache.geronimo.deployment.dconfigbean,
+                            org.apache.geronimo.deployment.service,
+                            org.apache.geronimo.deployment.service.jsr88,
+                            org.apache.geronimo.openejb.deployment,
+                            org.apache.geronimo.openejb.xbeans.ejbjar,
+                            org.apache.geronimo.openejb.xbeans.ejbjar.impl,
+                            org.apache.xmlbeans.impl.schema;version="2.4",
+                            *
+                        </Import-Package>
+                        <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Modified: geronimo/server/branches/3.0-M1/plugins/openejb/openejb-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/openejb-clustering-wadi/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/openejb-clustering-wadi/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/openejb-clustering-wadi/pom.xml Wed Jun  9 09:41:58 2010
@@ -1,75 +1,75 @@
-<?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.
--->
-<!-- $Revision: 590482 $ $Date: 2007-10-31 08:51:54 +1100 (Wed, 31 Oct 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.plugins</groupId>
-        <artifactId>openejb</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>openejb-clustering-wadi</artifactId>
-    <name>Geronimo Plugins, OpenEJB :: Clustering over WADI</name>
-    <packaging>car</packaging>
-
-    <description>WADI clustering for OpenEJB.</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-openejb-clustering-wadi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>wadi-clustering</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <category>EJB Container</category>
-                    <instance>
-                        <plugin-artifact>
-                            <config-xml-content load="false" />
-                        </plugin-artifact>
-                    </instance>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</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.
+-->
+<!-- $Revision: 590482 $ $Date: 2007-10-31 08:51:54 +1100 (Wed, 31 Oct 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.plugins</groupId>
+        <artifactId>openejb</artifactId>
+        <version>3.0-M1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>openejb-clustering-wadi</artifactId>
+    <name>Geronimo Plugins, OpenEJB :: Clustering over WADI</name>
+    <packaging>car</packaging>
+
+    <description>WADI clustering for OpenEJB.</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-openejb-clustering-wadi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>wadi-clustering</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <category>EJB Container</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content load="false" />
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Modified: geronimo/server/branches/3.0-M1/plugins/openejb/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/openejb-deployer/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/openejb-deployer/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/openejb-deployer/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openejb</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/3.0-M1/plugins/openejb/openejb-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/openejb-portlets/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/openejb-portlets/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/openejb-portlets/pom.xml Wed Jun  9 09:41:58 2010
@@ -1,186 +1,186 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    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: 617770 $ $Date: 2008-02-02 14:00:00 +0530 (Sat, 02 Feb 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>openejb</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>openejb-portlets</artifactId>
-    <name>Geronimo Plugins, OpenEJB :: Portlets</name>
-    <packaging>war</packaging>
-
-    <dependencies>
-        <!-- for jspc maven plugin -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_3.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.2_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-                <groupId>org.apache.geronimo.bundles</groupId>
-                <artifactId>jstl</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- for jspc maven plugin -->
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>pluto-support</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-management</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee-builder</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-naming-builder</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-security-builder</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-connector-builder-1_6</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-web-2.5-builder</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-deploy-jsr88</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-core</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>dwr</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <copy overwrite="true" todir="target/classes">
-                                    <fileset dir="src/main/i18n-resources">
-                                        <include name="*_en.properties" />
-                                    </fileset>
-                                    <mapper type="glob" from="*_en.properties" to="*.properties" />
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo.jspc</groupId>
-                <artifactId>jspc-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <webXml>${project.build.directory}/jspweb.xml</webXml>
-                    <warSourceExcludes>**/*.jsp</warSourceExcludes>
-                </configuration>
-            </plugin>
-            <plugin>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <artifactId>native2ascii-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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: 617770 $ $Date: 2008-02-02 14:00:00 +0530 (Sat, 02 Feb 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>openejb</artifactId>
+        <version>3.0-M1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>openejb-portlets</artifactId>
+    <name>Geronimo Plugins, OpenEJB :: Portlets</name>
+    <packaging>war</packaging>
+
+    <dependencies>
+        <!-- for jspc maven plugin -->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jsp_2.2_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+                <groupId>org.apache.geronimo.bundles</groupId>
+                <artifactId>jstl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- for jspc maven plugin -->
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>pluto-support</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-management</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector-builder-1_6</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-web-2.5-builder</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-core</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>dwr</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <copy overwrite="true" todir="target/classes">
+                                    <fileset dir="src/main/i18n-resources">
+                                        <include name="*_en.properties" />
+                                    </fileset>
+                                    <mapper type="glob" from="*_en.properties" to="*.properties" />
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo.jspc</groupId>
+                <artifactId>jspc-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webXml>${project.build.directory}/jspweb.xml</webXml>
+                    <warSourceExcludes>**/*.jsp</warSourceExcludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                  <groupId>org.codehaus.mojo</groupId>
+                  <artifactId>native2ascii-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Modified: geronimo/server/branches/3.0-M1/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/openejb/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/openejb/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openejb</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/3.0-M1/plugins/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/pom.xml Wed Jun  9 09:41:58 2010
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>openejb</artifactId>

Modified: geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-openjpa2/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-openjpa2/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-openjpa2/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/3.0-M1/plugins/openjpa2/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openjpa2/openjpa2/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openjpa2/openjpa2/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openjpa2/openjpa2/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/3.0-M1/plugins/openjpa2/persistence-jpa20-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openjpa2/persistence-jpa20-deployer/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openjpa2/persistence-jpa20-deployer/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openjpa2/persistence-jpa20-deployer/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>openjpa2</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/3.0-M1/plugins/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openjpa2/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openjpa2/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openjpa2/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>openjpa2</artifactId>

Modified: geronimo/server/branches/3.0-M1/plugins/pluto/geronimo-pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/pluto/geronimo-pluto/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/pluto/geronimo-pluto/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/pluto/geronimo-pluto/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>pluto</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>geronimo-pluto</artifactId>

Modified: geronimo/server/branches/3.0-M1/plugins/pluto/pluto-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/pluto/pluto-support/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/pluto/pluto-support/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/pluto/pluto-support/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>pluto</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>pluto-support</artifactId>

Modified: geronimo/server/branches/3.0-M1/plugins/pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/pluto/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/pluto/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/pluto/pom.xml Wed Jun  9 09:41:58 2010
@@ -18,14 +18,15 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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>plugins</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>pluto</artifactId>

Modified: geronimo/server/branches/3.0-M1/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/pom.xml Wed Jun  9 09:41:58 2010
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.geronimo</groupId>
         <artifactId>geronimo</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>

Modified: geronimo/server/branches/3.0-M1/plugins/procrun/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/procrun/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/procrun/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/procrun/pom.xml Wed Jun  9 09:41:58 2010
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/3.0-M1/plugins/remote-deploy/geronimo-remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/remote-deploy/geronimo-remote-deploy/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/remote-deploy/geronimo-remote-deploy/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/remote-deploy/geronimo-remote-deploy/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>remote-deploy</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>geronimo-remote-deploy</artifactId>

Modified: geronimo/server/branches/3.0-M1/plugins/remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/remote-deploy/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/remote-deploy/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/remote-deploy/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>remote-deploy</artifactId>

Modified: geronimo/server/branches/3.0-M1/plugins/remote-deploy/remote-deploy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/remote-deploy/remote-deploy-jetty/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/remote-deploy/remote-deploy-jetty/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/remote-deploy/remote-deploy-jetty/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>remote-deploy</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/3.0-M1/plugins/remote-deploy/remote-deploy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/remote-deploy/remote-deploy-tomcat/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/remote-deploy/remote-deploy-tomcat/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/remote-deploy/remote-deploy-tomcat/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>remote-deploy</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/3.0-M1/plugins/system-database/geronimo-derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/system-database/geronimo-derby/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/system-database/geronimo-derby/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/system-database/geronimo-derby/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>system-database</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/3.0-M1/plugins/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/system-database/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/system-database/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/system-database/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <artifactId>system-database</artifactId>

Modified: geronimo/server/branches/3.0-M1/plugins/system-database/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/system-database/system-database/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/system-database/system-database/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/system-database/system-database/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>system-database</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7-builder/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7-builder/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7-builder/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>tomcat</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml Wed Jun  9 09:41:58 2010
@@ -1,120 +1,120 @@
-<?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: 590482 $ $Date: 2007-10-30 14:51:54 -0700 (Tue, 30 Oct 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.plugins</groupId>
-        <artifactId>tomcat</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-tomcat7-clustering-builder-wadi</artifactId>
-    <packaging>bundle</packaging>
-    <name>Geronimo Plugins, Tomcat :: Clustering Builder for WADI Core</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat7-clustering-wadi</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-        <!-- xmlbeans, stax-api comes transitively via g-service-builder from this -->
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-naming-builder</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-tomcat7-builder</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-web-2.5-builder</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
-                        <Import-Package>
-                            org.apache.geronimo.xbeans.javaee.impl,
-                            org.apache.geronimo.xbeans.javaee,
-                            org.apache.geronimo.xbeans.persistence.impl,
-                            org.apache.geronimo.xbeans.persistence,
-                            org.apache.geronimo.xbeans.j2ee.impl,
-                            org.apache.geronimo.xbeans.j2ee,
-                            org.w3.xml.x1998.namespace.impl,
-                            org.w3.xml.x1998.namespace,
-                            org.apache.geronimo.deployment.xbeans.impl,
-                            org.apache.geronimo.deployment.javabean.xbeans.impl,
-                            org.apache.geronimo.deployment.xbeans,
-                            org.apache.geronimo.deployment.javabean.xbeans,
-                            org.apache.geronimo.deployment.dconfigbean,
-                            org.apache.geronimo.deployment.service,
-                            org.apache.geronimo.deployment.service.jsr88,
-                            org.apache.geronimo.xbeans.geronimo.j2ee,
-                            org.apache.geronimo.xbeans.geronimo.j2ee.impl,
-                            org.apache.geronimo.j2ee.deployment,
-                            org.apache.geronimo.j2ee.deployment.annotation,
-                            org.apache.geronimo.j2ee.jsr88,
-                            org.apache.geronimo.xbeans.geronimo.naming,
-                            org.apache.geronimo.xbeans.geronimo.naming.impl,
-                            org.apache.geronimo.naming.deployment,
-                            org.apache.geronimo.naming.deployment.jsr88,
-                            org.apache.xmlbeans.impl.schema;version="2.4",
-                            *
-                        </Import-Package>
-                        <Export-Package>
-                            org.apache.geronimo.tomcat.cluster.wadi.builder,
-                            org.apache.geronimo.xbeans.tomcat.cluster.wadi,
-                            org.apache.geronimo.xbeans.tomcat.cluster.wadi.impl
-                        </Export-Package>
-                        <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
-                        <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</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: 590482 $ $Date: 2007-10-30 14:51:54 -0700 (Tue, 30 Oct 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.plugins</groupId>
+        <artifactId>tomcat</artifactId>
+        <version>3.0-M1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>geronimo-tomcat7-clustering-builder-wadi</artifactId>
+    <packaging>bundle</packaging>
+    <name>Geronimo Plugins, Tomcat :: Clustering Builder for WADI Core</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat7-clustering-wadi</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+        <!-- xmlbeans, stax-api comes transitively via g-service-builder from this -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-tomcat7-builder</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-web-2.5-builder</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                        <Import-Package>
+                            org.apache.geronimo.xbeans.javaee.impl,
+                            org.apache.geronimo.xbeans.javaee,
+                            org.apache.geronimo.xbeans.persistence.impl,
+                            org.apache.geronimo.xbeans.persistence,
+                            org.apache.geronimo.xbeans.j2ee.impl,
+                            org.apache.geronimo.xbeans.j2ee,
+                            org.w3.xml.x1998.namespace.impl,
+                            org.w3.xml.x1998.namespace,
+                            org.apache.geronimo.deployment.xbeans.impl,
+                            org.apache.geronimo.deployment.javabean.xbeans.impl,
+                            org.apache.geronimo.deployment.xbeans,
+                            org.apache.geronimo.deployment.javabean.xbeans,
+                            org.apache.geronimo.deployment.dconfigbean,
+                            org.apache.geronimo.deployment.service,
+                            org.apache.geronimo.deployment.service.jsr88,
+                            org.apache.geronimo.xbeans.geronimo.j2ee,
+                            org.apache.geronimo.xbeans.geronimo.j2ee.impl,
+                            org.apache.geronimo.j2ee.deployment,
+                            org.apache.geronimo.j2ee.deployment.annotation,
+                            org.apache.geronimo.j2ee.jsr88,
+                            org.apache.geronimo.xbeans.geronimo.naming,
+                            org.apache.geronimo.xbeans.geronimo.naming.impl,
+                            org.apache.geronimo.naming.deployment,
+                            org.apache.geronimo.naming.deployment.jsr88,
+                            org.apache.xmlbeans.impl.schema;version="2.4",
+                            *
+                        </Import-Package>
+                        <Export-Package>
+                            org.apache.geronimo.tomcat.cluster.wadi.builder,
+                            org.apache.geronimo.xbeans.tomcat.cluster.wadi,
+                            org.apache.geronimo.xbeans.tomcat.cluster.wadi.impl
+                        </Export-Package>
+                        <_exportcontents>schemaorg_apache_xmlbeans*</_exportcontents>
+                        <DynamicImport-Package>schemaorg_apache_xmlbeans.*</DynamicImport-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
+

Modified: geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml Wed Jun  9 09:41:58 2010
@@ -1,52 +1,52 @@
-<?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: 590482 $ $Date: 2007-10-30 14:51:54 -0700 (Tue, 30 Oct 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.plugins</groupId>
-        <artifactId>tomcat</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-tomcat7-clustering-wadi</artifactId>
-    <packaging>bundle</packaging>
-    <name>Geronimo Plugins, Tomcat :: Clustering over WADI Core</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-clustering-wadi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat7-no-ha</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </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: 590482 $ $Date: 2007-10-30 14:51:54 -0700 (Tue, 30 Oct 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.plugins</groupId>
+        <artifactId>tomcat</artifactId>
+        <version>3.0-M1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.modules</groupId>
+    <artifactId>geronimo-tomcat7-clustering-wadi</artifactId>
+    <packaging>bundle</packaging>
+    <name>Geronimo Plugins, Tomcat :: Clustering over WADI Core</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-clustering-wadi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat7-no-ha</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+</project>
+

Modified: geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/pom.xml?rev=952928&r1=952927&r2=952928&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/pom.xml Wed Jun  9 09:41:58 2010
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>tomcat</artifactId>
-        <version>3.0-M2-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.modules</groupId>