You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/08/17 19:33:54 UTC
svn commit: r805062 [2/2] - in /geronimo/server/trunk: ./
assemblies/geronimo-jetty7-javaee5/ assemblies/geronimo-jetty7-minimal/
assemblies/geronimo-tomcat6-javaee5/ assemblies/geronimo-tomcat6-minimal/
framework/buildsupport/geronimo-assembly-archety...
Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml Mon Aug 17 17:33:51 2009
@@ -82,8 +82,8 @@
</dependencies>
<instance>
<plugin-artifact>
- <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == '${jetty}')"/>
- <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == '${jetty}')"/>
+ <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == '${jetty}')" />
+ <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == '${jetty}')" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml Mon Aug 17 17:33:51 2009
@@ -76,7 +76,7 @@
<category>Web Services</category>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/pom.xml Mon Aug 17 17:33:51 2009
@@ -137,7 +137,7 @@
<category>Web Services</category>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/cxf/cxf-tools/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-tools/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-tools/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-tools/pom.xml Mon Aug 17 17:33:51 2009
@@ -58,10 +58,10 @@
</goals>
<configuration>
<tasks>
- <mkdir dir="${project.build.outputDirectory}"/>
+ <mkdir dir="${project.build.outputDirectory}" />
<copy todir="${project.build.outputDirectory}">
<fileset dir="${project.build.directory}/${project.build.finalName}/${project.build.finalName}">
- <include name="**"/>
+ <include name="**" />
</fileset>
</copy>
</tasks>
@@ -81,7 +81,7 @@
<category>Web Services</category>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
<copy-file relative-to="geronimo" dest-dir="">contents/</copy-file>
</plugin-artifact>
</instance>
Modified: geronimo/server/trunk/plugins/cxf/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/pom.xml Mon Aug 17 17:33:51 2009
@@ -158,7 +158,7 @@
<category>Web Services</category>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml Mon Aug 17 17:33:51 2009
@@ -124,9 +124,9 @@
<tasks>
<copy overwrite="true" todir="target/classes">
<fileset dir="src/main/i18n-resources">
- <include name="*_en.properties"/>
+ <include name="*_en.properties" />
</fileset>
- <mapper type="glob" from="*_en.properties" to="*.properties"/>
+ <mapper type="glob" from="*_en.properties" to="*.properties" />
</copy>
</tasks>
</configuration>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml Mon Aug 17 17:33:51 2009
@@ -188,22 +188,18 @@
</goals>
<configuration>
<tasks>
- <mkdir dir="${project.build.directory}/test-ear-javaee_5-unpacked.ear"/>
- <unzip src="${project.build.directory}/test-ear-javaee_5.ear"
- dest="${project.build.directory}/test-ear-javaee_5-unpacked.ear"/>
-
- <mkdir dir="${project.build.directory}/test-ear-javaee_5-naked-unpacked.ear"/>
- <unzip src="${project.build.directory}/test-ear-javaee_5-naked.ear"
- dest="${project.build.directory}/test-ear-javaee_5-naked-unpacked.ear"/>
+ <mkdir dir="${project.build.directory}/test-ear-javaee_5-unpacked.ear" />
+ <unzip src="${project.build.directory}/test-ear-javaee_5.ear" dest="${project.build.directory}/test-ear-javaee_5-unpacked.ear" />
+
+ <mkdir dir="${project.build.directory}/test-ear-javaee_5-naked-unpacked.ear" />
+ <unzip src="${project.build.directory}/test-ear-javaee_5-naked.ear" dest="${project.build.directory}/test-ear-javaee_5-naked-unpacked.ear" />
<!-- are these tests needed ? -->
- <mkdir dir="${project.build.directory}/test-ear-j2ee_1.4-unpacked.ear"/>
- <unzip src="${project.build.directory}/test-ear-j2ee_1.4.ear"
- dest="${project.build.directory}/test-ear-j2ee_1.4-unpacked.ear"/>
-
- <mkdir dir="${project.build.directory}/test-ear-javaee_5-naked-unpacked.ear"/>
- <unzip src="${project.build.directory}/test-ear-j2ee_1.4-naked.ear"
- dest="${project.build.directory}/test-ear-j2ee_1.4-naked-unpacked.ear"/>
+ <mkdir dir="${project.build.directory}/test-ear-j2ee_1.4-unpacked.ear" />
+ <unzip src="${project.build.directory}/test-ear-j2ee_1.4.ear" dest="${project.build.directory}/test-ear-j2ee_1.4-unpacked.ear" />
+
+ <mkdir dir="${project.build.directory}/test-ear-javaee_5-naked-unpacked.ear" />
+ <unzip src="${project.build.directory}/test-ear-j2ee_1.4-naked.ear" dest="${project.build.directory}/test-ear-j2ee_1.4-naked-unpacked.ear" />
</tasks>
</configuration>
</execution>
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml Mon Aug 17 17:33:51 2009
@@ -74,7 +74,7 @@
<category>Deployment</category>
<instance>
<plugin-artifact>
- <config-xml-content server="jsr88"/>
+ <config-xml-content server="jsr88" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml Mon Aug 17 17:33:51 2009
@@ -66,7 +66,7 @@
<category>Deployment</category>
<instance>
<plugin-artifact>
- <config-xml-content server="jsr88"/>
+ <config-xml-content server="jsr88" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml Mon Aug 17 17:33:51 2009
@@ -79,7 +79,7 @@
<category>Deployment</category>
<instance>
<plugin-artifact>
- <config-xml-content server="jsr88"/>
+ <config-xml-content server="jsr88" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml Mon Aug 17 17:33:51 2009
@@ -66,7 +66,7 @@
<category>Deployment</category>
<instance>
<plugin-artifact>
- <config-xml-content server="jsr88"/>
+ <config-xml-content server="jsr88" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml Mon Aug 17 17:33:51 2009
@@ -74,8 +74,8 @@
</dependencies>
<instance>
<plugin-artifact>
- <config-xml-content server="default"/>
- <config-xml-content server="offline"/>
+ <config-xml-content server="default" />
+ <config-xml-content server="offline" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml Mon Aug 17 17:33:51 2009
@@ -58,10 +58,10 @@
</goals>
<configuration>
<tasks>
- <mkdir dir="${project.build.outputDirectory}"/>
+ <mkdir dir="${project.build.outputDirectory}" />
<copy todir="${project.build.outputDirectory}">
<fileset dir="${project.build.directory}/${project.build.finalName}/${project.build.finalName}">
- <include name="**"/>
+ <include name="**" />
</fileset>
</copy>
</tasks>
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-wadi/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-wadi/pom.xml Mon Aug 17 17:33:51 2009
@@ -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: 607778 $ $Date: 2007-12-31 13:21:20 -0800 (Mon, 31 Dec 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>jetty</artifactId>
- <version>2.2-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jetty6-clustering-wadi</artifactId>
- <name>Geronimo Plugins, Jetty :: Clustering over WADI Core</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>wadi-clustering</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jetty6</artifactId>
- <version>${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: 607778 $ $Date: 2007-12-31 13:21:20 -0800 (Mon, 31 Dec 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>jetty</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-jetty6-clustering-wadi</artifactId>
+ <name>Geronimo Plugins, Jetty :: Clustering over WADI Core</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>wadi-clustering</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jetty6</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+
+</project>
+
Modified: geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml Mon Aug 17 17:33:51 2009
@@ -66,7 +66,7 @@
<category>Jetty</category>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml Mon Aug 17 17:33:51 2009
@@ -112,8 +112,8 @@
</dependencies>
<instance>
<plugin-artifact>
- <config-xml-content server="default"/>
- <config-xml-content server="offline"/>
+ <config-xml-content server="default" />
+ <config-xml-content server="offline" />
<copy-file dest-dir="schema">schema/schemaorg_apache_xmlbeans/src/</copy-file>
</plugin-artifact>
</instance>
Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-wadi/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-wadi/pom.xml Mon Aug 17 17:33:51 2009
@@ -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.
--->
-
-<!-- $Rev: 607778 $ $Date: 2007-12-31 13:21:20 -0800 (Mon, 31 Dec 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>jetty7</artifactId>
- <version>2.2-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jetty7-clustering-wadi</artifactId>
- <name>Geronimo Plugins, Jetty :: Clustering over WADI Core</name>
-
- <dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>geronimo-clustering-wadi</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>geronimo-jetty7</artifactId>
- <version>${version}</version>
- </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: 607778 $ $Date: 2007-12-31 13:21:20 -0800 (Mon, 31 Dec 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>jetty7</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-jetty7-clustering-wadi</artifactId>
+ <name>Geronimo Plugins, Jetty :: Clustering over WADI Core</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>geronimo-clustering-wadi</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>geronimo-jetty7</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
+
Modified: geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/pom.xml Mon Aug 17 17:33:51 2009
@@ -70,7 +70,7 @@
<category>Jetty</category>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/jetty7/jetty7-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/jetty7-deployer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/jetty7-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/jetty7-deployer/pom.xml Mon Aug 17 17:33:51 2009
@@ -114,8 +114,8 @@
</dependencies>
<instance>
<plugin-artifact>
- <config-xml-content server="default"/>
- <config-xml-content server="offline"/>
+ <config-xml-content server="default" />
+ <config-xml-content server="offline" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml Mon Aug 17 17:33:51 2009
@@ -18,9 +18,7 @@
<!-- $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>
Modified: geronimo/server/trunk/plugins/mejb/mejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/mejb/mejb/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/mejb/mejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/mejb/mejb/pom.xml Mon Aug 17 17:33:51 2009
@@ -18,9 +18,7 @@
<!-- $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>
Modified: geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml Mon Aug 17 17:33:51 2009
@@ -18,9 +18,7 @@
<!-- $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>
Modified: geronimo/server/trunk/plugins/monitoring/agent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent/pom.xml Mon Aug 17 17:33:51 2009
@@ -18,9 +18,7 @@
<!-- $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>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-ds/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-ds/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-ds/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-ds/pom.xml Mon Aug 17 17:33:51 2009
@@ -18,9 +18,7 @@
<!-- $Rev: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 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">
+<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>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml Mon Aug 17 17:33:51 2009
@@ -18,9 +18,7 @@
<!-- $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>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml Mon Aug 17 17:33:51 2009
@@ -18,9 +18,7 @@
<!-- $Rev: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 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">
+<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>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml Mon Aug 17 17:33:51 2009
@@ -18,9 +18,7 @@
<!-- $Rev: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 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">
+<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>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml Mon Aug 17 17:33:51 2009
@@ -18,9 +18,7 @@
<!-- $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>
@@ -123,9 +121,9 @@
<tasks>
<copy overwrite="true" todir="target/classes">
<fileset dir="src/main/i18n-resources">
- <include name="*_en.properties"/>
+ <include name="*_en.properties" />
</fileset>
- <mapper type="glob" from="*_en.properties" to="*.properties"/>
+ <mapper type="glob" from="*_en.properties" to="*.properties" />
</copy>
</tasks>
</configuration>
Modified: geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml Mon Aug 17 17:33:51 2009
@@ -73,8 +73,8 @@
</dependencies>
<instance>
<plugin-artifact>
- <config-xml-content server="default"/>
- <config-xml-content server="offline"/>
+ <config-xml-content server="default" />
+ <config-xml-content server="offline" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml Mon Aug 17 17:33:51 2009
@@ -17,7 +17,7 @@
-->
<!-- $Revision: 590482 $ $Date: 2007-10-31 08:51:54 +1100 (Wed, 31 Oct 2007) $ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml Mon Aug 17 17:33:51 2009
@@ -17,7 +17,7 @@
-->
<!-- $Revision: 590482 $ $Date: 2007-10-31 08:51:54 +1100 (Wed, 31 Oct 2007) $ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml Mon Aug 17 17:33:51 2009
@@ -17,7 +17,7 @@
-->
<!-- $Revision: 590482 $ $Date: 2007-10-31 08:51:54 +1100 (Wed, 31 Oct 2007) $ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/pom.xml Mon Aug 17 17:33:51 2009
@@ -17,7 +17,7 @@
-->
<!-- $Revision: 590482 $ $Date: 2007-10-31 08:51:54 +1100 (Wed, 31 Oct 2007) $ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -64,7 +64,7 @@
<category>EJB Container</category>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</plugin-artifact>
</instance>
</configuration>
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=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml Mon Aug 17 17:33:51 2009
@@ -152,9 +152,9 @@
<tasks>
<copy overwrite="true" todir="target/classes">
<fileset dir="src/main/i18n-resources">
- <include name="*_en.properties"/>
+ <include name="*_en.properties" />
</fileset>
- <mapper type="glob" from="*_en.properties" to="*.properties"/>
+ <mapper type="glob" from="*_en.properties" to="*.properties" />
</copy>
</tasks>
</configuration>
Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml Mon Aug 17 17:33:51 2009
@@ -160,9 +160,9 @@
<tasks>
<copy overwrite="true" todir="target/classes">
<fileset dir="src/main/i18n-resources">
- <include name="*_en.properties"/>
+ <include name="*_en.properties" />
</fileset>
- <mapper type="glob" from="*_en.properties" to="*.properties"/>
+ <mapper type="glob" from="*_en.properties" to="*.properties" />
</copy>
</tasks>
</configuration>
Modified: geronimo/server/trunk/plugins/procrun/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/procrun/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/procrun/pom.xml (original)
+++ geronimo/server/trunk/plugins/procrun/pom.xml Mon Aug 17 17:33:51 2009
@@ -39,7 +39,7 @@
Provides a Windows service wrapper with Apache Commons Daemon procrun for Geronimo.
</description>
- <dependencies/>
+ <dependencies />
<build>
<plugins>
Modified: geronimo/server/trunk/plugins/sharedlib/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/sharedlib/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/sharedlib/pom.xml (original)
+++ geronimo/server/trunk/plugins/sharedlib/pom.xml Mon Aug 17 17:33:51 2009
@@ -18,7 +18,7 @@
<!-- $Rev$ $Date$ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLofcation="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:schemaLofcation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -66,10 +66,10 @@
</goals>
<configuration>
<tasks>
- <mkdir dir="${project.build.outputDirectory}"/>
+ <mkdir dir="${project.build.outputDirectory}" />
<copy todir="${project.build.outputDirectory}">
<fileset dir="src/main/resources">
- <include name="**"/>
+ <include name="**" />
</fileset>
</copy>
</tasks>
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=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml Mon Aug 17 17:33:51 2009
@@ -151,9 +151,9 @@
<tasks>
<copy overwrite="true" todir="target/classes">
<fileset dir="src/main/i18n-resources">
- <include name="*_en.properties"/>
+ <include name="*_en.properties" />
</fileset>
- <mapper type="glob" from="*_en.properties" to="*.properties"/>
+ <mapper type="glob" from="*_en.properties" to="*.properties" />
</copy>
</tasks>
</configuration>
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml Mon Aug 17 17:33:51 2009
@@ -176,13 +176,13 @@
</goals>
<configuration>
<tasks>
- <copy todir="${project.build.directory}/var/catalina/conf" file="src/test/data/web.xml"/>
+ <copy todir="${project.build.directory}/var/catalina/conf" file="src/test/data/web.xml" />
<copy todir="${project.build.directory}/var/catalina/webapps">
<fileset dir="src/test/resources/deployables">
- <include name="war1/**"/>
- <include name="war3/**"/>
- <include name="war4/**"/>
- <include name="war6-jee5/**"/>
+ <include name="war1/**" />
+ <include name="war3/**" />
+ <include name="war4/**" />
+ <include name="war6-jee5/**" />
</fileset>
</copy>
</tasks>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/pom.xml Mon Aug 17 17:33:51 2009
@@ -66,7 +66,7 @@
<category>Tomcat</category>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml Mon Aug 17 17:33:51 2009
@@ -118,8 +118,8 @@
</dependencies>
<instance>
<plugin-artifact>
- <config-xml-content server="default"/>
- <config-xml-content server="offline"/>
+ <config-xml-content server="default" />
+ <config-xml-content server="offline" />
<copy-file dest-dir="schema">schema/schemaorg_apache_xmlbeans/src/</copy-file>
</plugin-artifact>
</instance>
Modified: geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml Mon Aug 17 17:33:51 2009
@@ -81,7 +81,7 @@
</goals>
<configuration>
<tasks>
- <delete dir="${project.build.outputDirectory}/var/derby"/>
+ <delete dir="${project.build.outputDirectory}/var/derby" />
</tasks>
</configuration>
</execution>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Aug 17 17:33:51 2009
@@ -18,8 +18,7 @@
<!-- $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>
@@ -46,9 +45,9 @@
</organization>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/server/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/server/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/geronimo/server/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/server/branches/2.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/server/branches/2.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/geronimo/server/branches/2.2</url>
</scm>
<properties>
@@ -88,7 +87,7 @@
<!--<jetty>jetty6</jetty>-->
<jetty>jetty7</jetty>
- <connectorSuffix></connectorSuffix>
+ <connectorSuffix />
<connectorSpec>geronimo-j2ee-connector_1.5_spec</connectorSpec>
<txmanagerVersion>2.1.3-SNAPSHOT</txmanagerVersion>
<!--<connectorSuffix>-1_6</connectorSuffix>
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml Mon Aug 17 17:33:51 2009
@@ -66,7 +66,7 @@
<tasks>
<copy todir="${project.build.outputDirectory}">
<fileset dir="${project.basedir}/src/main/rar">
- <include name="**"/>
+ <include name="**" />
</fileset>
</copy>
</tasks>
Modified: geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml Mon Aug 17 17:33:51 2009
@@ -66,7 +66,7 @@
<tasks>
<copy todir="${project.build.outputDirectory}">
<fileset dir="${project.basedir}/src/main/rar">
- <include name="**"/>
+ <include name="**" />
</fileset>
</copy>
</tasks>
Modified: geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml (original)
+++ geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml Mon Aug 17 17:33:51 2009
@@ -66,7 +66,7 @@
<tasks>
<copy todir="${project.build.outputDirectory}">
<fileset dir="${project.basedir}/src/main/rar">
- <include name="**"/>
+ <include name="**" />
</fileset>
</copy>
</tasks>