cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r531364 - in /incubator/cxf/trunk/distribution/src/main/release/samples: ./ hello_world/wsdl/ hello_world_RPCLit/wsdl/ hello_world_xml_bare/wsdl/ hello_world_xml_wrapped/wsdl/ soap12/wsdl/ soap_header/wsdl/
Date Mon, 23 Apr 2007 07:37:31 GMT
Author: mmao
Date: Mon Apr 23 00:37:30 2007
New Revision: 531364

URL: http://svn.apache.org/viewvc?view=rev&rev=531364
Log:
CXF-580 servlet demos improvement
 * Now, just use > ant client-servlet to invoke the cxf servlet demos
 * Default host is localhost, default port is 8080
 * If the cxf jars not presented in the tomcat, now we copy all of the jars into tomcat/shared/lib
for users
CXF-585 soapheader demo failed
 * Fix the not well-formed xml
 * Fix the wsdlLocation attribute.

CXF-574
 * Remove the prefix "services" in the jaxws:address in all servlet demos



Modified:
    incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/wsdl/cxf-servlet.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/wsdl/cxf-servlet.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_bare/wsdl/cxf-servlet.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_wrapped/wsdl/cxf-servlet.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/soap12/wsdl/cxf-servlet.xml
    incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/wsdl/cxf-servlet.xml

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=531364&r1=531363&r2=531364
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/common_build.xml Mon Apr 23
00:37:30 2007
@@ -27,6 +27,10 @@
     <property name="codegen.timestamp.file" value="${build.src.dir}/.CODEGEN_DONE"/>
     <property name="war.dir" location="${build.dir}/war"/>
 
+    <property name="host" value="localhost"/>
+    <property name="port" value="8080"/>
+    <property name="base.url" value="http://${host}:${port}"/>
+
     <available property="wsdl.dir" value="${basedir}/wsdl" 
         file="${basedir}/wsdl"/>
     <property name="wsdl.dir" location="."/>
@@ -231,11 +235,27 @@
         </sequential>
     </macrodef>
 
-    <target name="deploy" depends="deploy-tomcat"/>
-    <target name="undeploy" depends="undeploy-tomcat"/>
+    <target name="prepare.tomcat" unless="cxf.jars.present.in.tomcat">
+	<copy todir="${env.CATALINA_HOME}/shared/lib">
+	    <fileset dir="${cxf.home}/modules">
+		<include name="*.jar"/>
+		<exclude name="*jbi*.jar"/>
+	    </fileset>	    
+	</copy>
+	<copy todir="${env.CATALINA_HOME}/shared/lib">
+	    <fileset dir="${cxf.home}/lib">
+		<include name="*.jar"/>
+		<exclude name="*jbi*.jar"/>
+	    </fileset>
+	</copy>
+    </target>
+
+    <target name="deploy" depends="war, deploy-tomcat" description="deploy the application
into the container"/>
+    <target name="undeploy" depends="undeploy-tomcat" description="undeploy the application
from the container"/>
     
     <target name="deploy-tomcat" if="tomcat">
 	<antcall target="validate-tomcat"/>
+	<antcall target="prepare.tomcat"/>
 	<copy file="${war.dir}/${cxf.war.file.name}.war"
 	      todir="${env.CATALINA_HOME}/webapps"/>
     </target>
@@ -248,10 +268,19 @@
 
     <target name="validate-tomcat">
 	<fail unless="env.CATALINA_HOME" message="You should set the CATALINA_HOME, if you want
to deploy into tomcat"/>
-	
+
+	<available property="cxf.jars.present.in.tomcat" classname="org.apache.cxf.version.Version">
+	    <classpath>
+		<fileset dir="${env.CATALINA_HOME}/shared/lib">
+		    <include name="*.jar"/>
+		</fileset>
+	    </classpath>
+	</available>
+
 	<available property="cxf.jars.present.in.tomcat" file="${env.CATALINA_HOME}/shared/lib/cxf-manifest-incubator.jar"
type="file"/>
 	<fail unless="cxf.jars.present.in.tomcat" message="In order to run Apache CXF service
