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 [1/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...
Author: djencks
Date: Mon Aug 17 17:33:51 2009
New Revision: 805062
URL: http://svn.apache.org/viewvc?rev=805062&view=rev
Log:
[maven-release-plugin] prepare branch 2.2
Modified:
geronimo/server/trunk/assemblies/geronimo-jetty7-javaee5/pom.xml
geronimo/server/trunk/assemblies/geronimo-jetty7-minimal/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/pom.xml
geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/pom.xml
geronimo/server/trunk/framework/configs/client-system/pom.xml
geronimo/server/trunk/framework/configs/geronimo-boilerplate/pom.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml
geronimo/server/trunk/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/pom.xml
geronimo/server/trunk/framework/configs/gshell-framework/pom.xml
geronimo/server/trunk/framework/configs/gshell-geronimo/pom.xml
geronimo/server/trunk/framework/configs/gshell-remote/pom.xml
geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
geronimo/server/trunk/framework/configs/offline-deployer/pom.xml
geronimo/server/trunk/framework/configs/online-deployer/pom.xml
geronimo/server/trunk/framework/configs/plugin/pom.xml
geronimo/server/trunk/framework/configs/shutdown/pom.xml
geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml
geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml
geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml
geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml
geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml
geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml
geronimo/server/trunk/plugins/axis2/axis2/pom.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml
geronimo/server/trunk/plugins/classloaders/geronimo-schema-jee_5/pom.xml
geronimo/server/trunk/plugins/classloaders/pom.xml
geronimo/server/trunk/plugins/classloaders/xbean-finder/pom.xml
geronimo/server/trunk/plugins/client/client-deployer/pom.xml
geronimo/server/trunk/plugins/client/client-security/pom.xml
geronimo/server/trunk/plugins/client/client/pom.xml
geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/pom.xml
geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml
geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml
geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml
geronimo/server/trunk/plugins/clustering/pom.xml
geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml
geronimo/server/trunk/plugins/concurrent/concurrent-deployer/pom.xml
geronimo/server/trunk/plugins/connector/client-transaction/pom.xml
geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml
geronimo/server/trunk/plugins/connector/transaction/pom.xml
geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml
geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml
geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml
geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml
geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml
geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml
geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/pom.xml
geronimo/server/trunk/plugins/cxf/cxf-tools/pom.xml
geronimo/server/trunk/plugins/cxf/cxf/pom.xml
geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml
geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml
geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml
geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml
geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml
geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml
geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml
geronimo/server/trunk/plugins/jetty7/geronimo-jetty7-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/jetty7/jetty7-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/jetty7/jetty7-deployer/pom.xml
geronimo/server/trunk/plugins/mejb/geronimo-mejb/pom.xml
geronimo/server/trunk/plugins/mejb/mejb/pom.xml
geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml
geronimo/server/trunk/plugins/monitoring/agent/pom.xml
geronimo/server/trunk/plugins/monitoring/mconsole-ds/pom.xml
geronimo/server/trunk/plugins/monitoring/mconsole-jetty-server/pom.xml
geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml
geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml
geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml
geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml
geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-builder-wadi/pom.xml
geronimo/server/trunk/plugins/openejb/geronimo-openejb-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/openejb/openejb-clustering-builder-wadi/pom.xml
geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml
geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml
geronimo/server/trunk/plugins/procrun/pom.xml
geronimo/server/trunk/plugins/sharedlib/pom.xml
geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml
geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml
geronimo/server/trunk/pom.xml
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/pom.xml
geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/pom.xml
geronimo/server/trunk/testsupport/test-deployment-javaee_5/test-rar-javaee_5/pom.xml
Modified: geronimo/server/trunk/assemblies/geronimo-jetty7-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty7-javaee5/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty7-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty7-javaee5/pom.xml Mon Aug 17 17:33:51 2009
@@ -58,17 +58,15 @@
</goals>
<configuration>
<tasks>
- <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration"
- fork="yes" failonerror="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg value="${project.build.directory}/assembly"/>
- <arg value="gsh-wsgen.properties"/>
+ <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration" fork="yes" failonerror="true">
+ <classpath refid="maven.runtime.classpath" />
+ <arg value="${project.build.directory}/assembly" />
+ <arg value="gsh-wsgen.properties" />
</java>
- <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration"
- fork="yes" failonerror="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg value="${project.build.directory}/assembly"/>
- <arg value="gsh-cxf-tools.properties"/>
+ <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration" fork="yes" failonerror="true">
+ <classpath refid="maven.runtime.classpath" />
+ <arg value="${project.build.directory}/assembly" />
+ <arg value="gsh-cxf-tools.properties" />
</java>
</tasks>
</configuration>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty7-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty7-minimal/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty7-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty7-minimal/pom.xml Mon Aug 17 17:33:51 2009
@@ -83,9 +83,9 @@
<!--</goals>-->
<!--<configuration>-->
<!--<tasks>-->
- <!--<mkdir dir="${project.build.directory}/assembly"/>-->
+ <!--<mkdir dir="${project.build.directory}/assembly" />-->
<!--<copy todir="${project.build.directory}/assembly">-->
- <!--<fileset dir="${project.build.directory}/geronimo-framework-${version}"/>-->
+ <!--<fileset dir="${project.build.directory}/geronimo-framework-${version}" />-->
<!--</copy>-->
<!--</tasks>-->
<!--</configuration>-->
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Mon Aug 17 17:33:51 2009
@@ -58,17 +58,15 @@
</goals>
<configuration>
<tasks>
- <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration"
- fork="yes" failonerror="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg value="${project.build.directory}/assembly"/>
- <arg value="gsh-wsgen.properties"/>
+ <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration" fork="yes" failonerror="true">
+ <classpath refid="maven.runtime.classpath" />
+ <arg value="${project.build.directory}/assembly" />
+ <arg value="gsh-wsgen.properties" />
</java>
- <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration"
- fork="yes" failonerror="true">
- <classpath refid="maven.runtime.classpath"/>
- <arg value="${project.build.directory}/assembly"/>
- <arg value="gsh-cxf-tools.properties"/>
+ <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration" fork="yes" failonerror="true">
+ <classpath refid="maven.runtime.classpath" />
+ <arg value="${project.build.directory}/assembly" />
+ <arg value="gsh-cxf-tools.properties" />
</java>
</tasks>
</configuration>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml Mon Aug 17 17:33:51 2009
@@ -83,9 +83,9 @@
<!--</goals>-->
<!--<configuration>-->
<!--<tasks>-->
- <!--<mkdir dir="${project.build.directory}/assembly"/>-->
+ <!--<mkdir dir="${project.build.directory}/assembly" />-->
<!--<copy todir="${project.build.directory}/assembly">-->
- <!--<fileset dir="${project.build.directory}/geronimo-framework-${version}"/>-->
+ <!--<fileset dir="${project.build.directory}/geronimo-framework-${version}" />-->
<!--</copy>-->
<!--</tasks>-->
<!--</configuration>-->
Modified: geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/pom.xml Mon Aug 17 17:33:51 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><project>
+<?xml version="1.0"?><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">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/pom.xml Mon Aug 17 17:33:51 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0"?><project>
+<?xml version="1.0"?><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">
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
Modified: geronimo/server/trunk/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/pom.xml Mon Aug 17 17:33:51 2009
@@ -204,7 +204,7 @@
<category>Geronimo Core</category>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
<artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system//car">org.apache.geronimo.framework/client-system/${version}/car</artifact-alias>
<artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-system/${version}/car">org.apache.geronimo.framework/client-system/${version}/car</artifact-alias>
</plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/geronimo-boilerplate/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-boilerplate/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-boilerplate/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-boilerplate/pom.xml Mon Aug 17 17:33:51 2009
@@ -196,7 +196,7 @@
<configuration>
<tasks>
<echo>Copying README, and RELEASE_NOTES txt files ${project.basedir}/../.. to underlay - ${project.build.outputDirectory}/contents</echo>
- <copy todir="${project.build.outputDirectory}/contents" failonerror="true" overwrite="true" >
+ <copy todir="${project.build.outputDirectory}/contents" failonerror="true" overwrite="true">
<fileset dir="${project.basedir}/../..">
<include name="README.txt" />
<include name="RELEASE_NOTES-${pom.version}.txt" />
@@ -217,10 +217,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}">
- <include name="**"/>
+ <include name="**" />
</fileset>
</copy>
</tasks>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml Mon Aug 17 17:33:51 2009
@@ -123,7 +123,7 @@
<attribute name="remoteDeployAddress">http://#{RemoteDeployHostname}:#{HTTPPort + PortOffset}</attribute>
</gbean>
</config-xml-content>
- <config-xml-content server="offline"/>
+ <config-xml-content server="offline" />
<config-substitution key="RemoteDeployHostname">localhost</config-substitution>
<copy-file dest-dir="schema">schema/schemaorg_apache_xmlbeans/src/</copy-file>
</plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-javaee-deployment_1.1MR3_spec/pom.xml Mon Aug 17 17:33:51 2009
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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">
<parent>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>configs</artifactId>
@@ -63,7 +63,7 @@
<deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Classloaders</category>
<instance>
- <plugin-artifact></plugin-artifact>
+ <plugin-artifact />
</instance>
</configuration>
</plugin>
Modified: geronimo/server/trunk/framework/configs/gshell-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-framework/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/gshell-framework/pom.xml Mon Aug 17 17:33:51 2009
@@ -72,7 +72,7 @@
</deploymentConfigs>
<deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Geronimo Core</category>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/trunk/framework/configs/gshell-geronimo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-geronimo/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-geronimo/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/gshell-geronimo/pom.xml Mon Aug 17 17:33:51 2009
@@ -89,7 +89,7 @@
</deploymentConfigs>
<deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Geronimo Core</category>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/trunk/framework/configs/gshell-remote/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-remote/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-remote/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/gshell-remote/pom.xml Mon Aug 17 17:33:51 2009
@@ -74,7 +74,7 @@
</deploymentConfigs>
<deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
<category>Geronimo Core</category>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Mon Aug 17 17:33:51 2009
@@ -263,7 +263,7 @@
<classpathPrefix>../lib</classpathPrefix>
<category>Geronimo Core</category>
- <config-xml-content load = "false"/>
+ <config-xml-content load="false" />
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml Mon Aug 17 17:33:51 2009
@@ -135,7 +135,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/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml Mon Aug 17 17:33:51 2009
@@ -185,7 +185,7 @@
<category>Deployment</category>
<instance>
<plugin-artifact>
- <config-xml-content server="jsr88" load="false"/>
+ <config-xml-content server="jsr88" load="false" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/framework/configs/offline-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/offline-deployer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/offline-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/offline-deployer/pom.xml Mon Aug 17 17:33:51 2009
@@ -60,7 +60,7 @@
<category>Deployment</category>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Mon Aug 17 17:33:51 2009
@@ -207,7 +207,7 @@
<category>Deployment</category>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/framework/configs/plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/plugin/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/plugin/pom.xml Mon Aug 17 17:33:51 2009
@@ -62,7 +62,7 @@
<!--<artifactId>geronimo-deploy-jsr88</artifactId>-->
<!--<version>${version}</version>-->
<!--</dependency>-->
- <!---->
+
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.framework</groupId>-->
<!--<artifactId>geronimo-deploy-config</artifactId>-->
Modified: geronimo/server/trunk/framework/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/pom.xml Mon Aug 17 17:33:51 2009
@@ -135,7 +135,7 @@
<category>Geronimo Core</category>
\ <instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml Mon Aug 17 17:33:51 2009
@@ -78,7 +78,7 @@
<category>Deployment</category>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml Mon Aug 17 17:33:51 2009
@@ -1,54 +1,54 @@
-<?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: 613699 $ $Date: 2008-01-20 14:50:35 -0800 (Sun, 20 Jan 2008) $ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>modules</artifactId>
- <version>2.2-SNAPSHOT</version>
- </parent>
-
- <artifactId>geronimo-cli</artifactId>
- <name>Geronimo Framework, Modules :: CLI</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.testsupport</groupId>
- <artifactId>testsupport-common</artifactId>
- <version>${version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</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: 613699 $ $Date: 2008-01-20 14:50:35 -0800 (Sun, 20 Jan 2008) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>modules</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>geronimo-cli</artifactId>
+ <name>Geronimo Framework, Modules :: CLI</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.testsupport</groupId>
+ <artifactId>testsupport-common</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
+
Modified: geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml Mon Aug 17 17:33:51 2009
@@ -101,7 +101,7 @@
<configuration>
<extractors>
<classComponentDescriptorExtractor>
- <gleaner implementation="org.codehaus.plexus.cdc.gleaner.AnnotationComponentGleaner"/>
+ <gleaner implementation="org.codehaus.plexus.cdc.gleaner.AnnotationComponentGleaner" />
</classComponentDescriptorExtractor>
</extractors>
</configuration>
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml Mon Aug 17 17:33:51 2009
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev: 493181 $ $Date: 2007-01-06 07:32:03 +1100 (Sat, 06 Jan 2007) $ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>modules</artifactId>
- <version>2.2-SNAPSHOT</version>
- </parent>
-
- <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
- <name>Geronimo Framework, Modules :: Deploy JSR-88 Bootstrapper</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
- </dependency>
- </dependencies>
-
-</project>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev: 493181 $ $Date: 2007-01-06 07:32:03 +1100 (Sat, 06 Jan 2007) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>modules</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
+ <name>Geronimo Framework, Modules :: Deploy JSR-88 Bootstrapper</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
+
Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml Mon Aug 17 17:33:51 2009
@@ -89,17 +89,17 @@
</goals>
<configuration>
<tasks>
- <delete dir="${project.build.directory}/tmp"/>
- <mkdir dir="${project.build.directory}/tmp"/>
+ <delete dir="${project.build.directory}/tmp" />
+ <mkdir dir="${project.build.directory}/tmp" />
- <mkdir dir="${project.build.directory}/m1"/>
+ <mkdir dir="${project.build.directory}/m1" />
<copy todir="${project.build.directory}/m1">
- <fileset dir="${basedir}/src/test/repo/m1"/>
+ <fileset dir="${basedir}/src/test/repo/m1" />
</copy>
- <mkdir dir="${project.build.directory}/m2"/>
+ <mkdir dir="${project.build.directory}/m2" />
<copy todir="${project.build.directory}/m2">
- <fileset dir="${basedir}/src/test/repo/m2"/>
+ <fileset dir="${basedir}/src/test/repo/m2" />
</copy>
</tasks>
</configuration>
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml Mon Aug 17 17:33:51 2009
@@ -18,7 +18,7 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Mon Aug 17 17:33:51 2009
@@ -149,19 +149,17 @@
<configuration>
<tasks>
<tstamp>
- <format property="build.year" pattern="yyyy"/>
+ <format property="build.year" pattern="yyyy" />
</tstamp>
- <mkdir dir="${project.build.outputDirectory}/org/apache/geronimo/system/serverinfo"/>
+ <mkdir dir="${project.build.outputDirectory}/org/apache/geronimo/system/serverinfo" />
- <propertyfile
- file="${project.build.outputDirectory}/org/apache/geronimo/system/serverinfo/geronimo-version.properties"
- comment="Geronimo version information (generated, do not modify)">
-
- <entry key="version" value="${version}"/>
- <entry key="build.date" type="date" value="now" pattern="yyyy.MM.dd"/>
- <entry key="build.time" type="date" value="now" pattern="HH:mm:ss.SSSZ"/>
- <entry key="copyright" value="Copyright (C) 2003-${build.year}, The Apache Software Foundation"/>
+ <propertyfile file="${project.build.outputDirectory}/org/apache/geronimo/system/serverinfo/geronimo-version.properties" comment="Geronimo version information (generated, do not modify)">
+
+ <entry key="version" value="${version}" />
+ <entry key="build.date" type="date" value="now" pattern="yyyy.MM.dd" />
+ <entry key="build.time" type="date" value="now" pattern="HH:mm:ss.SSSZ" />
+ <entry key="copyright" value="Copyright (C) 2003-${build.year}, The Apache Software Foundation" />
</propertyfile>
</tasks>
</configuration>
Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml Mon Aug 17 17:33:51 2009
@@ -116,9 +116,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/activemq/geronimo-activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml Mon Aug 17 17:33:51 2009
@@ -204,7 +204,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/plugins/axis2/axis2-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml Mon Aug 17 17:33:51 2009
@@ -75,8 +75,8 @@
</dependencies>
<instance>
<plugin-artifact>
- <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')"/>
- <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')"/>
+ <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')" />
+ <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml Mon Aug 17 17:33:51 2009
@@ -84,8 +84,8 @@
</dependencies>
<instance>
<plugin-artifact>
- <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')"/>
- <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')"/>
+ <config-xml-content server="default" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')" />
+ <config-xml-content server="offline" condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2' or (props['org.apache.geronimo.jaxws.provider'] == null and webcontainerName == 'tomcat6')" />
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-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/axis2/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/pom.xml Mon Aug 17 17:33:51 2009
@@ -168,7 +168,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/axis2/geronimo-axis2-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml Mon Aug 17 17:33:51 2009
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>axis2</artifactId>
- <version>2.2-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis2-builder</artifactId>
- <name>Geronimo Plugins, AXIS2 :: Builder</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jaxws-deployer</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>axis2</artifactId>
- <type>car</type>
- <version>${version}</version>
- </dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-jaxws-builder</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
-
- <!-- xbean-finder, g-service-builder comes transitively from this -->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-j2ee-builder</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
- <!---->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-naming-builder</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-axis2</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- </dependency>
-
- </dependencies>
-
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>axis2</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-axis2-builder</artifactId>
+ <name>Geronimo Plugins, AXIS2 :: Builder</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jaxws-deployer</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>axis2</artifactId>
+ <type>car</type>
+ <version>${version}</version>
+ </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-jaxws-builder</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--</dependency>-->
+
+ <!-- xbean-finder, g-service-builder comes transitively from this -->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-j2ee-builder</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-naming-builder</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--</dependency>-->
+
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.modules</groupId>-->
+ <!--<artifactId>geronimo-axis2</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--</dependency>-->
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
Modified: geronimo/server/trunk/plugins/classloaders/geronimo-schema-jee_5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/classloaders/geronimo-schema-jee_5/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/classloaders/geronimo-schema-jee_5/pom.xml (original)
+++ geronimo/server/trunk/plugins/classloaders/geronimo-schema-jee_5/pom.xml Mon Aug 17 17:33:51 2009
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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">
<parent>
<artifactId>classloaders</artifactId>
<groupId>org.apache.geronimo.plugins.classloaders</groupId>
@@ -51,7 +51,7 @@
</deploymentConfigs>
<category>Classloaders</category>
<instance>
- <plugin-artifact/>
+ <plugin-artifact />
</instance>
</configuration>
</plugin>
Modified: geronimo/server/trunk/plugins/classloaders/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/classloaders/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/classloaders/pom.xml (original)
+++ geronimo/server/trunk/plugins/classloaders/pom.xml Mon Aug 17 17:33:51 2009
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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">
<parent>
<artifactId>plugins</artifactId>
<groupId>org.apache.geronimo.plugins</groupId>
Modified: geronimo/server/trunk/plugins/classloaders/xbean-finder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/classloaders/xbean-finder/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/classloaders/xbean-finder/pom.xml (original)
+++ geronimo/server/trunk/plugins/classloaders/xbean-finder/pom.xml Mon Aug 17 17:33:51 2009
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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">
<parent>
<artifactId>classloaders</artifactId>
<groupId>org.apache.geronimo.plugins.classloaders</groupId>
@@ -45,7 +45,7 @@
</deploymentConfigs>
<category>Classloaders</category>
<instance>
- <plugin-artifact/>
+ <plugin-artifact />
</instance>
</configuration>
</plugin>
Modified: geronimo/server/trunk/plugins/client/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-deployer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client-deployer/pom.xml Mon Aug 17 17:33:51 2009
@@ -120,8 +120,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/client/client-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-security/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-security/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client-security/pom.xml Mon Aug 17 17:33:51 2009
@@ -75,7 +75,7 @@
</useMavenDependencies>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
<artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-security//car">org.apache.geronimo.configs/client-security/${version}/car</artifact-alias>
<artifact-alias server="client" key="org.apache.geronimo.framework/j2ee-security/${version}/car">org.apache.geronimo.configs/client-security/${version}/car</artifact-alias>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/client/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/client/pom.xml Mon Aug 17 17:33:51 2009
@@ -150,7 +150,7 @@
<category>Geronimo Core</category>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
<artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-server//car">org.apache.geronimo.configs/client/${version}/car</artifact-alias>
<artifact-alias server="client" key="org.apache.geronimo.configs/j2ee-server/${version}/car">org.apache.geronimo.configs/client/${version}/car</artifact-alias>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/clustering-test/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>
Modified: geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering-it/pom.xml Mon Aug 17 17:33:51 2009
@@ -15,8 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--><!-- $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/clustering/geronimo-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml Mon Aug 17 17:33:51 2009
@@ -18,8 +18,7 @@
<!-- $Rev: 613667 $ $Date: 2008-01-20 12:18:37 -0800 (Sun, 20 Jan 2008) $ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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/clustering/geronimo-plugin-farm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml Mon Aug 17 17:33:51 2009
@@ -70,16 +70,11 @@
<configuration>
<tasks>
<path id="cp">
- <!--<path refid="maven.test.classpath"/>-->
- <path refid="maven.compile.classpath"/>
- <path refid="maven.dependency.classpath"
- />
+ <!--<path refid="maven.test.classpath" />-->
+ <path refid="maven.compile.classpath" />
+ <path refid="maven.dependency.classpath" />
</path>
- <java
-
- classname="org.apache.openjpa.enhance.PCEnhancer"
- classpathref="cp"
- dir="target/classes" fork="true">
+ <java classname="org.apache.openjpa.enhance.PCEnhancer" classpathref="cp" dir="target/classes" fork="true">
</java>
</tasks>
</configuration>
Modified: geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml Mon Aug 17 17:33:51 2009
@@ -87,7 +87,7 @@
<attribute name="port">${MulticastDiscoveryPort}</attribute>
</gbean>
</config-xml-content>
- <config-substitution key="NodeName"></config-substitution>
+ <config-substitution key="NodeName" />
<config-substitution key="ClusterName">cluster1</config-substitution>
<config-substitution key="MulticastDiscoveryAddress">239.255.3.2</config-substitution>
<config-substitution key="MulticastDiscoveryPort">6142</config-substitution>
Modified: geronimo/server/trunk/plugins/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/pom.xml Mon Aug 17 17:33:51 2009
@@ -15,8 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--><!-- $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/clustering/wadi-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/wadi-clustering/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>
Modified: geronimo/server/trunk/plugins/concurrent/concurrent-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/concurrent/concurrent-deployer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/concurrent/concurrent-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/concurrent/concurrent-deployer/pom.xml Mon Aug 17 17:33:51 2009
@@ -80,8 +80,8 @@
<category>Core</category>
<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/connector/client-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/client-transaction/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/client-transaction/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/client-transaction/pom.xml Mon Aug 17 17:33:51 2009
@@ -102,7 +102,7 @@
<category>Geronimo Core</category>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
<artifact-alias server="client" key="org.apache.geronimo.configs/transaction//car">org.apache.geronimo.configs/client-transaction/${version}/car</artifact-alias>
<artifact-alias server="client" key="org.apache.geronimo.configs/transaction/${version}/car">org.apache.geronimo.configs/client-transaction/${version}/car</artifact-alias>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml Mon Aug 17 17:33:51 2009
@@ -149,7 +149,7 @@
</attribute>
</gbean>
</config-xml-content>
- <config-xml-content server="offline"/>
+ <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/connector/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml Mon Aug 17 17:33:51 2009
@@ -109,7 +109,7 @@
<phase>process-test-resources</phase>
<configuration>
<tasks>
- <ant antfile="${pom.basedir}/src/test/script/test-setup.xml"/>
+ <ant antfile="${pom.basedir}/src/test/script/test-setup.xml" />
</tasks>
</configuration>
<goals>
Modified: geronimo/server/trunk/plugins/connector/transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/transaction/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/transaction/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector/transaction/pom.xml Mon Aug 17 17:33:51 2009
@@ -132,7 +132,7 @@
<config-substitution key="TmId">71,84,77,73,68</config-substitution>
<config-substitution key="ResourceBindingsFormat">{groupId}/{artifactId}/{j2eeType}/{name}</config-substitution>
<config-substitution key="ResourceBindingsNameInNamespace">jca:</config-substitution>
- <config-substitution key="ResourceBindingsNamePattern"></config-substitution>
+ <config-substitution key="ResourceBindingsNamePattern" />
<config-substitution key="ResourceBindingsQuery">?#org.apache.geronimo.naming.ResourceSource</config-substitution>
</plugin-artifact>
</instance>
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml Mon Aug 17 17:33:51 2009
@@ -125,9 +125,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/console/console-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml Mon Aug 17 17:33:51 2009
@@ -98,9 +98,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/console/plugin-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml Mon Aug 17 17:33:51 2009
@@ -182,9 +182,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/corba/client-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml Mon Aug 17 17:33:51 2009
@@ -176,7 +176,7 @@
<category>Geronimo Core</category>
<instance>
<plugin-artifact>
- <config-xml-content load="false"/>
+ <config-xml-content load="false" />
<artifact-alias server="client" key="${groupId}/${artifactId}//car">${groupId}/${artifactId}/${version}/car</artifact-alias>
</plugin-artifact>
</instance>
Modified: geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml Mon Aug 17 17:33:51 2009
@@ -84,8 +84,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/cxf/cxf-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml?rev=805062&r1=805061&r2=805062&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-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>