cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r472758 - /incubator/cxf/trunk/distribution/src/main/release/bin/
Date Thu, 09 Nov 2006 03:25:35 GMT
Author: ffang
Date: Wed Nov  8 19:25:34 2006
New Revision: 472758

URL: http://svn.apache.org/viewvc?view=rev&rev=472758
Log:
[CXF-213] Tools scripts do not check for cfx_home first

Modified:
    incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl
    incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl.bat
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java.bat
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service.bat
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap.bat
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml.bat
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator
    incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator.bat
    incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl
    incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl.bat

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl?view=diff&rev=472758&r1=472757&r2=472758
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl Wed Nov  8 19:25:34 2006
@@ -23,9 +23,13 @@
 #
 
 me=`basename $0`
-cxf_home=`dirname $0`/..
-
+cxf_home=$CXF_HOME
+if [ ! -f  $cxf_home/lib/cxf-incubator.jar ]; then
+    cxf_home=`dirname $0`/..
+fi
+                                                                                        
                                                                    
 cxf_jar=$cxf_home/lib/cxf-incubator.jar
+
 
 if [ ! -f $cxf_jar ]; then 
     if [ ! -f ${cxf_home}/../../target/srcbuild_env ]; then

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl.bat?view=diff&rev=472758&r1=472757&r2=472758
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/java2wsdl.bat Wed Nov  8 19:25:34
2006
@@ -25,8 +25,9 @@
 rem 
 @setlocal
 
-set CXF_HOME=%~dp0..
-
+if not defined CXF_HOME goto set_cxf_home
+                                                                                        
                                                                    
+:cont
 if not defined JAVA_HOME goto no_java_home
 
 set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
@@ -48,6 +49,11 @@
 :no_java_home
 echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
 goto end 
+
+:set_cxf_home
+set CXF_HOME=%~dp0..
+goto cont
+
 :end
 
 

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java?view=diff&rev=472758&r1=472757&r2=472758
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java Wed Nov  8 19:25:34 2006
@@ -23,7 +23,10 @@
 #
 
 me=`basename $0`
-cxf_home=`dirname $0`/..
+cxf_home=$CXF_HOME
+if [ ! -f  $cxf_home/lib/cxf-incubator.jar ]; then
+    cxf_home=`dirname $0`/..
+fi
 
 cxf_jar=$cxf_home/lib/cxf-incubator.jar
 

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java.bat?view=diff&rev=472758&r1=472757&r2=472758
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java.bat Wed Nov  8 19:25:34
2006
@@ -25,8 +25,9 @@
 rem 
 @setlocal
 
-set CXF_HOME=%~dp0..
-
+if not defined CXF_HOME goto set_cxf_home
+                                                                                        
                                                                    
+:cont
 if not defined JAVA_HOME goto no_java_home
 
 set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
@@ -50,4 +51,9 @@
 :no_java_home
 echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
 goto end 
+
+:set_cxf_home
+set CXF_HOME=%~dp0..
+goto cont
+
 :end

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service?view=diff&rev=472758&r1=472757&r2=472758
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service Wed Nov  8 19:25:34
2006
@@ -23,7 +23,10 @@
 #
 
 me=`basename $0`
-cxf_home=`dirname $0`/..
+cxf_home=$CXF_HOME
+if [ ! -f  $cxf_home/lib/cxf-incubator.jar ]; then
+    cxf_home=`dirname $0`/..
+fi
 
 cxf_jar=$cxf_home/lib/cxf-incubator.jar
 

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service.bat?view=diff&rev=472758&r1=472757&r2=472758
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2service.bat Wed Nov  8 19:25:34
2006
@@ -25,8 +25,9 @@
 rem 
 @setlocal
 
-set CXF_HOME=%~dp0..
-
+if not defined CXF_HOME goto set_cxf_home
+                                                                                        
                                                                    
+:cont
 if not defined JAVA_HOME goto no_java_home
 
 set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
@@ -48,4 +49,9 @@
 :no_java_home
 echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
 goto end 
+
+:set_cxf_home
+set CXF_HOME=%~dp0..
+goto cont
+                                                                                        
                                                                    
 :end

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap?view=diff&rev=472758&r1=472757&r2=472758
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap Wed Nov  8 19:25:34 2006
@@ -23,7 +23,10 @@
 #
 
 me=`basename $0`
