cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1035379 - in /cxf/branches/2.3.x-fixes: ./ distribution/ distribution/manifest/ distribution/src/main/assembly/ distribution/src/main/release/bin/ distribution/src/main/release/samples/ parent/
Date Mon, 15 Nov 2010 18:07:38 GMT
Author: dkulp
Date: Mon Nov 15 18:07:37 2010
New Revision: 1035379

URL: http://svn.apache.org/viewvc?rev=1035379&view=rev
Log:
Merged revisions 1035377 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1035377 | dkulp | 2010-11-15 13:05:47 -0500 (Mon, 15 Nov 2010) | 2 lines
  
  Add endorsing of the jaxws 2.2/jaxb 2.2 stuff to the scripts and ant
  build thing.
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/distribution/manifest/pom.xml
    cxf/branches/2.3.x-fixes/distribution/pom.xml
    cxf/branches/2.3.x-fixes/distribution/src/main/assembly/bin.xml
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/idl2wsdl
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/idl2wsdl.bat
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2js
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2js.bat
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2ws
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2ws.bat
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/mc
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/mc.bat
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2corba
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2corba.bat
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2java
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2java.bat
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2js
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2js.bat
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2service
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2service.bat
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2soap
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2soap.bat
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2xml
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2xml.bat
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdlvalidator
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdlvalidator.bat
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/xsd2wsdl
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/xsd2wsdl.bat
    cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/common_build.xml
    cxf/branches/2.3.x-fixes/parent/pom.xml

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1035377

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Nov 15 18:07:37 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022155,1022157-1023401,1023420-1030540,1030542-1031074,1031076-1033529,1033531,1033533-1033888,1033890-1033925,1033927-1034174,1034637,1035203,1035206,1035220,1035302
+/cxf/trunk:1-1022155,1022157-1023401,1023420-1030540,1030542-1031074,1031076-1033529,1033531,1033533-1033888,1033890-1033925,1033927-1034174,1034637,1035203,1035206,1035220,1035302,1035377

Modified: cxf/branches/2.3.x-fixes/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/manifest/pom.xml?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/manifest/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/manifest/pom.xml Mon Nov 15 18:07:37 2010
@@ -37,9 +37,9 @@
         <maven.test.skip>true</maven.test.skip>
         <cxf.version>${project.version}</cxf.version>
 
-        <jaxb.version>${jaxb22.version}</jaxb.version>
-        <jaxb.impl.version>${jaxb22.impl.version}</jaxb.impl.version>
-        <jaxb.xjc.version>${jaxb22.impl.version}</jaxb.xjc.version>
+        <cxf.jaxb.version>${cxf.jaxb22.version}</cxf.jaxb.version>
+        <cxf.jaxb.impl.version>${cxf.jaxb22.impl.version}</cxf.jaxb.impl.version>
+        <cxf.jaxb.xjc.version>${cxf.jaxb22.impl.version}</cxf.jaxb.xjc.version>
     </properties>
 
     <dependencies>
@@ -312,7 +312,11 @@
                         </manifest>
                         <manifestEntries>
                           <!-- Add an entry for the renamed bundle jar in the distro -->
-			              <Class-Path>cxf-${project.version}.jar</Class-Path>
+                          <!-- Add entries for the stuff that needs to be endorsed on
Java6, but not on java5 -->
+                          <!-- Stick both versions of jaxb xjc/impl on classpath to make
it easier to flip back and forth -->
+			              <Class-Path>
+                          cxf-${project.version}.jar endorsed/jaxb-api-${cxf.jaxb22.version}.jar
endorsed/geronimo-jaxws_2.2_spec-${cxf.specs.jaxws.api.version}.jar jaxb-impl-${cxf.jaxb22.impl.version}.jar
jaxb-impl-${cxf.jaxb21.impl.version}.jar jaxb-xjc-${cxf.jaxb22.xjc.version}.jar jaxb-xjc-${cxf.jaxb21.xjc.version}.jar
+                          </Class-Path>
 			            </manifestEntries>
                     </archive>
                 </configuration>

Modified: cxf/branches/2.3.x-fixes/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/pom.xml?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/pom.xml Mon Nov 15 18:07:37 2010
@@ -403,6 +403,18 @@
                                     <version>1.0.1</version>
                                     <outputDirectory>${project.build.directory}/sample-libs</outputDirectory>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>javax.xml.bind</groupId>
