Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 78052 invoked from network); 15 Nov 2010 18:08:24 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Nov 2010 18:08:24 -0000 Received: (qmail 69752 invoked by uid 500); 15 Nov 2010 18:08:56 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 69670 invoked by uid 500); 15 Nov 2010 18:08:55 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 69662 invoked by uid 99); 15 Nov 2010 18:08:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Nov 2010 18:08:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Nov 2010 18:08:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1D5FC238899C; Mon, 15 Nov 2010 18:07:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101115180739.1D5FC238899C@eris.apache.org> 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 @@ true ${project.version} - ${jaxb22.version} - ${jaxb22.impl.version} - ${jaxb22.impl.version} + ${cxf.jaxb22.version} + ${cxf.jaxb22.impl.version} + ${cxf.jaxb22.impl.version} @@ -312,7 +312,11 @@ - cxf-${project.version}.jar + + + + 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 + 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 @@ 1.0.1 ${project.build.directory}/sample-libs + + javax.xml.bind + jaxb-api + ${cxf.jaxb22.version} + ${project.build.directory}/libs/endorsed + + + org.apache.geronimo.specs + geronimo-jaxws_2.2_spec + ${cxf.specs.jaxws.api.version} + ${project.build.directory}/libs/endorsed + 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 @@ + target/libs/endorsed + apache-cxf-${cxf.version}/lib/endorsed + + **/* + + + manifest/target apache-cxf-${cxf.version}/lib 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 @@ + @@ -99,6 +100,9 @@ + + + @@ -115,7 +119,8 @@ - + + @@ -187,6 +192,7 @@ + @@ -236,6 +242,7 @@ + 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 @@ 1.1 5.4.1 10.2.2.0 - 2.1 - 2.1.13 - 2.1.13 + + 2.1 + 2.1.13 + 2.1.13 2.2.1 2.2.1.1 2.2.1.1 + + + ${cxf.jaxb21.version} + ${cxf.jaxb21.impl.version} + ${cxf.jaxb21.xjc.version} + + 1.0 + 1.0 7.2.0.v20101020 2010.1 @@ -264,7 +273,7 @@ ${basedir}/target/test-classes/logging.properties ${basedir}/target/ActiveMQ/ ${basedir}/target/derby - ${spring.validation.mode} + ${cxf.spring.validation.mode} ${cxf.server.launcher.vmargs} sjsxp - com.sun.xml.stream - sjsxp - 1.0.1 + com.sun.xml.stream + sjsxp + 1.0.1 @@ -1358,17 +1367,17 @@ and the Java 5 versions get picked up instead --> jaxpri - com.sun.xml.parsers - jaxp-ri - 1.4.2 + com.sun.xml.parsers + jaxp-ri + 1.4.2 axis2-saaj - org.apache.axis2 - axis2-saaj - 1.4.1 + org.apache.axis2 + axis2-saaj + 1.4.1 @@ -1384,7 +1393,7 @@ nospringvalidation - VALIDATION_NONE + VALIDATION_NONE @@ -1523,7 +1532,7 @@ spring2 - 2.5.6.SEC02 + 2.5.6.SEC02