-cxf_home=`dirname $0`/..
+cxf_home=$CXF_HOME
+if [ ! -f  $cxf_home/lib/cxf-incubator.jar ]; then
+    cxf_home=`dirname $0`/..
+fi
 
 cxf_jar=$cxf_home/lib/cxf-incubator.jar
 

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap.bat?view=diff&rev=472758&r1=472757&r2=472758
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2soap.bat Wed Nov  8 19:25:34
2006
@@ -25,8 +25,9 @@
 rem 
 @setlocal
 
-set CXF_HOME=%~dp0..
-
+f not defined CXF_HOME goto set_cxf_home
+                                                                                        
                                                                    
+:cont
 if not defined JAVA_HOME goto no_java_home
 
 set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
@@ -48,4 +49,8 @@
 :no_java_home
 echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
 goto end 
+
+:set_cxf_home
+set CXF_HOME=%~dp0..
+goto cont
 :end

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml?view=diff&rev=472758&r1=472757&r2=472758
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml Wed Nov  8 19:25:34 2006
@@ -22,7 +22,10 @@
 #
 
 me=`basename $0`
-cxf_home=`dirname $0`/..
+cxf_home=$CXF_HOME
+if [ ! -f  $cxf_home/lib/cxf-incubator.jar ]; then
+    cxf_home=`dirname $0`/..
+fi
 
 cxf_jar=$cxf_home/lib/cxf-incubator.jar
 

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml.bat?view=diff&rev=472758&r1=472757&r2=472758
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2xml.bat Wed Nov  8 19:25:34
2006
@@ -25,8 +25,9 @@
 rem 
 @setlocal
 
-set CXF_HOME=%~dp0..
-
+if not defined CXF_HOME goto set_cxf_home
+                                                                                        
                                                                    
+:cont
 if not defined JAVA_HOME goto no_java_home
 
 set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
@@ -48,4 +49,9 @@
 :no_java_home
 echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
 goto end 
+
+:set_cxf_home
+set CXF_HOME=%~dp0..
+goto cont
+
 :end

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator?view=diff&rev=472758&r1=472757&r2=472758
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator Wed Nov  8 19:25:34
2006
@@ -23,7 +23,10 @@
 #
 
 me=`basename $0`
-cxf_home=`dirname $0`/..
+cxf_home=$CXF_HOME
+if [ ! -f  $cxf_home/lib/cxf-incubator.jar ]; then
+    cxf_home=`dirname $0`/..
+fi
 
 cxf_jar=$cxf_home/lib/cxf-incubator.jar
 

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator.bat?view=diff&rev=472758&r1=472757&r2=472758
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdlvalidator.bat Wed Nov  8 19:25:34
2006
@@ -24,8 +24,9 @@
 rem 
 @setlocal
 
-set CXF_HOME=%~dp0..
-
+if not defined CXF_HOME goto set_cxf_home
+                                                                                        
                                                                    
+:cont
 if not defined JAVA_HOME goto no_java_home
 
 set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
@@ -49,4 +50,8 @@
 :no_java_home
 echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
 goto end 
+
+:set_cxf_home
+set CXF_HOME=%~dp0..
+goto cont
 :end

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl?view=diff&rev=472758&r1=472757&r2=472758
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl Wed Nov  8 19:25:34 2006
@@ -23,7 +23,10 @@
 #
 
 me=`basename $0`
-cxf_home=`dirname $0`/..
+cxf_home=$CXF_HOME
+if [ ! -f  $cxf_home/lib/cxf-incubator.jar ]; then
+    cxf_home=`dirname $0`/..
+fi
 
 cxf_jar=$cxf_home/lib/cxf-incubator.jar
 

Modified: incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl.bat
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl.bat?view=diff&rev=472758&r1=472757&r2=472758
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/xsd2wsdl.bat Wed Nov  8 19:25:34
2006
@@ -25,8 +25,9 @@
 rem 
 @setlocal
 
-set CXF_HOME=%~dp0..
-
+if not defined CXF_HOME goto set_cxf_home
+                                                                                        
                                                                    
+:cont
 if not defined JAVA_HOME goto no_java_home
 
 set SUN_TOOL_PATH=%JAVA_HOME%\lib\tools.jar;
@@ -48,4 +49,8 @@
 :no_java_home
 echo ERROR: Set JAVA_HOME to the path where the J2SE 5.0 (JDK5.0) is installed
 goto end 
+
+:set_cxf_home
+set CXF_HOME=%~dp0..
+goto cont
 :end



Mime
View raw message