under TOMCAT, 
 							   you MUST copy jars under ${cxf.home}/lib/ into ${env.CATALINA_HOME}/shared/lib/
first"/>
+
 	
 	<available property="cxf.jbi.present" classname="org.apache.cxf.jbi.transport.JBIConduit">
 	    <classpath>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/wsdl/cxf-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/wsdl/cxf-servlet.xml?view=diff&rev=531364&r1=531363&r2=531364
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/wsdl/cxf-servlet.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/wsdl/cxf-servlet.xml
Mon Apr 23 00:37:30 2007
@@ -30,5 +30,5 @@
         id="hello_world_xml_bare"
         implementor="demo.hw.server.GreeterImpl"
         wsdlLocation="WEB-INF/wsdl/hello_world.wsdl"
-        address="/services/hello_world" />
+        address="/hello_world" />
 </beans>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/wsdl/cxf-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/wsdl/cxf-servlet.xml?view=diff&rev=531364&r1=531363&r2=531364
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/wsdl/cxf-servlet.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/wsdl/cxf-servlet.xml
Mon Apr 23 00:37:30 2007
@@ -30,6 +30,6 @@
         id="hello_world_rpclit"
         implementor="demo.hwRPCLit.server.GreeterRPCLitImpl"
         wsdlLocation="WEB-INF/wsdl/hello_world_RPCLit.wsdl"
-        address="/services/hello_world_rpclit" />
+        address="/hello_world_rpclit" />
 
 </beans>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_bare/wsdl/cxf-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_bare/wsdl/cxf-servlet.xml?view=diff&rev=531364&r1=531363&r2=531364
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_bare/wsdl/cxf-servlet.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_bare/wsdl/cxf-servlet.xml
Mon Apr 23 00:37:30 2007
@@ -30,5 +30,5 @@
         id="hello_world"       
         implementor="demo.hw.server.GreeterImpl"
         wsdlLocation="WEB-INF/wsdl/hello_world.wsdl"
-        address="/services/hello_world"/>
+        address="/hello_world"/>
 </beans>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_wrapped/wsdl/cxf-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_wrapped/wsdl/cxf-servlet.xml?view=diff&rev=531364&r1=531363&r2=531364
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_wrapped/wsdl/cxf-servlet.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_xml_wrapped/wsdl/cxf-servlet.xml
Mon Apr 23 00:37:30 2007
@@ -30,6 +30,6 @@
         id="hello_world_xml_wrapped"
         implementor="demo.hw.server.GreeterImpl"
         wsdlLocation="WEB-INF/wsdl/hello_world.wsdl"      
-        address="/services/hello_world" />
+        address="/hello_world" />
 
 </beans>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/soap12/wsdl/cxf-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/soap12/wsdl/cxf-servlet.xml?view=diff&rev=531364&r1=531363&r2=531364
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/soap12/wsdl/cxf-servlet.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/soap12/wsdl/cxf-servlet.xml
Mon Apr 23 00:37:30 2007
@@ -30,6 +30,6 @@
         id="hello_world_soap12"       
         implementor="demo.hw.server.GreeterImpl"
         wsdlLocation="WEB-INF/wsdl/hello_world_soap12.wsdl"
-        address="/server/hello_world_soap12" />
+        address="/hello_world_soap12" />
 
 </beans>

Modified: incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/wsdl/cxf-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/wsdl/cxf-servlet.xml?view=diff&rev=531364&r1=531363&r2=531364
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/wsdl/cxf-servlet.xml
(original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/wsdl/cxf-servlet.xml
Mon Apr 23 00:37:30 2007
@@ -29,7 +29,6 @@
     <jaxws:endpoint
         id="soap_headers"
         implementor="demo.soap_header.server.HeaderTesterImpl"
-        wsdl="WEB-INF/wsdl/soap_header.wsdl"
-        address="/services/soap_header" />
-
-</endpoints>
+        wsdlLocation="WEB-INF/wsdl/soap_header.wsdl"
+        address="/soap_header" />
+</beans>



Mime
View raw message