Author: ffang
Date: Tue Sep 19 19:55:28 2006
New Revision: 448036
URL: http://svn.apache.org/viewvc?view=rev&rev=448036
Log:
1. [JIRA CXF-97] add servlet transport for hello_world and soap_header demo
2. comment out sayHi method for hello_world demo since fault is not done
Added:
incubator/cxf/trunk/distribution/src/main/release/etc/web.xml (with props)
incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/wsdl/cxf-servlet.xml
(with props)
Modified:
incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/src/demo/hw/client/Client.java
incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/build.xml
Modified: incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/assembly/bin.xml?view=diff&rev=448036&r1=448035&r2=448036
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/bin.xml Tue Sep 19
19:55:28 2006
@@ -55,6 +55,7 @@
<includes>
<include>logging.properties</include>
<include>log4j.properties</include>
+ <include>web.xml</include>
</includes>
</fileSet>
<fileSet>
Added: incubator/cxf/trunk/distribution/src/main/release/etc/web.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/etc/web.xml?view=auto&rev=448036
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/etc/web.xml (added)
+++ incubator/cxf/trunk/distribution/src/main/release/etc/web.xml Tue Sep 19
19:55:28 2006
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application
2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
+<web-app>
+ <display-name>cxf</display-name>
+ <description>cxf</description>
+ <servlet>
+ <servlet-name>cxf</servlet-name>
+ <display-name>cxf</display-name>
+ <description>celtixfire endpoint</description>
+ <servlet-class>org.apache.cxf.jaxws.servlet.CXFServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>cxf</servlet-name>
+ <url-pattern>/cxf/*</url-pattern>
+ </servlet-mapping>
+ <session-config>
+ <session-timeout>60</session-timeout>
+ </session-config>
+</web-app>
Propchange: incubator/cxf/trunk/distribution/src/main/release/etc/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/distribution/src/main/release/etc/web.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/distribution/src/main/release/etc/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/src/demo/hw/client/Client.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/src/demo/hw/client/Client.java?view=diff&rev=448036&r1=448035&r2=448036
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/src/demo/hw/client/Client.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world/src/demo/hw/client/Client.java
Tue Sep 19 19:55:28 2006
@@ -24,7 +24,7 @@
import javax.xml.namespace.QName;
import javax.xml.ws.ProtocolException;
import org.apache.hello_world_soap_http.Greeter;
-import org.apache.hello_world_soap_http.PingMeFault;
+//import org.apache.hello_world_soap_http.PingMeFault;
import org.apache.hello_world_soap_http.SOAPService;
public final class Client {
@@ -80,12 +80,12 @@
System.out.println("No response from server as method is OneWay");
System.out.println();
- try {
+ /*try {
System.out.println("Invoking pingMe, expecting exception...");
port.pingMe();
} catch (PingMeFault ex) {
System.out.println("Expected exception: PingMeFault has occurred:
" + ex.getMessage());
- }
+ }*/
System.exit(0);
}
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/build.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/build.xml?view=diff&rev=448036&r1=448035&r2=448036
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/build.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/build.xml
Tue Sep 19 19:55:28 2006
@@ -35,6 +35,14 @@
<echo level="info" message="Generating code using wsdl2java..."/>
<wsdl2java file="soap_header.wsdl"/>
</target>
-
+
+ <target name="war" depends="build">
+ <cxfwar wsdl="soap_header.wsdl" filename="soapheader.war"/>
+ </target>
+
+ <target name="client-servlet" description="run demo client hitting
servlet" depends="build">
+ <property name="param" value=""/>
+ <cxfrun classname="demo.soap_header.client.Client"
param1="${base.url}/soapheader/cxf/soap_header" param2="${op}"
param3="${param}"/>
+ </target>
</project>
Added:
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=auto&rev=448036
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/wsdl/cxf-servlet.xml
(added)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/wsdl/cxf-servlet.xml
Tue Sep 19 19:55:28 2006
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<endpoints>
+
+ <endpoint
+ name="soap_headers"
+ interface="org.apache.soap_header.TestHeader"
+ implementation="demo.soap_header.server.HeaderTesterImpl"
+ wsdl="WEB-INF/wsdl/soap_header.wsdl"
+ service="{http://apache.org/headers}HeaderService";
+ port="{http://apache.org/headers}SOAPPort";
+ url-pattern="/soap_header" />
+
+</endpoints>
Propchange:
incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/wsdl/cxf-servlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/wsdl/cxf-servlet.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/distribution/src/main/release/samples/soap_header/wsdl/cxf-servlet.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
