Author: blin
Date: Mon Aug 20 03:10:52 2007
New Revision: 567635
URL: http://svn.apache.org/viewvc?rev=567635&view=rev
Log:
[cxf-901] Apply Jeff's patch for samples improvement - Thanks Jeff.
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/java_first_pojo/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/js_client/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/js_client/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/js_client/src/helloworld.js
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?rev=567635&r1=567634&r2=567635&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
Mon Aug 20 03:10:52 2007
@@ -220,7 +220,7 @@
<property name="war-lib" value="${basedir}/libs" />
<macrodef name="cxfwar">
<attribute name="filename"/>
- <attribute name="wsdl"/>
+ <attribute name="wsdl" default=""/>
<attribute name="dir" default="${war.dir}"/>
<attribute name="classesdir" default="${build.classes.dir}"/>
<sequential>
@@ -263,7 +263,7 @@
</target>
<target name="undeploy" depends="undeploy-tomcat" description="undeploy
the application from the container"/>
- <target name="deploy-tomcat" depends="war">
+ <target name="deploy-tomcat">
<antcall target="validate-tomcat"/>
<copy file="${war.dir}/${cxf.war.file.name}.war"
todir="${env.CATALINA_HOME}/webapps"/>
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/build.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/build.xml?rev=567635&r1=567634&r2=567635&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/build.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/java_first_jaxws/build.xml
Mon Aug 20 03:10:52 2007
@@ -35,7 +35,7 @@
<property name="cxf.war.file.name" value="helloworld"/>
<target name="war" depends="build">
- <cxfwar wsdl="hello_world.wsdl" filename="${cxf.war.file.name}.war"/>
+ <cxfwar filename="${cxf.war.file.name}.war"/>
</target>
<target name="client-servlet" description="run demo client hitting
servlet" depends="build">
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/java_first_pojo/build.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/java_first_pojo/build.xml?rev=567635&r1=567634&r2=567635&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/java_first_pojo/build.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/java_first_pojo/build.xml
Mon Aug 20 03:10:52 2007
@@ -32,7 +32,7 @@
<property name="cxf.war.file.name" value="helloworld"/>
<target name="war" depends="build">
- <cxfwar wsdl="hello_world.wsdl" filename="${cxf.war.file.name}.war"/>
+ <cxfwar filename="${cxf.war.file.name}.war"/>
</target>
<target name="client-servlet" description="run demo client hitting
servlet" depends="build">
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/js_client/README.txt
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/js_client/README.txt?rev=567635&r1=567634&r2=567635&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/js_client/README.txt
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/js_client/README.txt
Mon Aug 20 03:10:52 2007
@@ -11,7 +11,7 @@
Building and running the demo server using ant
---------------------------------------
-From the samples/hello_world directory, the ant build script
+From the samples/wsdl_first directory, the ant build script
can be used to build and run the demo.
Using either UNIX or Windows:
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/js_client/build.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/js_client/build.xml?rev=567635&r1=567634&r2=567635&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/js_client/build.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/js_client/build.xml
Mon Aug 20 03:10:52 2007
@@ -19,7 +19,7 @@
-->
<project name="js_client" default="all" basedir=".">
<property name="thirdparty.classpath"
-
value="../hello_world/build/classes;lib/js-1.6R5.jar;lib/xbean-2.2.0.jar"/>
+
value="../wsdl_first/build/classes;lib/js-1.6R5.jar;lib/xbean-2.2.0.jar"/>
<import file="../common_build.xml"/>
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/js_client/src/helloworld.js
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/js_client/src/helloworld.js?rev=567635&r1=567634&r2=567635&view=diff
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/js_client/src/helloworld.js
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/js_client/src/helloworld.js
Mon Aug 20 03:10:52 2007
@@ -24,7 +24,7 @@
var qname=new
Packages.javax.xml.namespace.QName("http://apache.org/hello_world_soap_http";,
"SOAPService");
var curpath=new File("..");
var sepa=File.separator;
-var
hwpath=curpath.getAbsolutePath()+sepa+"hello_world"+sepa+"wsdl"+sepa+"hello_world.wsdl";
+var
hwpath=curpath.getAbsolutePath()+sepa+"wsdl_first"+sepa+"wsdl"+sepa+"hello_world.wsdl";
var url = new File(hwpath).toURL();
var ss=new SOAPService(url,qname);
var port = ss.getSoapPort();