+                                    <artifactId>jaxb-api</artifactId>
+                                    <version>${cxf.jaxb22.version}</version>
+                                    <outputDirectory>${project.build.directory}/libs/endorsed</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.specs</groupId>
+                                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+                                    <version>${cxf.specs.jaxws.api.version}</version>
+                                    <outputDirectory>${project.build.directory}/libs/endorsed</outputDirectory>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/assembly/bin.xml?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/assembly/bin.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/assembly/bin.xml Mon Nov 15 18:07:37 2010
@@ -106,6 +106,13 @@
             </includes>
         </fileSet>
         <fileSet>
+            <directory>target/libs/endorsed</directory>
+            <outputDirectory>apache-cxf-${cxf.version}/lib/endorsed</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
             <directory>manifest/target</directory>
             <outputDirectory>apache-cxf-${cxf.version}/lib</outputDirectory>
             <includes>

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/idl2wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/idl2wsdl?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/idl2wsdl (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/idl2wsdl Mon Nov 15 18:07:37
2010
@@ -67,7 +67,7 @@ else
    cxf_classpath=${cxf_jar}:${CLASSPATH}
 fi
 
-$JAVA_HOME/bin/java -cp "${cxf_classpath}" -Djava.util.logging.config.file=$log_config org.apache.cxf.tools.corba.IDLToWSDL
"$@"
+$JAVA_HOME/bin/java -Djava.endorsed.dirs="${cxf_home}/lib/endorsed" -cp "${cxf_classpath}"
-Djava.util.logging.config.file=$log_config org.apache.cxf.tools.corba.IDLToWSDL "$@"
 
 
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/idl2wsdl.bat
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/idl2wsdl.bat?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/idl2wsdl.bat (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/idl2wsdl.bat Mon Nov 15 18:07:37
2010
@@ -36,7 +36,7 @@ if not exist "%CXF_HOME%\lib\cxf-manifes
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties"
org.apache.cxf.tools.corba.IDLToWSDL %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%"
-Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.corba.IDLToWSDL
%*
 
 @endlocal
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2js
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2js?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2js (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2js Mon Nov 15 18:07:37
2010
@@ -93,4 +93,4 @@ else
   cxf_classpath=${cxf_jar}:${CLASSPATH}:${sun_tool_path}
 fi
 
-$JAVA_HOME/bin/java -cp "${cxf_classpath}" -Djava.util.logging.config.file=$log_config org.apache.cxf.tools.java2js.JavaToJS
"$@"
+$JAVA_HOME/bin/java -Djava.endorsed.dirs="${cxf_home}/lib/endorsed" -cp "${cxf_classpath}"
-Djava.util.logging.config.file=$log_config org.apache.cxf.tools.java2js.JavaToJS "$@"

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2js.bat
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2js.bat?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2js.bat (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2js.bat Mon Nov 15 18:07:37
2010
@@ -36,7 +36,7 @@ if not exist "%CXF_HOME%\lib\cxf-manifes
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties"
org.apache.cxf.tools.java2js.JavaToJS %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%"
-Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.java2js.JavaToJS
%*
 
 @endlocal
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2ws
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2ws?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2ws (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2ws Mon Nov 15 18:07:37
2010
@@ -93,4 +93,4 @@ else
   cxf_classpath=${cxf_jar}:${CLASSPATH}:${sun_tool_path}
 fi
 
-$JAVA_HOME/bin/java -cp "${cxf_classpath}" -Djava.util.logging.config.file=$log_config org.apache.cxf.tools.java2ws.JavaToWS
"$@"
+$JAVA_HOME/bin/java -Djava.endorsed.dirs="${cxf_home}/lib/endorsed" -cp "${cxf_classpath}"
-Djava.util.logging.config.file=$log_config org.apache.cxf.tools.java2ws.JavaToWS "$@"

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2ws.bat
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2ws.bat?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2ws.bat (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2ws.bat Mon Nov 15 18:07:37
2010
@@ -36,7 +36,7 @@ if not exist "%CXF_HOME%\lib\cxf-manifes
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties"
org.apache.cxf.tools.java2ws.JavaToWS %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%"
-Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.java2ws.JavaToWS
%*
 
 @endlocal
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/mc
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/mc?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/mc (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/mc Mon Nov 15 18:07:37 2010
@@ -91,7 +91,7 @@ else
   cxf_classpath=${cxf_jar}:${CLASSPATH}:${sun_tool_path}
 fi
 
-$JAVA_HOME/bin/java -cp ${cxf_classpath} -Djava.util.logging.config.file=$log_config org.apache.cxf.management.utils.ManagementConsole
"$@"
+$JAVA_HOME/bin/java -Djava.endorsed.dirs="${cxf_home}/lib/endorsed" -cp ${cxf_classpath}
-Djava.util.logging.config.file=$log_config org.apache.cxf.management.utils.ManagementConsole
"$@"
 
 
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/mc.bat
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/mc.bat?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/mc.bat (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/mc.bat Mon Nov 15 18:07:37
2010
@@ -34,7 +34,7 @@ if not exist "%CXF_HOME%\lib\cxf-manifes
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties"
org.apache.cxf.management.utils.ManagementConsole %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%CLASSPATH%"
-Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.management.utils.ManagementConsole
%*
 
 rem @endlocal
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2corba
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2corba?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2corba (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2corba Mon Nov 15 18:07:37
2010
@@ -67,7 +67,7 @@ else
    cxf_classpath=${cxf_jar}:${CLASSPATH}
 fi
 
-$JAVA_HOME/bin/java -cp "${cxf_classpath}" -Djava.util.logging.config.file=$log_config org.apache.cxf.tools.corba.WSDLToIDL
"$@"
+$JAVA_HOME/bin/java -Djava.endorsed.dirs="${cxf_home}/lib/endorsed" -cp "${cxf_classpath}"
-Djava.util.logging.config.file=$log_config org.apache.cxf.tools.corba.WSDLToIDL "$@"
 
 
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2corba.bat
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2corba.bat?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2corba.bat (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2corba.bat Mon Nov 15 18:07:37
2010
@@ -37,7 +37,7 @@ if not exist "%CXF_HOME%\lib\cxf-manifes
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
 
-"%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties"
org.apache.cxf.tools.corba.WSDLToIDL %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%"
-Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.corba.WSDLToIDL
%*
 
 @endlocal
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2java?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2java (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2java Mon Nov 15 18:07:37
2010
@@ -74,7 +74,7 @@ else
    cxf_classpath=${cxf_jar}:${CLASSPATH}:${sun_tool_path}
 fi
 
-$JAVA_HOME/bin/java -Xmx128M -cp "${cxf_classpath}" -Djava.util.logging.config.file=$log_config
org.apache.cxf.tools.wsdlto.WSDLToJava "$@"
+$JAVA_HOME/bin/java -Xmx128M -Djava.endorsed.dirs="${cxf_home}/lib/endorsed" -cp "${cxf_classpath}"
-Djava.util.logging.config.file=$log_config org.apache.cxf.tools.wsdlto.WSDLToJava "$@"
 
 
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2java.bat
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2java.bat?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2java.bat (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2java.bat Mon Nov 15 18:07:37
2010
@@ -37,7 +37,7 @@ if not exist "%CXF_HOME%\lib\cxf-manifes
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
 
-"%JAVA_HOME%\bin\java" -Xmx128M -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties"
org.apache.cxf.tools.wsdlto.WSDLToJava %*
+"%JAVA_HOME%\bin\java" -Xmx128M -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%"
-Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.wsdlto.WSDLToJava
%*
 
 @endlocal
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2js
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2js?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2js (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2js Mon Nov 15 18:07:37
2010
@@ -67,7 +67,7 @@ else
    cxf_classpath=${cxf_jar}:${CLASSPATH}
 fi
 
-$JAVA_HOME/bin/java -cp "${cxf_classpath}" -Djava.util.logging.config.file=$log_config org.apache.cxf.tools.wsdlto.javascript.WSDLToJavaScript
"$@"
+$JAVA_HOME/bin/java -Djava.endorsed.dirs="${cxf_home}/lib/endorsed" -cp "${cxf_classpath}"
-Djava.util.logging.config.file=$log_config org.apache.cxf.tools.wsdlto.javascript.WSDLToJavaScript
"$@"
 
 
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2js.bat
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2js.bat?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2js.bat (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2js.bat Mon Nov 15 18:07:37
2010
@@ -35,7 +35,7 @@ if not exist "%CXF_HOME%\lib\cxf-manifes
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
 
-"%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties"
org.apache.cxf.tools.wsdlto.javascript.WSDLToJavaScript %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%CLASSPATH%"
-Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.wsdlto.javascript.WSDLToJavaScript
%*
 
 @endlocal
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2service
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2service?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2service (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2service Mon Nov 15 18:07:37
2010
@@ -91,7 +91,7 @@ else
   cxf_classpath=${cxf_jar}:${CLASSPATH}:${sun_tool_path}
 fi
 
-$JAVA_HOME/bin/java -cp ${cxf_classpath} -Djava.util.logging.config.file=$log_config org.apache.cxf.tools.misc.WSDLToService
"$@"
+$JAVA_HOME/bin/java -Djava.endorsed.dirs="${cxf_home}/lib/endorsed" -cp ${cxf_classpath}
-Djava.util.logging.config.file=$log_config org.apache.cxf.tools.misc.WSDLToService "$@"
 
 
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2service.bat
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2service.bat?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2service.bat (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2service.bat Mon Nov 15
18:07:37 2010
@@ -36,7 +36,7 @@ if not exist "%CXF_HOME%\lib\cxf-manifes
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties"
org.apache.cxf.tools.misc.WSDLToService %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%"
-Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.misc.WSDLToService
%*
 
 @endlocal
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2soap
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2soap?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2soap (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2soap Mon Nov 15 18:07:37
2010
@@ -89,7 +89,7 @@ else
   cxf_classpath=${cxf_jar}:${CLASSPATH}:${sun_tool_path}
 fi
 
-$JAVA_HOME/bin/java -cp ${cxf_classpath} -Djava.util.logging.config.file=$log_config org.apache.cxf.tools.misc.WSDLToSoap
"$@"
+$JAVA_HOME/bin/java -Djava.endorsed.dirs="${cxf_home}/lib/endorsed" -cp ${cxf_classpath}
-Djava.util.logging.config.file=$log_config org.apache.cxf.tools.misc.WSDLToSoap "$@"
 
 
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2soap.bat
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2soap.bat?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2soap.bat (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2soap.bat Mon Nov 15 18:07:37
2010
@@ -36,7 +36,7 @@ if not exist "%CXF_HOME%\lib\cxf-manifes
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties"
org.apache.cxf.tools.misc.WSDLToSoap %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%"
-Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.misc.WSDLToSoap
%*
 
 @endlocal
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2xml?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2xml Mon Nov 15 18:07:37
2010
@@ -89,7 +89,7 @@ else
   cxf_classpath=${cxf_jar}:${CLASSPATH}:${sun_tool_path}
 fi
 
-$JAVA_HOME/bin/java -cp "${cxf_classpath}" -Djava.util.logging.config.file=$log_config org.apache.cxf.tools.misc.WSDLToXML
"$@"
+$JAVA_HOME/bin/java -Djava.endorsed.dirs="${cxf_home}/lib/endorsed" -cp "${cxf_classpath}"
-Djava.util.logging.config.file=$log_config org.apache.cxf.tools.misc.WSDLToXML "$@"
 
 
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2xml.bat
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2xml.bat?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2xml.bat (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdl2xml.bat Mon Nov 15 18:07:37
2010
@@ -36,7 +36,7 @@ if not exist "%CXF_HOME%\lib\cxf-manifes
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties"
org.apache.cxf.tools.misc.WSDLToXML %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%"
-Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.misc.WSDLToXML
%*
 
 @endlocal
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdlvalidator
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdlvalidator?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdlvalidator (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdlvalidator Mon Nov 15 18:07:37
2010
@@ -89,7 +89,7 @@ else
   cxf_classpath=${cxf_jar}:${CLASSPATH}:${sun_tool_path}
 fi
 
-$JAVA_HOME/bin/java -cp ${cxf_classpath} -Djava.util.logging.config.file=$log_config  org.apache.cxf.tools.validator.WSDLValidator
"$@"
+$JAVA_HOME/bin/java -Djava.endorsed.dirs="${cxf_home}/lib/endorsed" -cp ${cxf_classpath}
-Djava.util.logging.config.file=$log_config  org.apache.cxf.tools.validator.WSDLValidator
"$@"
 
 
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdlvalidator.bat
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdlvalidator.bat?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdlvalidator.bat (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/wsdlvalidator.bat Mon Nov 15
18:07:37 2010
@@ -35,7 +35,7 @@ if not exist "%CXF_HOME%\lib\cxf-manifes
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties"
org.apache.cxf.tools.validator.WSDLValidator %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%"
-Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.validator.WSDLValidator
%*
 
 @endlocal
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/xsd2wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/xsd2wsdl?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/xsd2wsdl (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/xsd2wsdl Mon Nov 15 18:07:37
2010
@@ -83,7 +83,7 @@ if $cygwin; then
 else
    cxf_classpath=${cxf_jar}:${CLASSPATH}:${sun_tool_path}
 fi
-$JAVA_HOME/bin/java -cp ${cxf_classpath} -Djava.util.logging.config.file=$log_config org.apache.cxf.tools.misc.XSDToWSDL
"$@"
+$JAVA_HOME/bin/java -Djava.endorsed.dirs="${cxf_home}/lib/endorsed" -cp ${cxf_classpath}
-Djava.util.logging.config.file=$log_config org.apache.cxf.tools.misc.XSDToWSDL "$@"
 
 
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/xsd2wsdl.bat
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/xsd2wsdl.bat?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/xsd2wsdl.bat (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/xsd2wsdl.bat Mon Nov 15 18:07:37
2010
@@ -36,7 +36,7 @@ if not exist "%CXF_HOME%\lib\cxf-manifes
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%JAVA_HOME%\bin\java" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties"
org.apache.cxf.tools.misc.XSDToWSDL %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%SUN_TOOL_PATH%;%CLASSPATH%"
-Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.misc.XSDToWSDL
%*
 
 @endlocal
 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/common_build.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/common_build.xml?rev=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/common_build.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/common_build.xml Mon Nov
15 18:07:37 2010
@@ -90,6 +90,7 @@
     </condition>
     <property name="cxf.home" location="../.."/>
     <property name="cxf.etc.dir" location="${cxf.home}/etc"/>
+    <property name="cxf.endorsed.dir" location="${cxf.home}/lib/endorsed"/>
 
     <path id="cxf.classpath">
         <pathelement location="${basedir}"/>
@@ -99,6 +100,9 @@
         <fileset dir="${cxf.home}/lib-samples">
             <include name="**/*.jar"/>
         </fileset>
+        <fileset dir="${cxf.endorsed.dir}">
+            <include name="**/*.jar"/>
+        </fileset>
     </path>
     <condition property="thirdparty.classpath" value="">
         <not>
@@ -115,7 +119,8 @@
         <mkdir dir="${build.classes.dir}"/>
         <mkdir dir="${build.src.dir}"/>
 
-        <javac destdir="${build.classes.dir}" debug="true">
+        <javac destdir="${build.classes.dir}" debug="true" fork="true">
+            <compilerarg line="-J-Djava.endorsed.dirs=${cxf.endorsed.dir}"/>
             <src path="${src.dir}"/>
             <src path="${build.src.dir}"/>
             <classpath>
@@ -187,6 +192,7 @@
                 <arg value="@{param4}"/>
                 <arg value="@{param5}"/>
                 <jvmarg value="-Dcxf.home=${cxf.home}"/>
+                <jvmarg value="-Djava.endorsed.dirs=${cxf.endorsed.dir}"/>
                 <jvmarg value="@{jvmarg1}"/>
                 <jvmarg value="@{jvmarg2}"/>
                 <jvmarg value="@{jvmarg3}"/>
@@ -236,6 +242,7 @@
                 </classpath>
                 <sysproperty key="java.util.logging.config.file" value="${cxf.etc.dir}/logging.properties"/>
                 <sysproperty key="exitOnFinish" value="true"/>
+                <sysproperty key="java.endorsed.dirs" value="${cxf.endorsed.dir}"/>
                 <arg line="@{servicename.arg}"/>
                 <arg line="${package.arg.@{file}}"/>
                 <arg line="${databinding.arg}"/>

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=1035379&r1=1035378&r2=1035379&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/parent/pom.xml Mon Nov 15 18:07:37 2010
@@ -51,12 +51,21 @@
         <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.jaxb21.version>2.1</cxf.jaxb21.version>
+        <cxf.jaxb21.impl.version>2.1.13</cxf.jaxb21.impl.version>
+        <cxf.jaxb21.xjc.version>2.1.13</cxf.jaxb21.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>
+
+        <!-- by default, we use jaxb 2.1, but java5 profile will override to 2.2 -->
+        <cxf.jaxb.version>${cxf.jaxb21.version}</cxf.jaxb.version>
+        <cxf.jaxb.impl.version>${cxf.jaxb21.impl.version}</cxf.jaxb.impl.version>
+        <cxf.jaxb.xjc.version>${cxf.jaxb21.xjc.version}</cxf.jaxb.xjc.version>
+
+        <cxf.specs.jaxws.api.version>1.0</cxf.specs.jaxws.api.version>
+
         <cxf.jdom.version>1.0</cxf.jdom.version>
         <cxf.jetty.version>7.2.0.v20101020</cxf.jetty.version>
         <cxf.msv.version>2010.1</cxf.msv.version>
@@ -264,7 +273,7 @@
                                 <java.util.logging.config.file>${basedir}/target/test-classes/logging.properties</java.util.logging.config.file>
                                 <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>
+                                <spring.validation.mode>${cxf.spring.validation.mode}</spring.validation.mode>
                                 <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
@@ -1023,7 +1032,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                <version>1.0</version>
+                <version>${cxf.specs.jaxws.api.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.activemq</groupId>
@@ -1330,9 +1339,9 @@
                 <jdk>1.5</jdk>
             </activation>
             <properties>
-                <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>
+                <cxf.jaxb.version>${cxf.jaxb22.version}</cxf.jaxb.version>
+                <cxf.jaxb.impl.version>${cxf.jaxb22.impl.version}</cxf.jaxb.impl.version>
+                <cxf.jaxb.xjc.version>${cxf.jaxb22.impl.version}</cxf.jaxb.xjc.version>
                 <jdk.version>1.5</jdk.version>
             </properties>
         </profile>
@@ -1348,9 +1357,9 @@
             -->
             <id>sjsxp</id>
             <properties>
-                <stax.impl.groupId>com.sun.xml.stream</stax.impl.groupId>
-                <stax.impl.artifactId>sjsxp</stax.impl.artifactId>
-                <stax.impl.version>1.0.1</stax.impl.version>
+                <cxf.stax.impl.groupId>com.sun.xml.stream</cxf.stax.impl.groupId>
+                <cxf.stax.impl.artifactId>sjsxp</cxf.stax.impl.artifactId>
+                <cxf.stax.impl.version>1.0.1</cxf.stax.impl.version>
             </properties>
         </profile>
         <profile>
@@ -1358,17 +1367,17 @@
             and the Java 5 versions get picked up instead -->
             <id>jaxpri</id>
             <properties>
-                <stax.impl.groupId>com.sun.xml.parsers</stax.impl.groupId>
-                <stax.impl.artifactId>jaxp-ri</stax.impl.artifactId>
-                <stax.impl.version>1.4.2</stax.impl.version>
+                <cxf.stax.impl.groupId>com.sun.xml.parsers</cxf.stax.impl.groupId>
+                <cxf.stax.impl.artifactId>jaxp-ri</cxf.stax.impl.artifactId>
+                <cxf.stax.impl.version>1.4.2</cxf.stax.impl.version>
             </properties>
         </profile>
         <profile>
             <id>axis2-saaj</id>
             <properties>
-                <saaj.impl.groupId>org.apache.axis2</saaj.impl.groupId>
-                <saaj.impl.artifactId>axis2-saaj</saaj.impl.artifactId>
-                <saaj.impl.version>1.4.1</saaj.impl.version>
+                <cxf.saaj.impl.groupId>org.apache.axis2</cxf.saaj.impl.groupId>
+                <cxf.saaj.impl.artifactId>axis2-saaj</cxf.saaj.impl.artifactId>
+                <cxf.saaj.impl.version>1.4.1</cxf.saaj.impl.version>
             </properties>
         </profile>
 
@@ -1384,7 +1393,7 @@
         <profile>
             <id>nospringvalidation</id>
             <properties>
-                <spring.validation.mode>VALIDATION_NONE</spring.validation.mode>
+                <cxf.spring.validation.mode>VALIDATION_NONE</cxf.spring.validation.mode>
             </properties>
         </profile>
 
@@ -1523,7 +1532,7 @@
         <profile>
             <id>spring2</id>
             <properties>
-                <spring.version>2.5.6.SEC02</spring.version>
+                <cxf.spring.version>2.5.6.SEC02</cxf.spring.version>
             </properties>
         </profile> 
         <profile>



Mime
View raw message