cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1026366 - in /cxf/branches/2.3.x-fixes: ./ api/ common/common/ parent/ rt/bindings/corba/ rt/bindings/soap/ rt/databinding/aegis/ rt/databinding/jaxb/ rt/databinding/sdo/ rt/databinding/xmlbeans/ rt/frontend/jaxrs/ rt/frontend/jaxws/ rt/fr...
Date Fri, 22 Oct 2010 15:21:20 GMT
Author: dkulp
Date: Fri Oct 22 15:21:06 2010
New Revision: 1026366

URL: http://svn.apache.org/viewvc?rev=1026366&view=rev
Log:
Merged revisions 1023597,1023739,1023803,1023841,1023884 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1023597 | bimargulies | 2010-10-17 19:25:56 -0400 (Sun, 17 Oct 2010) | 1 line
  
  CXF-3051: modify all POM props to start with cxf.
........
  r1023739 | bimargulies | 2010-10-18 07:12:26 -0400 (Mon, 18 Oct 2010) | 1 line
  
  CXF-3051: missed an edit error
........
  r1023803 | dkulp | 2010-10-18 09:57:26 -0400 (Mon, 18 Oct 2010) | 1 line
  
  Fix property that was renamed
........
  r1023841 | bimargulies | 2010-10-18 11:19:27 -0400 (Mon, 18 Oct 2010) | 1 line
  
  CXF-3051: missed an edit error
........
  r1023884 | dkulp | 2010-10-18 12:18:28 -0400 (Mon, 18 Oct 2010) | 1 line
  
  Fix pmd setup in eclipse for SDO
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/api/pom.xml
    cxf/branches/2.3.x-fixes/common/common/pom.xml
    cxf/branches/2.3.x-fixes/parent/pom.xml
    cxf/branches/2.3.x-fixes/pom.xml
    cxf/branches/2.3.x-fixes/rt/bindings/corba/pom.xml
    cxf/branches/2.3.x-fixes/rt/bindings/soap/pom.xml
    cxf/branches/2.3.x-fixes/rt/databinding/aegis/pom.xml
    cxf/branches/2.3.x-fixes/rt/databinding/jaxb/pom.xml
    cxf/branches/2.3.x-fixes/rt/databinding/sdo/pom.xml
    cxf/branches/2.3.x-fixes/rt/databinding/xmlbeans/pom.xml
    cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml
    cxf/branches/2.3.x-fixes/rt/frontend/jaxws/pom.xml
    cxf/branches/2.3.x-fixes/rt/frontend/simple/pom.xml
    cxf/branches/2.3.x-fixes/rt/javascript/pom.xml
    cxf/branches/2.3.x-fixes/rt/management-web/pom.xml
    cxf/branches/2.3.x-fixes/rt/transports/http-jetty/pom.xml
    cxf/branches/2.3.x-fixes/rt/transports/http-osgi/pom.xml
    cxf/branches/2.3.x-fixes/rt/transports/http/pom.xml
    cxf/branches/2.3.x-fixes/rt/ws/rm/pom.xml
    cxf/branches/2.3.x-fixes/rt/ws/security/pom.xml
    cxf/branches/2.3.x-fixes/systests/databinding/pom.xml
    cxf/branches/2.3.x-fixes/systests/jaxrs/pom.xml
    cxf/branches/2.3.x-fixes/systests/jaxws/pom.xml
    cxf/branches/2.3.x-fixes/systests/transports/pom.xml
    cxf/branches/2.3.x-fixes/systests/uncategorized/pom.xml
    cxf/branches/2.3.x-fixes/systests/ws-specs/pom.xml
    cxf/branches/2.3.x-fixes/tools/corba/pom.xml
    cxf/branches/2.3.x-fixes/tools/javato/ws/pom.xml
    cxf/branches/2.3.x-fixes/tools/validator/pom.xml
    cxf/branches/2.3.x-fixes/tools/wsdlto/core/pom.xml
    cxf/branches/2.3.x-fixes/tools/wsdlto/misc/pom.xml
    cxf/branches/2.3.x-fixes/tools/wsdlto/test/pom.xml

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1023597-1023803,1023841-1023884

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Oct 22 15:21:06 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023804,1023971-1023973,1024006,1024070,1024487,1024489,1025679,1025683,1025804,1026341
+/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023597-1026352

Modified: cxf/branches/2.3.x-fixes/api/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/api/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/api/pom.xml Fri Oct 22 15:21:06 2010
@@ -6,9 +6,9 @@
   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
@@ -254,8 +254,8 @@
                     <artifactId>geronimo-annotation_1.0_spec</artifactId>
                 </dependency>
                 <dependency>
-                    <groupId>${stax.impl.groupId}</groupId>
-                    <artifactId>${stax.impl.artifactId}</artifactId>
+                    <groupId>${cxf.stax.impl.groupId}</groupId>
+                    <artifactId>${cxf.stax.impl.artifactId}</artifactId>
                 </dependency>
             </dependencies>
         </profile>

Modified: cxf/branches/2.3.x-fixes/common/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/common/common/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/common/common/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/common/common/pom.xml Fri Oct 22 15:21:06 2010
@@ -6,9 +6,9 @@
     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
