You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2011/01/07 13:44:28 UTC
svn commit: r1056293 [5/8] - in /geronimo/server/trunk: ./ assemblies/
assemblies/geronimo-jetty8-javaee6-web/ assemblies/geronimo-jetty8-javaee6/
assemblies/geronimo-jetty8-minimal/
assemblies/geronimo-tomcat7-javaee6-web/ assemblies/geronimo-tomcat7-...
Modified: geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml Fri Jan 7 12:44:14 2011
@@ -1,129 +1,129 @@
-<?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: 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-SNAPSHOT</version>
- </parent>
-
- <artifactId>openejb-console-tomcat</artifactId>
- <name>Geronimo Plugins, OpenEJB :: Tomcat</name>
- <packaging>car</packaging>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>openejb-portlets</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat7-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>console-tomcat</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>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>dojo-tomcat</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>plugin</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>
- <deploymentConfigs>
- <deploymentConfig>${gbeanDeployer}</deploymentConfig>
- <deploymentConfig>${j2eeDeployer}</deploymentConfig>
- <deploymentConfig>${tomcatDeployer}</deploymentConfig>
- <deploymentConfig>${jasperDeployer}</deploymentConfig>
- </deploymentConfigs>
- <module>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>openejb-portlets</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </module>
- <category>Administration</category>
- <description>
- OpenEJB Server plugin for Tomcat
- </description>
- <osiApproved>true</osiApproved>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
- </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: 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-console-tomcat</artifactId>
+ <name>Geronimo Plugins, OpenEJB :: Tomcat</name>
+ <packaging>car</packaging>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>openejb-portlets</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-jsr88</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat7-deployer</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper-deployer</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>console-tomcat</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>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>dojo-tomcat</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>plugin</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>
+ <deploymentConfigs>
+ <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+ <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+ <deploymentConfig>${jasperDeployer}</deploymentConfig>
+ </deploymentConfigs>
+ <module>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>openejb-portlets</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </module>
+ <category>Administration</category>
+ <description>
+ OpenEJB Server plugin for Tomcat
+ </description>
+ <osiApproved>true</osiApproved>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>openejb</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml Fri Jan 7 12:44:14 2011
@@ -1,188 +1,188 @@
-<?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-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.portals</groupId>
- <artifactId>portlet-api_2.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>jstl</artifactId>
- <scope>provided</scope>
- </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.portals.pluto</groupId>
- <artifactId>pluto-taglib</artifactId>
- <scope>provided</scope>
- </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-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.portals</groupId>
+ <artifactId>portlet-api_2.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>jstl</artifactId>
+ <scope>provided</scope>
+ </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.portals.pluto</groupId>
+ <artifactId>pluto-taglib</artifactId>
+ <scope>provided</scope>
+ </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/trunk/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>openejb</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/trunk/plugins/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/pom.xml Fri Jan 7 12:44:14 2011
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<artifactId>openejb</artifactId>
Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-aries-jpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-aries-jpa/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-aries-jpa/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-aries-jpa/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>openjpa2</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>openjpa2</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>openjpa2</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>openjpa2</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>openjpa2</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>openjpa2</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/trunk/plugins/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<artifactId>openjpa2</artifactId>
Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>openwebbeans</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>openwebbeans</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/pom.xml Fri Jan 7 12:44:14 2011
@@ -21,15 +21,14 @@
2009) $
-->
-<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>openwebbeans</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>openwebbeans</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/trunk/plugins/openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/pom.xml Fri Jan 7 12:44:14 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<artifactId>openwebbeans</artifactId>
Modified: geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>pluto</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<artifactId>geronimo-pluto</artifactId>
Modified: geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>pluto</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<artifactId>pluto-support</artifactId>
Modified: geronimo/server/trunk/plugins/pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pom.xml Fri Jan 7 12:44:14 2011
@@ -18,15 +18,14 @@
<!-- $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-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<artifactId>pluto</artifactId>
Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Fri Jan 7 12:44:14 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.plugins</groupId>
Modified: geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/pom.xml (original)
+++ geronimo/server/trunk/plugins/remote-deploy/geronimo-remote-deploy/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>remote-deploy</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<artifactId>geronimo-remote-deploy</artifactId>
Modified: geronimo/server/trunk/plugins/remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/remote-deploy/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/remote-deploy/pom.xml (original)
+++ geronimo/server/trunk/plugins/remote-deploy/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<artifactId>remote-deploy</artifactId>
Modified: geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/remote-deploy/remote-deploy-jetty/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>remote-deploy</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/remote-deploy/remote-deploy-tomcat/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>remote-deploy</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/trunk/plugins/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<artifactId>system-database</artifactId>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<artifactId>sysdb-console-jetty</artifactId>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<artifactId>sysdb-console-tomcat</artifactId>
Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<artifactId>sysdb-portlets</artifactId>
Modified: geronimo/server/trunk/plugins/system-database/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>system-database</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>tomcat</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-builder-wadi/pom.xml Fri Jan 7 12:44:14 2011
@@ -1,112 +1,112 @@
-<?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-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.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-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.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/trunk/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-clustering-wadi/pom.xml Fri Jan 7 12:44:14 2011
@@ -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-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-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>
+
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>tomcat</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/trunk/plugins/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/pom.xml Fri Jan 7 12:44:14 2011
@@ -18,15 +18,14 @@
<!-- $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-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<artifactId>tomcat</artifactId>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-builder-wadi/pom.xml Fri Jan 7 12:44:14 2011
@@ -1,93 +1,93 @@
-<?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-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat7-clustering-builder-wadi</artifactId>
- <name>Geronimo Plugins, Tomcat :: Clustering Builder for WADI</name>
- <packaging>car</packaging>
-
- <description>Deployment for WADI clustering on Tomcat 6.</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat7-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat7-clustering-builder-wadi</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat7-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>Tomcat</category>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat7-clustering-wadi</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <import>classes</import>
- </dependency>
- </dependencies>
- <instance>
- <plugin-artifact>
- <config-xml-content>
- <gbean name="TomcatClusteringBuilder">
- <attribute name="defaultSweepInterval">${DefaultWadiSweepInterval}</attribute>
- <attribute name="defaultNumPartitions">${DefaultWadiNumPartitions}</attribute>
- </gbean>
- </config-xml-content>
- <config-substitution key="DefaultWadiSweepInterval">36000</config-substitution>
- <config-substitution key="DefaultWadiNumPartitions">24</config-substitution>
- </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.
+-->
+
+<!-- $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.configs</groupId>
+ <artifactId>tomcat7-clustering-builder-wadi</artifactId>
+ <name>Geronimo Plugins, Tomcat :: Clustering Builder for WADI</name>
+ <packaging>car</packaging>
+
+ <description>Deployment for WADI clustering on Tomcat 6.</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat7-deployer</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-tomcat7-clustering-builder-wadi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat7-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>Tomcat</category>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat7-clustering-wadi</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ <import>classes</import>
+ </dependency>
+ </dependencies>
+ <instance>
+ <plugin-artifact>
+ <config-xml-content>
+ <gbean name="TomcatClusteringBuilder">
+ <attribute name="defaultSweepInterval">${DefaultWadiSweepInterval}</attribute>
+ <attribute name="defaultNumPartitions">${DefaultWadiNumPartitions}</attribute>
+ </gbean>
+ </config-xml-content>
+ <config-substitution key="DefaultWadiSweepInterval">36000</config-substitution>
+ <config-substitution key="DefaultWadiNumPartitions">24</config-substitution>
+ </plugin-artifact>
+ </instance>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-clustering-wadi/pom.xml Fri Jan 7 12:44:14 2011
@@ -1,77 +1,77 @@
-<?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-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat7-clustering-wadi</artifactId>
- <name>Geronimo Plugins, Tomcat :: Clustering over WADI</name>
- <packaging>car</packaging>
-
- <description>WADI clustering for Tomcat.</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat7-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>
-
- <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>Tomcat</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.
+-->
+
+<!-- $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.configs</groupId>
+ <artifactId>tomcat7-clustering-wadi</artifactId>
+ <name>Geronimo Plugins, Tomcat :: Clustering over WADI</name>
+ <packaging>car</packaging>
+
+ <description>WADI clustering for Tomcat.</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-tomcat7-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>
+
+ <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>Tomcat</category>
+ <instance>
+ <plugin-artifact>
+ <config-xml-content load="false" />
+ </plugin-artifact>
+ </instance>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/pom.xml Fri Jan 7 12:44:14 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>tomcat</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-M2-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml?rev=1056293&r1=1056292&r2=1056293&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-no-ha/pom.xml Fri Jan 7 12:44:14 2011
@@ -1,74 +1,74 @@
-<?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: 657880 $ $Date: 2008-05-20 03:48:13 +1000 (Tue, 20 May 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>tomcat</artifactId>
- <version>3.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat7-no-ha</artifactId>
- <name>Geronimo Plugins, Tomcat :: Tomcat without HA</name>
- <packaging>car</packaging>
-
- <description>Geronimo Tomcat web server integration without HA.</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-server</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat7</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>Tomcat</category>
- </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: 657880 $ $Date: 2008-05-20 03:48:13 +1000 (Tue, 20 May 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>tomcat</artifactId>
+ <version>3.0-M2-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat7-no-ha</artifactId>
+ <name>Geronimo Plugins, Tomcat :: Tomcat without HA</name>
+ <packaging>car</packaging>
+
+ <description>Geronimo Tomcat web server integration without HA.</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-server</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat7</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>Tomcat</category>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>