cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r518099 - in /incubator/cxf/trunk/distribution/src/main/release: bin/wsdl2java bin/wsdl2java.bat samples/callback/build.xml samples/common_build.xml samples/dispatch_provider/build.xml samples/js_provider/build.xml
Date Wed, 14 Mar 2007 11:27:37 GMT
Author: mmao
Date: Wed Mar 14 04:27:36 2007
New Revision: 518099

URL: http://svn.apache.org/viewvc?view=rev&rev=518099
Log:
CXF-315

* modify the shell scripts to load the tools2
* fix the samples which have more than one service

Modified:
    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/samples/callback/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/js_provider/build.xml

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=518099&r1=518098&r2=518099
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java Wed Mar 14 04:27:36 2007
@@ -59,7 +59,7 @@
 
 cxf_classpath=${cxf_jar}:${CLASSPATH}:${sun_tool_path}
 
-$JAVA_HOME/bin/java -cp ${cxf_classpath} -Djava.util.logging.config.file=$log_config org.apache.cxf.tools.wsdl2java.WSDLToJava
"$@"
+$JAVA_HOME/bin/java -cp ${cxf_classpath} -Djava.util.logging.config.file=$log_config org.apache.cxf.tools.wsdlto.WSDLToJava
"$@"
 
 
 

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=518099&r1=518098&r2=518099
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java.bat (original)
+++ incubator/cxf/trunk/distribution/src/main/release/bin/wsdl2java.bat Wed Mar 14 04:27:36
2007
@@ -37,7 +37,7 @@
 set CXF_JAR=%CXF_HOME%\lib\cxf-incubator.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.wsdl2java.WSDLToJava %*
+"%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.wsdlto.WSDLToJava %*
 
 @endlocal
 

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/callback/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/callback/build.xml?view=diff&rev=518099&r1=518098&r2=518099
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/callback/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/callback/build.xml Wed Mar 14
04:27:36 2007
@@ -36,7 +36,8 @@
         
     <target name="generate.code">
         <echo level="info" message="Generating code using wsdl2java..."/>
-        <wsdl2java file="basic_callback.wsdl"/>
+        <wsdl2java file="basic_callback.wsdl" servicename.arg="-sn CallbackService"/>
+	<wsdl2java file="basic_callback.wsdl" servicename.arg="-sn SOAPService"/>
     </target>
     
 </project>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml?view=diff&rev=518099&r1=518098&r2=518099
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml Wed Mar 14
04:27:36 2007
@@ -176,6 +176,7 @@
         <attribute name="srcdestdir" default="${build.src.dir}"/>
         <attribute name="destdir" default="${build.classes.dir}"/>
         <attribute name="file"/>
+        <attribute name="servicename.arg" default=""/>
         <attribute name="bindingfile" default=""/>
         <attribute name="dir" default="${wsdl.dir}"/>
         <attribute name="package" default="NOT_SPECIFIED"/>
@@ -195,12 +196,13 @@
             </condition>
             <property name="binding.arg" value=""/>
             
-            <java failonerror="true" classname="org.apache.cxf.tools.wsdl2java.WSDLToJava"
fork="yes">
+            <java failonerror="true" classname="org.apache.cxf.tools.wsdlto.WSDLToJava"
fork="yes">
                 <classpath>
                     <path refid="cxf.classpath" />
                 </classpath>
                 <sysproperty key="java.util.logging.config.file" value="${cxf.etc.dir}/logging.properties"/>
                 <sysproperty key="exitOnFinish" value="true"/>
+                <arg line="@{servicename.arg}"/>
                 <arg line="${package.arg.@{file}}"/>
                 <arg line="${binding.arg}"/>
                 <arg value="-verbose"/>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/build.xml?view=diff&rev=518099&r1=518098&r2=518099
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/dispatch_provider/build.xml
Wed Mar 14 04:27:36 2007
@@ -32,7 +32,9 @@
         
     <target name="generate.code">
         <echo level="info" message="Generating code using wsdl2java..."/>
-        <wsdl2java file="hello_world.wsdl"/>
+        <wsdl2java file="hello_world.wsdl" servicename.arg="-sn SOAPService1"/>
+        <wsdl2java file="hello_world.wsdl" servicename.arg="-sn SOAPService2"/>
+        <wsdl2java file="hello_world.wsdl" servicename.arg="-sn SOAPService3"/>
     </target>
     
 </project>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/js_provider/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/js_provider/build.xml?view=diff&rev=518099&r1=518098&r2=518099
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/js_provider/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/js_provider/build.xml Wed Mar
14 04:27:36 2007
@@ -48,7 +48,9 @@
         
     <target name="generate.code">
         <echo level="info" message="Generating code using wsdl2java..."/>
-        <wsdl2java file="hello_world.wsdl"/>
+        <wsdl2java file="hello_world.wsdl" servicename.arg="-sn SOAPService1"/>
+        <wsdl2java file="hello_world.wsdl" servicename.arg="-sn SOAPService2"/>
+        <wsdl2java file="hello_world.wsdl" servicename.arg="-sn SOAPService3"/>
     </target>
 
 </project>



Mime
View raw message