@@ -103,7 +103,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
-            <version>${spring.version}</version>
+            <version>${cxf.spring.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -113,13 +113,13 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-             <groupId>${stax.impl.groupId}</groupId>
-             <artifactId>${stax.impl.artifactId}</artifactId>
+             <groupId>${cxf.stax.impl.groupId}</groupId>
+             <artifactId>${cxf.stax.impl.artifactId}</artifactId>
              <scope>runtime</scope>
          </dependency>
 
         <dependency>
-            <!-- this is probably not quite what we want in terms of the behavior of the other tests 
+            <!-- this is probably not quite what we want in terms of the behavior of the other tests
                  than the schema surgery test. -->
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
@@ -178,8 +178,8 @@
                     <scope>test</scope>
                 </dependency>
                 <dependency>
-                    <groupId>${saaj.impl.groupId}</groupId>
-                    <artifactId>${saaj.impl.artifactId}</artifactId>
+                    <groupId>${cxf.saaj.impl.groupId}</groupId>
+                    <artifactId>${cxf.saaj.impl.artifactId}</artifactId>
                     <scope>test</scope>
                 </dependency>
                 <dependency>

Modified: cxf/branches/2.3.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/parent/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/parent/pom.xml Fri Oct 22 15:21:06 2010
@@ -33,55 +33,55 @@
     <packaging>pom</packaging>
 
     <properties>
-        <surefire.fork.mode>once</surefire.fork.mode>
-        <surefire.format>brief</surefire.format>
-        <surefire.usefile>false</surefire.usefile>
-        <surefire.parallel.mode />
-        <surefire.fork.vmargs>-ea</surefire.fork.vmargs>
-        <server.launcher.vmargs>-ea</server.launcher.vmargs>
-        <compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
-        <compile.show.deprecation>true</compile.show.deprecation>
-
-        <eclipse.outputDirectory>${basedir}/target/classes</eclipse.outputDirectory>
-        <saaj.impl.groupId>com.sun.xml.messaging.saaj</saaj.impl.groupId>
-        <saaj.impl.artifactId>saaj-impl</saaj.impl.artifactId>
-        <saaj.impl.version>1.3.2</saaj.impl.version>
+        <cxf.surefire.fork.mode>once</cxf.surefire.fork.mode>
+        <cxf.surefire.format>brief</cxf.surefire.format>
+        <cxf.surefire.usefile>false</cxf.surefire.usefile>
+        <cxf.surefire.parallel.mode />
+        <cxf.surefire.fork.vmargs>-ea</cxf.surefire.fork.vmargs>
+        <cxf.server.launcher.vmargs>-ea</cxf.server.launcher.vmargs>
+        <cxf.compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</cxf.compile.flags>
+        <cxf.compile.show.deprecation>true</cxf.compile.show.deprecation>
+
+        <cxf.eclipse.outputDirectory>${basedir}/target/classes</cxf.eclipse.outputDirectory>
+        <cxf.saaj.impl.groupId>com.sun.xml.messaging.saaj</cxf.saaj.impl.groupId>
+        <cxf.saaj.impl.artifactId>saaj-impl</cxf.saaj.impl.artifactId>
+        <cxf.saaj.impl.version>1.3.2</cxf.saaj.impl.version>
 
         <!-- please maintain alphabetical order here -->
-        <abdera.version>1.1</abdera.version>
-        <activemq.version>5.4.1</activemq.version>
-        <derby.version>10.2.2.0</derby.version>
-        <jaxb.version>2.1</jaxb.version>
-        <jaxb.impl.version>2.1.13</jaxb.impl.version>
-        <jaxb.xjc.version>2.1.13</jaxb.xjc.version>
-        <jaxb22.version>2.2.1</jaxb22.version>
-        <jaxb22.impl.version>2.2.1.1</jaxb22.impl.version>
-        <jaxb22.xjc.version>2.2.1.1</jaxb22.xjc.version>
-        <jdom.version>1.0</jdom.version>
-        <jetty.version>7.1.6.v20100715</jetty.version>
-        <msv.version>2010.1</msv.version>
-        <rhino.version>1.7R1</rhino.version>
-        <saaj.version>1.3</saaj.version>
-        <servlet-api.group>org.apache.geronimo.specs</servlet-api.group>
-        <servlet-api.artifact>geronimo-servlet_3.0_spec</servlet-api.artifact>
-        <servlet-api.version>1.0</servlet-api.version>
-        <spring.version>3.0.4.RELEASE</spring.version>
-        <spring.mock>spring-test</spring.mock>
-        <stax.impl.groupId>org.codehaus.woodstox</stax.impl.groupId>
-        <stax.impl.artifactId>woodstox-core-asl</stax.impl.artifactId>
-        <stax.impl.version>4.0.8</stax.impl.version>
-        <wsdl4j.version>1.6.2</wsdl4j.version>
-        <xmlbeans.version>2.4.0</xmlbeans.version>
-        <xmlschema.version>1.4.7</xmlschema.version>
-        <checkstyle.extension />
+        <cxf.abdera.version>1.1</cxf.abdera.version>
+        <cxf.activemq.version>5.4.1</cxf.activemq.version>
+        <cxf.derby.version>10.2.2.0</cxf.derby.version>
+        <cxf.jaxb.version>2.1</cxf.jaxb.version>
+        <cxf.jaxb.impl.version>2.1.13</cxf.jaxb.impl.version>
+        <cxf.jaxb.xjc.version>2.1.13</cxf.jaxb.xjc.version>
+        <cxf.jaxb22.version>2.2.1</cxf.jaxb22.version>
+        <cxf.jaxb22.impl.version>2.2.1.1</cxf.jaxb22.impl.version>
+        <cxf.jaxb22.xjc.version>2.2.1.1</cxf.jaxb22.xjc.version>
+        <cxf.jdom.version>1.0</cxf.jdom.version>
+        <cxf.jetty.version>7.1.6.v20100715</cxf.jetty.version>
+        <cxf.msv.version>2010.1</cxf.msv.version>
+        <cxf.rhino.version>1.7R1</cxf.rhino.version>
+        <cxf.saaj.version>1.3</cxf.saaj.version>
+        <cxf.servlet-api.group>org.apache.geronimo.specs</cxf.servlet-api.group>
+        <cxf.servlet-api.artifact>geronimo-servlet_3.0_spec</cxf.servlet-api.artifact>
+        <cxf.servlet-api.version>1.0</cxf.servlet-api.version>
+        <cxf.spring.version>3.0.4.RELEASE</cxf.spring.version>
+        <cxf.spring.mock>spring-test</cxf.spring.mock>
+        <cxf.stax.impl.groupId>org.codehaus.woodstox</cxf.stax.impl.groupId>
+        <cxf.stax.impl.artifactId>woodstox-core-asl</cxf.stax.impl.artifactId>
+        <cxf.stax.impl.version>4.0.8</cxf.stax.impl.version>
+        <cxf.wsdl4j.version>1.6.2</cxf.wsdl4j.version>
+        <cxf.xmlbeans.version>2.4.0</cxf.xmlbeans.version>
+        <cxf.xmlschema.version>1.4.7</cxf.xmlschema.version>
+        <cxf.checkstyle.extension />
 
-        <spring.validation.mode>VALIDATION_AUTO</spring.validation.mode>
+        <cxf.spring.validation.mode>VALIDATION_AUTO</cxf.spring.validation.mode>
 
-        <downloadSources>true</downloadSources>
+        <cxf.downloadSources>true</cxf.downloadSources>
 
-        <pmd.eclipse.ruleset>cxf-pmd-ruleset.xml</pmd.eclipse.ruleset>
+        <cxf.pmd.eclipse.ruleset>cxf-pmd-ruleset.xml</cxf.pmd.eclipse.ruleset>
 
-        <resources.base.path />
+        <cxf.resources.base.path />
 
     </properties>
 
@@ -140,7 +140,7 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-eclipse-plugin</artifactId>
                     <configuration>
-                        <outputDirectory>${eclipse.outputDirectory}</outputDirectory>
+                        <outputDirectory>${cxf.eclipse.outputDirectory}</outputDirectory>
                         <buildcommands>
                             <java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
                             <java.lang.String>net.sf.eclipsecs.core.CheckstyleBuilder</java.lang.String>
@@ -155,7 +155,7 @@
                         <additionalConfig>
                             <file>
                                 <name>.checkstyle</name>
-                                <location>/cxf-eclipse-checkstyle${checkstyle.extension}</location>
+                                <location>/cxf-eclipse-checkstyle${cxf.checkstyle.extension}</location>
                             </file>
                             <file>
                                 <name>.pmd</name>
@@ -163,7 +163,7 @@
                             </file>
                             <file>
                                 <name>.ruleset</name>
-                                <location>/${pmd.eclipse.ruleset}</location>
+                                <location>/${cxf.pmd.eclipse.ruleset}</location>
                             </file>
                         </additionalConfig>
                     </configuration>
@@ -187,11 +187,11 @@
                             <id>validate</id>
                             <phase>validate</phase>
                             <configuration>
-                                <configLocation>${resources.base.path}cxf-checkstyle${checkstyle.extension}.xml</configLocation>
+                                <configLocation>${cxf.resources.base.path}cxf-checkstyle${cxf.checkstyle.extension}.xml</configLocation>
                                 <consoleOutput>true</consoleOutput>
                                 <failsOnError>true</failsOnError>
                                 <linkXRef>false</linkXRef>
-                                <suppressionsLocation>${resources.base.path}cxf-checkstyle-suppressions.xml</suppressionsLocation>
+                                <suppressionsLocation>${cxf.resources.base.path}cxf-checkstyle-suppressions.xml</suppressionsLocation>
                                 <sourceDirectory>${basedir}/src</sourceDirectory>
                                 <excludes>**/archetype-resources/**/*.java</excludes>
                             </configuration>
@@ -214,8 +214,8 @@
                     </dependencies>
                     <configuration>
                         <rulesets>
-                            <ruleset>${resources.base.path}cxf-pmd-ruleset.xml</ruleset>
-                            <ruleset>${resources.base.path}cxf-pmd-custom.xml</ruleset>
+                            <ruleset>${cxf.resources.base.path}cxf-pmd-ruleset.xml</ruleset>
+                            <ruleset>${cxf.resources.base.path}cxf-pmd-custom.xml</ruleset>
                         </rulesets>
                         <sourceEncoding>UTF-8</sourceEncoding>
                         <targetJdk>1.5</targetJdk>
@@ -251,12 +251,12 @@
                             <exclude>**/*$*</exclude>
                         </excludes>
                         <!--disableXmlReport>true</disableXmlReport-->
-                        <reportFormat>${surefire.format}</reportFormat>
-                        <useFile>${surefire.usefile}</useFile>
-                        <forkMode>${surefire.fork.mode}</forkMode>
+                        <reportFormat>${cxf.surefire.format}</reportFormat>
+                        <useFile>${cxf.surefire.usefile}</useFile>
+                        <forkMode>${cxf.surefire.fork.mode}</forkMode>
                         <childDelegation>false</childDelegation>
-                        <argLine>${surefire.fork.vmargs}</argLine>
-                        <parallel>${surefire.parallel.mode}</parallel>
+                        <argLine>${cxf.surefire.fork.vmargs}</argLine>
+                        <parallel>${cxf.surefire.parallel.mode}</parallel>
                         <systemPropertyVariables>
                                 <useRandomPorts>true</useRandomPorts>
                                 <cxf.validateServiceSchemas>${cxf.validateServices}</cxf.validateServiceSchemas>
@@ -265,7 +265,7 @@
                                 <org.apache.activemq.default.directory.prefix>${basedir}/target/ActiveMQ/</org.apache.activemq.default.directory.prefix>
                                 <derby.system.home>${basedir}/target/derby</derby.system.home>
                                 <spring.validation.mode>${spring.validation.mode}</spring.validation.mode>
-                                <server.launcher.vmargs>${server.launcher.vmargs}</server.launcher.vmargs>
+                                <server.launcher.vmargs>${cxf.server.launcher.vmargs}</server.launcher.vmargs>
                                 <!-- If we close the port after a client in the same JVM has opened a keep-alive
                                 connection, on some Linux's, the socket remains consumed until
                                 some timeout occurs.   That may cause some tests to timeout/hang. -->
@@ -503,9 +503,9 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>${stax.impl.groupId}</groupId>
-                <artifactId>${stax.impl.artifactId}</artifactId>
-                <version>${stax.impl.version}</version>
+                <groupId>${cxf.stax.impl.groupId}</groupId>
+                <artifactId>${cxf.stax.impl.artifactId}</artifactId>
+                <version>${cxf.stax.impl.version}</version>
                 <!-- these are motivated by Woodstox, but they can't hurt with others. -->
                 <exclusions>
                     <exclusion>
@@ -533,7 +533,7 @@
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-server</artifactId>
-                <version>${jetty.version}</version>
+                <version>${cxf.jetty.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.servlet</groupId>
@@ -544,12 +544,12 @@
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-webapp</artifactId>
-                <version>${jetty.version}</version>
+                <version>${cxf.jetty.version}</version>
 	    </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-servlet</artifactId>
-                <version>${jetty.version}</version>
+                <version>${cxf.jetty.version}</version>
 	    </dependency>
             <dependency>
                 <groupId>xalan</groupId>
@@ -565,7 +565,7 @@
             <dependency>
                 <groupId>org.apache.ws.commons.schema</groupId>
                 <artifactId>XmlSchema</artifactId>
-                <version>${xmlschema.version}</version>
+                <version>${cxf.xmlschema.version}</version>
                 <exclusions>
                     <!-- on IBM jdk, XmlSchema pulls these in -->
                     <exclusion>
@@ -581,7 +581,7 @@
             <dependency>
                 <groupId>javax.xml.soap</groupId>
                 <artifactId>saaj-api</artifactId>
-                <version>${saaj.version}</version>
+                <version>${cxf.saaj.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.activation</groupId>
@@ -596,7 +596,7 @@
             <dependency>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
-                <version>${jaxb.version}</version>
+                <version>${cxf.jaxb.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.xml.bind</groupId>
@@ -617,9 +617,9 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>${saaj.impl.groupId}</groupId>
-                <artifactId>${saaj.impl.artifactId}</artifactId>
-                <version>${saaj.impl.version}</version>
+                <groupId>${cxf.saaj.impl.groupId}</groupId>
+                <artifactId>${cxf.saaj.impl.artifactId}</artifactId>
+                <version>${cxf.saaj.impl.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.activation</groupId>
@@ -635,7 +635,7 @@
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
-                <version>${jaxb.impl.version}</version>
+                <version>${cxf.jaxb.impl.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.xml.bind</groupId>
@@ -662,17 +662,17 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-jms</artifactId>
-                <version>${spring.version}</version>
+                <version>${cxf.spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-tx</artifactId>
-                <version>${spring.version}</version>
+                <version>${cxf.spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
-                <version>${spring.version}</version>
+                <version>${cxf.spring.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>log4j</groupId>
@@ -695,7 +695,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-beans</artifactId>
-                <version>${spring.version}</version>
+                <version>${cxf.spring.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>log4j</groupId>
@@ -718,7 +718,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context</artifactId>
-                <version>${spring.version}</version>
+                <version>${cxf.spring.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>log4j</groupId>
@@ -741,7 +741,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-web</artifactId>
-                <version>${spring.version}</version>
+                <version>${cxf.spring.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>log4j</groupId>
@@ -764,7 +764,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-webmvc</artifactId>
-                <version>${spring.version}</version>
+                <version>${cxf.spring.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>log4j</groupId>
@@ -787,7 +787,7 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-aop</artifactId>
-                <version>${spring.version}</version>
+                <version>${cxf.spring.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>log4j</groupId>
@@ -888,8 +888,8 @@
 
             <dependency>
                 <groupId>org.springframework</groupId>
-                <artifactId>${spring.mock}</artifactId>
-                <version>${spring.version}</version>
+                <artifactId>${cxf.spring.mock}</artifactId>
+                <version>${cxf.spring.version}</version>
             </dependency>
 
             <dependency>
@@ -943,12 +943,12 @@
             <dependency>
                 <groupId>wsdl4j</groupId>
                 <artifactId>wsdl4j</artifactId>
-                <version>${wsdl4j.version}</version>
+                <version>${cxf.wsdl4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-xjc</artifactId>
-                <version>${jaxb.xjc.version}</version>
+                <version>${cxf.jaxb.xjc.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.xml.bind</groupId>
@@ -971,9 +971,9 @@
                 <version>1.1.1</version>
             </dependency>
             <dependency>
-                <groupId>${servlet-api.group}</groupId>
-                <artifactId>${servlet-api.artifact}</artifactId>
-                <version>${servlet-api.version}</version>
+                <groupId>${cxf.servlet-api.group}</groupId>
+                <artifactId>${cxf.servlet-api.artifact}</artifactId>
+                <version>${cxf.servlet-api.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -1018,7 +1018,7 @@
             <dependency>
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>activemq-core</artifactId>
-                <version>${activemq.version}</version>
+                <version>${cxf.activemq.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.geronimo.specs</groupId>
@@ -1029,12 +1029,12 @@
             <dependency>
                 <groupId>rhino</groupId>
                 <artifactId>js</artifactId>
-                <version>${rhino.version}</version>
+                <version>${cxf.rhino.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.xmlbeans</groupId>
                 <artifactId>xmlbeans</artifactId>
-                <version>${xmlbeans.version}</version>
+                <version>${cxf.xmlbeans.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>stax</groupId>
@@ -1061,7 +1061,7 @@
             <dependency>
                 <groupId>org.apache.abdera</groupId>
                 <artifactId>abdera-core</artifactId>
-                <version>${abdera.version}</version>
+                <version>${cxf.abdera.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.geronimo.specs</groupId>
@@ -1076,7 +1076,7 @@
             <dependency>
                 <groupId>org.apache.abdera</groupId>
                 <artifactId>abdera-extensions-json</artifactId>
-                <version>${abdera.version}</version>
+                <version>${cxf.abdera.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.servlet</groupId>
@@ -1107,7 +1107,7 @@
             <dependency>
                 <groupId>org.apache.abdera</groupId>
                 <artifactId>abdera-parser</artifactId>
-                <version>${abdera.version}</version>
+                <version>${cxf.abdera.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.geronimo.specs</groupId>
@@ -1273,7 +1273,7 @@
             <dependency>
                 <groupId>net.java.dev.msv</groupId>
                 <artifactId>msv-core</artifactId>
-                <version>${msv.version}</version>
+                <version>${cxf.msv.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -1301,7 +1301,7 @@
                 <version>2.6</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
-                    <configLocation>cxf-checkstyle${checkstyle.extension}.xml</configLocation>
+                    <configLocation>cxf-checkstyle${cxf.checkstyle.extension}.xml</configLocation>
                     <consoleOutput>true</consoleOutput>
                     <failsOnError>true</failsOnError>
                     <linkXRef>false</linkXRef>
@@ -1320,9 +1320,9 @@
                 <jdk>1.5</jdk>
             </activation>
             <properties>
-                <jaxb.version>${jaxb22.version}</jaxb.version>
-                <jaxb.impl.version>${jaxb22.impl.version}</jaxb.impl.version>
-                <jaxb.xjc.version>${jaxb22.impl.version}</jaxb.xjc.version>
+                <jaxb.version>${cxf.jaxb22.version}</jaxb.version>
+                <jaxb.impl.version>${cxf.jaxb22.impl.version}</jaxb.impl.version>
+                <jaxb.xjc.version>${cxf.jaxb22.impl.version}</jaxb.xjc.version>
                 <jdk.version>1.5</jdk.version>
             </properties>
         </profile>
@@ -1402,9 +1402,9 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
                         <configuration>
-                            <showDeprecation>${compile.show.deprecation}</showDeprecation>
+                            <showDeprecation>${cxf.compile.show.deprecation}</showDeprecation>
                             <showWarnings>true</showWarnings>
-                            <compilerArgument>${compile.flags}</compilerArgument>
+                            <compilerArgument>${cxf.compile.flags}</compilerArgument>
                         </configuration>
                     </plugin>
                     <plugin>
@@ -1417,7 +1417,7 @@
         <profile>
             <id>set.eclipse.output</id>
             <properties>
-                <eclipse.outputDirectory>${basedir}/eclipse-classes</eclipse.outputDirectory>
+                <cxf.eclipse.outputDirectory>${basedir}/eclipse-classes</cxf.eclipse.outputDirectory>
             </properties>
         </profile>
 
@@ -1439,7 +1439,7 @@
                         <configuration>
                             <showDeprecation>true</showDeprecation>
                             <showWarnings>true</showWarnings>
-                            <compilerArgument>${compile.flags}</compilerArgument>
+                            <compilerArgument>${cxf.compile.flags}</compilerArgument>
                         </configuration>
                     </plugin>
                     <plugin>
@@ -1498,7 +1498,7 @@
                         <configuration>
                             <showDeprecation>true</showDeprecation>
                             <showWarnings>true</showWarnings>
-                            <compilerArgument>${compile.flags}</compilerArgument>
+                            <compilerArgument>${cxf.compile.flags}</compilerArgument>
                             <fork>true</fork>
                             <maxmem>512M</maxmem>
                         </configuration>

Modified: cxf/branches/2.3.x-fixes/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/pom.xml Fri Oct 22 15:21:06 2010
@@ -41,10 +41,10 @@
     </prerequisites>
 
     <properties>
-        <compiler.fork>false</compiler.fork>
+        <cxf.compiler.fork>false</cxf.compiler.fork>
         <cxf.build-utils.version>2.3.0</cxf.build-utils.version>
         <cxf.xjc-utils.version>2.3.0</cxf.xjc-utils.version>
-        <jdk.version>1.6</jdk.version>
+        <cxf.jdk.version>1.6</cxf.jdk.version>
     </properties>
 
     <distributionManagement>
@@ -209,10 +209,10 @@
                             <artifactId>maven-compiler-plugin</artifactId>
                             <version>2.3.2</version>
                             <configuration>
-                                <source>${jdk.version}</source>
-                                <target>${jdk.version}</target>
+                                <source>${cxf.jdk.version}</source>
+                                <target>${cxf.jdk.version}</target>
                                 <maxmem>256M</maxmem>
-                                <fork>${compiler.fork}</fork>
+                                <fork>${cxf.compiler.fork}</fork>
                             </configuration>
                         </plugin>
                     </plugins>
@@ -506,7 +506,7 @@
                         <source>1.5</source>
                         <target>1.5</target>
                         <maxmem>256M</maxmem>
-                        <fork>${compiler.fork}</fork>
+                        <fork>${cxf.compiler.fork}</fork>
                         <encoding>UTF-8</encoding>
                     </configuration>
                 </plugin>

Modified: cxf/branches/2.3.x-fixes/rt/bindings/corba/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/bindings/corba/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/bindings/corba/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/bindings/corba/pom.xml Fri Oct 22 15:21:06 2010
@@ -32,7 +32,7 @@
     </parent>
 
     <properties>
-        <checkstyle.extension>-corba</checkstyle.extension>
+        <cxf.checkstyle.extension>-corba</cxf.checkstyle.extension>
     </properties>
 
     <dependencies>

Modified: cxf/branches/2.3.x-fixes/rt/bindings/soap/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/bindings/soap/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/bindings/soap/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/bindings/soap/pom.xml Fri Oct 22 15:21:06 2010
@@ -6,9 +6,9 @@
   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
@@ -145,8 +145,8 @@
                     <artifactId>jaxb-api</artifactId>
                 </dependency>
                 <dependency>
-                    <groupId>${saaj.impl.groupId}</groupId>
-                    <artifactId>${saaj.impl.artifactId}</artifactId>
+                    <groupId>${cxf.saaj.impl.groupId}</groupId>
+                    <artifactId>${cxf.saaj.impl.artifactId}</artifactId>
                     <optional>true</optional>
                 </dependency>
             </dependencies>

Modified: cxf/branches/2.3.x-fixes/rt/databinding/aegis/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/databinding/aegis/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/databinding/aegis/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/databinding/aegis/pom.xml Fri Oct 22 15:21:06 2010
@@ -7,9 +7,9 @@
   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
@@ -86,7 +86,7 @@
         <dependency>
             <groupId>jdom</groupId>
             <artifactId>jdom</artifactId>
-            <version>${jdom.version}</version>
+            <version>${cxf.jdom.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: cxf/branches/2.3.x-fixes/rt/databinding/jaxb/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/databinding/jaxb/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/databinding/jaxb/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/databinding/jaxb/pom.xml Fri Oct 22 15:21:06 2010
@@ -6,9 +6,9 @@
   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
@@ -86,7 +86,7 @@
             <artifactId>cxf-rt-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-       
+
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>
@@ -129,8 +129,8 @@
                   </dependency>
 
                   <dependency>
-                      <groupId>${stax.impl.groupId}</groupId>
-                      <artifactId>${stax.impl.artifactId}</artifactId>
+                      <groupId>${cxf.stax.impl.groupId}</groupId>
+                      <artifactId>${cxf.stax.impl.artifactId}</artifactId>
                   </dependency>
 
              </dependencies>

Modified: cxf/branches/2.3.x-fixes/rt/databinding/sdo/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/databinding/sdo/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/databinding/sdo/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/databinding/sdo/pom.xml Fri Oct 22 15:21:06 2010
@@ -6,9 +6,9 @@
   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
@@ -31,9 +31,9 @@
     </parent>
 
     <properties>
-        <pmd.eclipse.ruleset>cxf-pmd-ruleset-generated.xml</pmd.eclipse.ruleset>
-        <compile.flags>-Xlint:unchecked,fallthrough,finally</compile.flags>
-        <compile.show.deprecation>false</compile.show.deprecation>
+        <cxf.pmd.eclipse.ruleset>cxf-pmd-ruleset-generated.xml</cxf.pmd.eclipse.ruleset>
+        <cxf.compile.flags>-Xlint:unchecked,fallthrough,finally</cxf.compile.flags>
+        <cxf.compile.show.deprecation>false</cxf.compile.show.deprecation>
     </properties>
 
     <dependencies>
@@ -68,8 +68,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${stax.impl.groupId}</groupId>
-            <artifactId>${stax.impl.artifactId}</artifactId>
+            <groupId>${cxf.stax.impl.groupId}</groupId>
+            <artifactId>${cxf.stax.impl.artifactId}</artifactId>
         </dependency>
 
         <dependency>

Modified: cxf/branches/2.3.x-fixes/rt/databinding/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/databinding/xmlbeans/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/databinding/xmlbeans/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/databinding/xmlbeans/pom.xml Fri Oct 22 15:21:06 2010
@@ -6,9 +6,9 @@
   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
@@ -60,7 +60,7 @@
             <artifactId>cxf-tools-common</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+
 
 
         <dependency>
@@ -180,8 +180,8 @@
                     <artifactId>geronimo-stax-api_1.0_spec</artifactId>
                 </dependency>
                 <dependency>
-                    <groupId>${stax.impl.groupId}</groupId>
-                    <artifactId>${stax.impl.artifactId}</artifactId>
+                    <groupId>${cxf.stax.impl.groupId}</groupId>
+                    <artifactId>${cxf.stax.impl.artifactId}</artifactId>
                 </dependency>
             </dependencies>
         </profile>

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml Fri Oct 22 15:21:06 2010
@@ -6,9 +6,9 @@
   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
@@ -94,24 +94,24 @@
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-core</artifactId>
-            <version>${abdera.version}</version>
+            <version>${cxf.abdera.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-parser</artifactId>
-            <version>${abdera.version}</version>
+            <version>${cxf.abdera.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-extensions-json</artifactId>
-            <version>${abdera.version}</version>
+            <version>${cxf.abdera.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>${servlet-api.group}</groupId>
-            <artifactId>${servlet-api.artifact}</artifactId>
+            <groupId>${cxf.servlet-api.group}</groupId>
+            <artifactId>${cxf.servlet-api.artifact}</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/pom.xml Fri Oct 22 15:21:06 2010
@@ -6,9 +6,9 @@
   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
@@ -33,7 +33,7 @@
     </parent>
 
     <properties>
-        <spi-dir>spi-2.1</spi-dir>
+        <cxf.spi-dir>spi-2.1</cxf.spi-dir>
     </properties>
     <dependencies>
         <dependency>
@@ -53,10 +53,10 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>                                                      
-             <groupId>xml-resolver</groupId>                               
+        <dependency>
+             <groupId>xml-resolver</groupId>
              <artifactId>xml-resolver</artifactId>
-         </dependency> 
+         </dependency>
 
         <dependency>
             <groupId>asm</groupId>
@@ -110,13 +110,13 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <scope>provided</scope>
-            <version>${spring.version}</version>
+            <version>${cxf.spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
             <scope>provided</scope>
-            <version>${spring.version}</version>
+            <version>${cxf.spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -139,10 +139,10 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${servlet-api.group}</groupId>
-            <artifactId>${servlet-api.artifact}</artifactId>
+            <groupId>${cxf.servlet-api.group}</groupId>
+            <artifactId>${cxf.servlet-api.artifact}</artifactId>
             <scope>provided</scope>
-        </dependency>        
+        </dependency>
     </dependencies>
 
     <build>
@@ -172,7 +172,7 @@
                          <configuration>
                              <resources>
                                  <resource>
-                                     <directory>${basedir}/src/main/${spi-dir}</directory>
+                                     <directory>${basedir}/src/main/${cxf.spi-dir}</directory>
                                  </resource>
                              </resources>
                          </configuration>
@@ -287,7 +287,7 @@
                 <jdk>1.5</jdk>
             </activation>
             <properties>
-                <spi-dir>spi-2.2</spi-dir>
+                <cxf.spi-dir>spi-2.2</cxf.spi-dir>
             </properties>
             <dependencies>
                 <dependency>
@@ -299,8 +299,8 @@
                     <artifactId>geronimo-annotation_1.0_spec</artifactId>
                 </dependency>
                 <dependency>
-                    <groupId>${stax.impl.groupId}</groupId>
-                    <artifactId>${stax.impl.artifactId}</artifactId>
+                    <groupId>${cxf.stax.impl.groupId}</groupId>
+                    <artifactId>${cxf.stax.impl.artifactId}</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>javax.xml.soap</groupId>
@@ -315,8 +315,8 @@
                      <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
                  </dependency>
                  <dependency>
-                     <groupId>${saaj.impl.groupId}</groupId>
-                     <artifactId>${saaj.impl.artifactId}</artifactId>
+                     <groupId>${cxf.saaj.impl.groupId}</groupId>
+                     <artifactId>${cxf.saaj.impl.artifactId}</artifactId>
                  </dependency>
             </dependencies>
             <build>

Modified: cxf/branches/2.3.x-fixes/rt/frontend/simple/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/simple/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/simple/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/simple/pom.xml Fri Oct 22 15:21:06 2010
@@ -6,9 +6,9 @@
   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
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
-            <version>${spring.version}</version>
+            <version>${cxf.spring.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: cxf/branches/2.3.x-fixes/rt/javascript/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/javascript/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/javascript/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/javascript/pom.xml Fri Oct 22 15:21:06 2010
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-local</artifactId>
-            <version>${project.version}</version>            
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -65,8 +65,8 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>${spring.mock}</artifactId>
-            <version>${spring.version}</version>
+            <artifactId>${cxf.spring.mock}</artifactId>
+            <version>${cxf.spring.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -84,15 +84,15 @@
         <dependency>
            <groupId>rhino</groupId>
            <artifactId>js</artifactId>
-           <version>${rhino.version}</version>
+           <version>${cxf.rhino.version}</version>
            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>${jetty.version}</version>
+            <version>${cxf.jetty.version}</version>
            <scope>test</scope>
-        </dependency>       
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>

Modified: cxf/branches/2.3.x-fixes/rt/management-web/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/management-web/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/management-web/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/management-web/pom.xml Fri Oct 22 15:21:06 2010
@@ -6,9 +6,9 @@
   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
@@ -45,19 +45,19 @@
                 <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-core</artifactId>
-            <version>${abdera.version}</version>
+            <version>${cxf.abdera.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-parser</artifactId>
-            <version>${abdera.version}</version>
+            <version>${cxf.abdera.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-extensions-json</artifactId>
-            <version>${abdera.version}</version>
+            <version>${cxf.abdera.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -76,13 +76,13 @@
             <version>${project.version}</version>
         </dependency>
 
-        
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
         </dependency>
 
-        
+
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymockclassextension</artifactId>

Modified: cxf/branches/2.3.x-fixes/rt/transports/http-jetty/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http-jetty/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http-jetty/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http-jetty/pom.xml Fri Oct 22 15:21:06 2010
@@ -6,9 +6,9 @@
   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
@@ -55,22 +55,22 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>${jetty.version}</version>
+            <version>${cxf.jetty.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-jmx</artifactId>
-            <version>${jetty.version}</version>
+            <version>${cxf.jetty.version}</version>
             <optional>true</optional>
-        </dependency>       
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>${servlet-api.group}</groupId>
-            <artifactId>${servlet-api.artifact}</artifactId>
+            <groupId>${cxf.servlet-api.group}</groupId>
+            <artifactId>${cxf.servlet-api.artifact}</artifactId>
         </dependency>
 
         <dependency>

Modified: cxf/branches/2.3.x-fixes/rt/transports/http-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http-osgi/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http-osgi/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http-osgi/pom.xml Fri Oct 22 15:21:06 2010
@@ -6,9 +6,9 @@
   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
@@ -56,8 +56,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${servlet-api.group}</groupId>
-            <artifactId>${servlet-api.artifact}</artifactId>
+            <groupId>${cxf.servlet-api.group}</groupId>
+            <artifactId>${cxf.servlet-api.artifact}</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: cxf/branches/2.3.x-fixes/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http/pom.xml Fri Oct 22 15:21:06 2010
@@ -6,9 +6,9 @@
   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
@@ -62,10 +62,10 @@
             <artifactId>cxf-testutils</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
-        </dependency>        
+        </dependency>
         <dependency>
-            <groupId>${servlet-api.group}</groupId>
-            <artifactId>${servlet-api.artifact}</artifactId>
+            <groupId>${cxf.servlet-api.group}</groupId>
+            <artifactId>${cxf.servlet-api.artifact}</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: cxf/branches/2.3.x-fixes/rt/ws/rm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/rm/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/rm/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/ws/rm/pom.xml Fri Oct 22 15:21:06 2010
@@ -6,9 +6,9 @@
   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
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
-            <version>${derby.version}</version>
+            <version>${cxf.derby.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: cxf/branches/2.3.x-fixes/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/security/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/security/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/ws/security/pom.xml Fri Oct 22 15:21:06 2010
@@ -7,9 +7,9 @@
   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
@@ -196,8 +196,8 @@
                     <artifactId>saaj-api</artifactId>
                 </dependency>
                 <dependency>
-                    <groupId>${saaj.impl.groupId}</groupId>
-                    <artifactId>${saaj.impl.artifactId}</artifactId>
+                    <groupId>${cxf.saaj.impl.groupId}</groupId>
+                    <artifactId>${cxf.saaj.impl.artifactId}</artifactId>
                     <scope>test</scope>
                 </dependency>
             </dependencies>

Modified: cxf/branches/2.3.x-fixes/systests/databinding/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/databinding/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/databinding/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/systests/databinding/pom.xml Fri Oct 22 15:21:06 2010
@@ -142,8 +142,8 @@
     </profiles>
     <dependencies>
         <dependency>
-            <groupId>${servlet-api.group}</groupId>
-            <artifactId>${servlet-api.artifact}</artifactId>
+            <groupId>${cxf.servlet-api.group}</groupId>
+            <artifactId>${cxf.servlet-api.artifact}</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -245,8 +245,8 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>${spring.mock}</artifactId>
-            <version>${spring.version}</version>
+            <artifactId>${cxf.spring.mock}</artifactId>
+            <version>${cxf.spring.version}</version>
         </dependency>
 
         <dependency>
@@ -282,7 +282,7 @@
 
     </dependencies>
     <properties>
-        <surefire.fork.mode>pertest</surefire.fork.mode>
+        <cxf.surefire.fork.mode>pertest</cxf.surefire.fork.mode>
     </properties>
 
 </project>

Modified: cxf/branches/2.3.x-fixes/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxrs/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxrs/pom.xml Fri Oct 22 15:21:06 2010
@@ -67,17 +67,17 @@
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-core</artifactId>
-            <version>${abdera.version}</version>
+            <version>${cxf.abdera.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-parser</artifactId>
-            <version>${abdera.version}</version>
+            <version>${cxf.abdera.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.abdera</groupId>
             <artifactId>abdera-extensions-json</artifactId>
-            <version>${abdera.version}</version>
+            <version>${cxf.abdera.version}</version>
         </dependency>
         <dependency>
           <groupId>org.apache.ant</groupId>
@@ -91,14 +91,14 @@
        		<groupId>org.eclipse.jetty</groupId>
        		<artifactId>jetty-webapp</artifactId>
         </dependency>
-        <dependency>  
-           <groupId>org.eclipse.jetty</groupId>  
+        <dependency>
+           <groupId>org.eclipse.jetty</groupId>
            <artifactId>jetty-jsp-2.1</artifactId>
-           <version>${jetty.version}</version>
+           <version>${cxf.jetty.version}</version>
        </dependency>
         <dependency>
-            <groupId>${servlet-api.group}</groupId>
-            <artifactId>${servlet-api.artifact}</artifactId>
+            <groupId>${cxf.servlet-api.group}</groupId>
+            <artifactId>${cxf.servlet-api.artifact}</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -207,7 +207,7 @@
             <artifactId>cxf-rt-management-web</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
-        </dependency> 
+        </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-testsupport</artifactId>
@@ -220,17 +220,17 @@
           <version>1.0</version>
           <scope>test</scope>
         </dependency>
- 
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
-            <version>${spring.version}</version>
+            <version>${cxf.spring.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-tx</artifactId>
-            <version>${spring.version}</version>
+            <version>${cxf.spring.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -276,8 +276,8 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>${spring.mock}</artifactId>
-            <version>${spring.version}</version>
+            <artifactId>${cxf.spring.mock}</artifactId>
+            <version>${cxf.spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
@@ -344,6 +344,6 @@
         </dependency>
     </dependencies>
     <properties>
-        <surefire.fork.mode>pertest</surefire.fork.mode>
+        <cxf.surefire.fork.mode>pertest</cxf.surefire.fork.mode>
     </properties>
 </project>

Modified: cxf/branches/2.3.x-fixes/systests/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxws/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/jaxws/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/systests/jaxws/pom.xml Fri Oct 22 15:21:06 2010
@@ -84,8 +84,8 @@
     </profiles>
     <dependencies>
         <dependency>
-            <groupId>${servlet-api.group}</groupId>
-            <artifactId>${servlet-api.artifact}</artifactId>
+            <groupId>${cxf.servlet-api.group}</groupId>
+            <artifactId>${cxf.servlet-api.artifact}</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -204,7 +204,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>${spring.mock}</artifactId>
+            <artifactId>${cxf.spring.mock}</artifactId>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -236,7 +236,7 @@
         </dependency>
     </dependencies>
     <properties>
-        <surefire.fork.mode>pertest</surefire.fork.mode>
+        <cxf.surefire.fork.mode>pertest</cxf.surefire.fork.mode>
     </properties>
 
 </project>

Modified: cxf/branches/2.3.x-fixes/systests/transports/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/transports/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/transports/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/systests/transports/pom.xml Fri Oct 22 15:21:06 2010
@@ -107,8 +107,8 @@
     </profiles>
     <dependencies>
         <dependency>
-            <groupId>${servlet-api.group}</groupId>
-            <artifactId>${servlet-api.artifact}</artifactId>
+            <groupId>${cxf.servlet-api.group}</groupId>
+            <artifactId>${cxf.servlet-api.artifact}</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -218,44 +218,44 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
-            <version>${spring.version}</version>
+            <version>${cxf.spring.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <scope>test</scope>
-            <version>${spring.version}</version>
+            <version>${cxf.spring.version}</version>
         </dependency>
         <dependency>
         	<groupId>org.springframework</groupId>
         	<artifactId>spring-jms</artifactId>
             <scope>test</scope>
-        	<version>${spring.version}</version>
+        	<version>${cxf.spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-tx</artifactId>
             <scope>test</scope>
-            <version>${spring.version}</version>
+            <version>${cxf.spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
             <scope>test</scope>
-            <version>${spring.version}</version>
+            <version>${cxf.spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
             <scope>test</scope>
-            <version>${spring.version}</version>
+            <version>${cxf.spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
             <scope>test</scope>
-            <version>${spring.version}</version>
+            <version>${cxf.spring.version}</version>
         </dependency>
 
         <dependency>
@@ -301,8 +301,8 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>${spring.mock}</artifactId>
-            <version>${spring.version}</version>
+            <artifactId>${cxf.spring.mock}</artifactId>
+            <version>${cxf.spring.version}</version>
         </dependency>
 
         <dependency>
@@ -348,7 +348,7 @@
 
     </dependencies>
     <properties>
-        <surefire.fork.mode>pertest</surefire.fork.mode>
+        <cxf.surefire.fork.mode>pertest</cxf.surefire.fork.mode>
     </properties>
 
 </project>

Modified: cxf/branches/2.3.x-fixes/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/uncategorized/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/uncategorized/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/systests/uncategorized/pom.xml Fri Oct 22 15:21:06 2010
@@ -32,18 +32,18 @@
     <url>http://cxf.apache.org</url>
     <build>
         <plugins>
-            <plugin>                                                                                                          
-                <groupId>org.apache.cxf</groupId>                                                                             
-                <artifactId>cxf-codegen-plugin</artifactId>                                                                   
-                <version>${project.version}</version>                                                                         
-                <executions>                                                                                                  
-                    <execution>                                                                                               
-                        <id>generate-test-sources</id>                                                                        
-                        <phase>generate-test-sources</phase>                                                                  
-                        <configuration>                                                                                       
-                            <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>                        
-                            <testWsdlRoot>${basedir}/src/test/resources/wsdl_systest</testWsdlRoot>                           
-                            <wsdlOptions>                                                                                     
+            <plugin>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-codegen-plugin</artifactId>
+                <version>${project.version}</version>
+                <executions>
+                    <execution>
+                        <id>generate-test-sources</id>
+                        <phase>generate-test-sources</phase>
+                        <configuration>
+                            <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
+                            <testWsdlRoot>${basedir}/src/test/resources/wsdl_systest</testWsdlRoot>
+                            <wsdlOptions>
                                 <wsdlOption>
                                     <wsdl>${basedir}/src/test/resources/wsdl_systest/hello_world_corba.wsdl</wsdl>
                                 </wsdlOption>
@@ -116,8 +116,8 @@
     </profiles>
     <dependencies>
         <dependency>
-            <groupId>${servlet-api.group}</groupId>
-            <artifactId>${servlet-api.artifact}</artifactId>
+            <groupId>${cxf.servlet-api.group}</groupId>
+            <artifactId>${cxf.servlet-api.artifact}</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -259,13 +259,13 @@
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
-            <version>${derby.version}</version>
+            <version>${cxf.derby.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
-            <version>${spring.version}</version>
+            <version>${cxf.spring.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -328,8 +328,8 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>${spring.mock}</artifactId>
-            <version>${spring.version}</version>
+            <artifactId>${cxf.spring.mock}</artifactId>
+            <version>${cxf.spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
@@ -359,7 +359,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        
+
 
         <dependency>
             <groupId>org.springframework.security</groupId>
@@ -464,7 +464,7 @@
 
     </dependencies>
     <properties>
-        <surefire.fork.mode>pertest</surefire.fork.mode>
+        <cxf.surefire.fork.mode>pertest</cxf.surefire.fork.mode>
     </properties>
 
 </project>

Modified: cxf/branches/2.3.x-fixes/systests/ws-specs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/ws-specs/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/ws-specs/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/systests/ws-specs/pom.xml Fri Oct 22 15:21:06 2010
@@ -79,8 +79,8 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>${servlet-api.group}</groupId>
-            <artifactId>${servlet-api.artifact}</artifactId>
+            <groupId>${cxf.servlet-api.group}</groupId>
+            <artifactId>${cxf.servlet-api.artifact}</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -190,12 +190,12 @@
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
-            <version>${derby.version}</version>
+            <version>${cxf.derby.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
     <properties>
-        <surefire.fork.mode>pertest</surefire.fork.mode>
+        <cxf.surefire.fork.mode>pertest</cxf.surefire.fork.mode>
     </properties>
 
 </project>

Modified: cxf/branches/2.3.x-fixes/tools/corba/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/corba/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/corba/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/tools/corba/pom.xml Fri Oct 22 15:21:06 2010
@@ -69,8 +69,8 @@
             <artifactId>XmlSchema</artifactId>
         </dependency>
         <dependency>
-	    <groupId>${stax.impl.groupId}</groupId>
-	    <artifactId>${stax.impl.artifactId}</artifactId>
+	    <groupId>${cxf.stax.impl.groupId}</groupId>
+	    <artifactId>${cxf.stax.impl.artifactId}</artifactId>
         </dependency>
         <dependency>
             <groupId>wsdl4j</groupId>

Modified: cxf/branches/2.3.x-fixes/tools/javato/ws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/javato/ws/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/javato/ws/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/tools/javato/ws/pom.xml Fri Oct 22 15:21:06 2010
@@ -6,9 +6,9 @@
     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
@@ -68,7 +68,7 @@
             <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
             <version>${project.version}</version>
         </dependency>
-        
+
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -211,8 +211,8 @@
                     <artifactId>saaj-api</artifactId>
                 </dependency>
                 <dependency>
-                    <groupId>${stax.impl.groupId}</groupId>
-                    <artifactId>${stax.impl.artifactId}</artifactId>
+                    <groupId>${cxf.stax.impl.groupId}</groupId>
+                    <artifactId>${cxf.stax.impl.artifactId}</artifactId>
                     <scope>runtime</scope>
                 </dependency>
                 <dependency>

Modified: cxf/branches/2.3.x-fixes/tools/validator/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/validator/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/validator/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/tools/validator/pom.xml Fri Oct 22 15:21:06 2010
@@ -6,9 +6,9 @@
   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
@@ -112,8 +112,8 @@
                     <artifactId>geronimo-stax-api_1.0_spec</artifactId>
                 </dependency>
                 <dependency>
-                    <groupId>${stax.impl.groupId}</groupId>
-                    <artifactId>${stax.impl.artifactId}</artifactId>
+                    <groupId>${cxf.stax.impl.groupId}</groupId>
+                    <artifactId>${cxf.stax.impl.artifactId}</artifactId>
                     <scope>runtime</scope>
                 </dependency>
                 <dependency>

Modified: cxf/branches/2.3.x-fixes/tools/wsdlto/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/core/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/core/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/core/pom.xml Fri Oct 22 15:21:06 2010
@@ -6,9 +6,9 @@
     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
@@ -143,8 +143,8 @@
                     <artifactId>saaj-api</artifactId>
                 </dependency>
                 <dependency>
-                    <groupId>${stax.impl.groupId}</groupId>
-                    <artifactId>${stax.impl.artifactId}</artifactId>
+                    <groupId>${cxf.stax.impl.groupId}</groupId>
+                    <artifactId>${cxf.stax.impl.artifactId}</artifactId>
                     <scope>runtime</scope>
                 </dependency>
             </dependencies>

Modified: cxf/branches/2.3.x-fixes/tools/wsdlto/misc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/misc/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/misc/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/misc/pom.xml Fri Oct 22 15:21:06 2010
@@ -118,8 +118,8 @@
                     <artifactId>saaj-api</artifactId>
                 </dependency>
                 <dependency>
-                    <groupId>${stax.impl.groupId}</groupId>
-                    <artifactId>${stax.impl.artifactId}</artifactId>
+                    <groupId>${cxf.stax.impl.groupId}</groupId>
+                    <artifactId>${cxf.stax.impl.artifactId}</artifactId>
                     <scope>runtime</scope>
                 </dependency>
             </dependencies>

Modified: cxf/branches/2.3.x-fixes/tools/wsdlto/test/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/test/pom.xml?rev=1026366&r1=1026365&r2=1026366&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/test/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/test/pom.xml Fri Oct 22 15:21:06 2010
@@ -77,12 +77,12 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>${jetty.version}</version>
+            <version>${cxf.jetty.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${servlet-api.group}</groupId>
-            <artifactId>${servlet-api.artifact}</artifactId>
+            <groupId>${cxf.servlet-api.group}</groupId>
+            <artifactId>${cxf.servlet-api.artifact}</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -99,7 +99,7 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-xmlbeans</artifactId>



Mime
View raw message