You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/01/08 05:17:59 UTC

svn commit: r1056616 - in /cxf/branches/2.3.x-fixes: ./ distribution/src/main/release/bin/

Author: dkulp
Date: Sat Jan  8 04:17:58 2011
New Revision: 1056616

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

........
  r1056615 | dkulp | 2011-01-07 23:17:05 -0500 (Fri, 07 Jan 2011) | 1 line
  
  [CXF-3165] Minor updates to bat files
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    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.bat
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/java2ws.bat
    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.bat
    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.bat
    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.bat
    cxf/branches/2.3.x-fixes/distribution/src/main/release/bin/xsd2wsdl.bat

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

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

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=1056616&r1=1056615&r2=1056616&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 Sat Jan  8 04:17:58 2011
@@ -30,13 +30,13 @@ if not defined CXF_HOME goto set_cxf_hom
 :cont
 if not defined JAVA_HOME goto no_java_home
 
-set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
+set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar;
 
 if not exist "%CXF_HOME%\lib\cxf-manifest.jar" goto no_cxf_jar
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%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 %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%TOOLS_JAR%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.corba.IDLToWSDL %*
 
 @endlocal
 
@@ -47,7 +47,7 @@ echo ERROR: Unable to find cxf-manifest.
 goto end
 
 :no_java_home
-echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
+echo ERROR: Set JAVA_HOME to the path where the JDK (5.0 or higher) is installed
 goto end 
 
 :set_cxf_home

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=1056616&r1=1056615&r2=1056616&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 Sat Jan  8 04:17:58 2011
@@ -30,13 +30,13 @@ if not defined CXF_HOME goto set_cxf_hom
 :cont
 if not defined JAVA_HOME goto no_java_home
 
-set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
+set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar;
 
 if not exist "%CXF_HOME%\lib\cxf-manifest.jar" goto no_cxf_jar
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%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 %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%TOOLS_JAR%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.java2js.JavaToJS %*
 
 @endlocal
 
@@ -47,7 +47,7 @@ echo ERROR: Unable to find cxf-manifest.
 goto end
 
 :no_java_home
-echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
+echo ERROR: Set JAVA_HOME to the path where the JDK (5.0 or higher) is installed
 goto end 
 
 :set_cxf_home

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=1056616&r1=1056615&r2=1056616&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 Sat Jan  8 04:17:58 2011
@@ -30,13 +30,13 @@ if not defined CXF_HOME goto set_cxf_hom
 :cont
 if not defined JAVA_HOME goto no_java_home
 
-set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
+set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar;
 
 if not exist "%CXF_HOME%\lib\cxf-manifest.jar" goto no_cxf_jar
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%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 %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%TOOLS_JAR%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.java2ws.JavaToWS %*
 
 @endlocal
 
@@ -47,7 +47,7 @@ echo ERROR: Unable to find cxf-manifest.
 goto end
 
 :no_java_home
-echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
+echo ERROR: Set JAVA_HOME to the path where the JDK (5.0 or higher) is installed
 goto end 
 
 :set_cxf_home

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=1056616&r1=1056615&r2=1056616&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 Sat Jan  8 04:17:58 2011
@@ -30,14 +30,14 @@ if not defined CXF_HOME goto set_cxf_hom
 :cont
 if not defined JAVA_HOME goto no_java_home
 
-set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
+set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar;
 
 if not exist "%CXF_HOME%\lib\cxf-manifest.jar" goto no_cxf_jar
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
 
-"%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 %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%TOOLS_JAR%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.corba.WSDLToIDL %*
 
 @endlocal
 
@@ -48,7 +48,7 @@ echo ERROR: Unable to find cxf-manifest.
 goto end
 
 :no_java_home
-echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
+echo ERROR: Set JAVA_HOME to the path where the JDK (5.0 or higher) is installed
 goto end 
 
 :set_cxf_home

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=1056616&r1=1056615&r2=1056616&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 Sat Jan  8 04:17:58 2011
@@ -30,14 +30,14 @@ if not defined CXF_HOME goto set_cxf_hom
 :cont
 if not defined JAVA_HOME goto no_java_home
 
-set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
+set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar;
 
 if not exist "%CXF_HOME%\lib\cxf-manifest.jar" goto no_cxf_jar
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
 
-"%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 %*
+"%JAVA_HOME%\bin\java" -Xmx128M -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%TOOLS_JAR%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.wsdlto.WSDLToJava %*
 
 @endlocal
 
@@ -48,7 +48,7 @@ echo ERROR: Unable to find cxf-manifest.
 goto end
 
 :no_java_home
-echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
+echo ERROR: Set JAVA_HOME to the path where the JDK (5.0 or higher) is installed
 goto end 
 
 :set_cxf_home

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=1056616&r1=1056615&r2=1056616&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 Sat Jan  8 04:17:58 2011
@@ -30,13 +30,13 @@ if not defined CXF_HOME goto set_cxf_hom
 :cont
 if not defined JAVA_HOME goto no_java_home
 
-set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
+set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar;
 
 if not exist "%CXF_HOME%\lib\cxf-manifest.jar" goto no_cxf_jar
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%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 %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%TOOLS_JAR%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.misc.WSDLToService %*
 
 @endlocal
 
@@ -47,7 +47,7 @@ echo ERROR: Unable to find cxf-manifest.
 goto end
 
 :no_java_home
-echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
+echo ERROR: Set JAVA_HOME to the path where the JDK (5.0 or higher) is installed
 goto end 
 
 :set_cxf_home

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=1056616&r1=1056615&r2=1056616&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 Sat Jan  8 04:17:58 2011
@@ -30,13 +30,13 @@ if not defined CXF_HOME goto set_cxf_hom
 :cont
 if not defined JAVA_HOME goto no_java_home
 
-set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
+set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar;
 
 if not exist "%CXF_HOME%\lib\cxf-manifest.jar" goto no_cxf_jar
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%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 %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%TOOLS_JAR%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.misc.WSDLToSoap %*
 
 @endlocal
 
@@ -47,7 +47,7 @@ echo ERROR: Unable to find cxf-manifest.
 goto end
 
 :no_java_home
-echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
+echo ERROR: Set JAVA_HOME to the path where the JDK (5.0 or higher) is installed
 goto end 
 
 :set_cxf_home

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=1056616&r1=1056615&r2=1056616&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 Sat Jan  8 04:17:58 2011
@@ -30,13 +30,13 @@ if not defined CXF_HOME goto set_cxf_hom
 :cont
 if not defined JAVA_HOME goto no_java_home
 
-set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
+set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar;
 
 if not exist "%CXF_HOME%\lib\cxf-manifest.jar" goto no_cxf_jar
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%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 %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%TOOLS_JAR%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.misc.WSDLToXML %*
 
 @endlocal
 
@@ -47,7 +47,7 @@ echo ERROR: Unable to find cxf-manifest.
 goto end
 
 :no_java_home
-echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
+echo ERROR: Set JAVA_HOME to the path where the JDK (5.0 or higher) is installed
 goto end 
 
 :set_cxf_home

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=1056616&r1=1056615&r2=1056616&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 Sat Jan  8 04:17:58 2011
@@ -29,13 +29,13 @@ if not defined CXF_HOME goto set_cxf_hom
 :cont
 if not defined JAVA_HOME goto no_java_home
 
-set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
+set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar;
 
 if not exist "%CXF_HOME%\lib\cxf-manifest.jar" goto no_cxf_jar
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%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 %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%TOOLS_JAR%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.validator.WSDLValidator %*
 
 @endlocal
 
@@ -46,7 +46,7 @@ echo ERROR: Unable to find cxf.jar in %c
 goto end
 
 :no_java_home
-echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
+echo ERROR: Set JAVA_HOME to the path where the JDK (5.0 or higher) is installed
 goto end 
 
 :set_cxf_home

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=1056616&r1=1056615&r2=1056616&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 Sat Jan  8 04:17:58 2011
@@ -30,13 +30,13 @@ if not defined CXF_HOME goto set_cxf_hom
 :cont
 if not defined JAVA_HOME goto no_java_home
 
-set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
+set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar;
 
 if not exist "%CXF_HOME%\lib\cxf-manifest.jar" goto no_cxf_jar
 
 set CXF_JAR=%CXF_HOME%\lib\cxf-manifest.jar
 
-"%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 %*
+"%JAVA_HOME%\bin\java" -Djava.endorsed.dirs="%CXF_HOME%\lib\endorsed" -cp "%CXF_JAR%;%TOOLS_JAR%;%CLASSPATH%" -Djava.util.logging.config.file="%CXF_HOME%\etc\logging.properties" org.apache.cxf.tools.misc.XSDToWSDL %*
 
 @endlocal
 
@@ -47,7 +47,7 @@ echo ERROR: Unable to find cxf-manifest.
 goto end
 
 :no_java_home
-echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
+echo ERROR: Set JAVA_HOME to the path where the JDK (5.0 or higher) is installed
 goto end 
 
 :set_cxf_home