Author: mmao
Date: Wed Oct 25 21:10:25 2006
New Revision: 467857
URL: http://svn.apache.org/viewvc?view=rev&rev=467857
Log:
Port hello_world_RPCLit demo from celtix.
Added:
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/
- copied from r446547,
incubator/cxf/tags/celtix/pre_apache/distribution/src/main/samples/hello_world_RPCLit/
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/wsdl/cxf-servlet.xml
(with props)
Removed:
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/wsdl/celtix-servlet.xml
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/src/demo/hwRPCLit/client/Client.java
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/src/demo/hwRPCLit/server/GreeterRPCLitImpl.java
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/src/demo/hwRPCLit/server/Server.java
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/wsdl/hello_world_RPCLit.wsdl
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/README.txt
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/README.txt?view=diff&rev=467857&r1=446547&r2=467857
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/README.txt
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/README.txt
Wed Oct 25 21:10:25 2006
@@ -13,7 +13,7 @@
Prerequisite
------------
-If your environment already includes celtix.jar on the
+If your environment already includes cxf.jar on the
CLASSPATH, and the JDK and ant bin directories on the PATH
it is not necessary to run the environment script described in
the samples directory README. If your environment is not
@@ -65,12 +65,12 @@
For UNIX:
- export CLASSPATH=$CLASSPATH:$CELTIX_HOME/lib/celtix.jar:./build/classes
+ export CLASSPATH=$CLASSPATH:$CXF_HOME/lib/cxf.jar:./build/classes
javac -d build/classes src/demo/hw/client/*.java
javac -d build/classes src/demo/hw/server/*.java
For Windows:
- set classpath=%classpath%;%CELTIX_HOME%\lib\celtix.jar;.\build\classes
+ set classpath=%classpath%;%CXF_HOME%\lib\cxf.jar;.\build\classes
javac -d build\classes src\demo\hw\client\*.java
javac -d build\classes src\demo\hw\server\*.java
@@ -83,10 +83,10 @@
single command line:
For UNIX (must use forward slashes):
- java -Djava.util.logging.config.file=$CELTIX_HOME/etc/logging.properties
+ java -Djava.util.logging.config.file=$CXF_HOME/etc/logging.properties
demo.hwRPCLit.server.Server &
- java -Djava.util.logging.config.file=$CELTIX_HOME/etc/logging.properties
+ java -Djava.util.logging.config.file=$CXF_HOME/etc/logging.properties
demo.hwRPCLit.client.Client ./wsdl/hello_world_RPCLit.wsdl
The server process starts in the background. After running the client,
@@ -94,10 +94,10 @@
For Windows (may use either forward or back slashes):
start
- java -Djava.util.logging.config.file=%CELTIX_HOME%\etc\logging.properties
+ java -Djava.util.logging.config.file=%CXF_HOME%\etc\logging.properties
demo.hwRPCLit.server.Server
- java -Djava.util.logging.config.file=%CELTIX_HOME%\etc\logging.properties
+ java -Djava.util.logging.config.file=%CXF_HOME%\etc\logging.properties
demo.hwRPCLit.client.Client .\wsdl\hello_world_RPCLit.wsdl
A new command windows opens for the server process. After running the
@@ -140,13 +140,13 @@
For UNIX:
- java -Djava.util.logging.config.file=$CELTIX_HOME/etc/logging.properties
- demo.hwRPCLit.client.Client
http://localhost:#/helloworldrpclit/celtix/hello_world_rpclit
+ java -Djava.util.logging.config.file=$CXF_HOME/etc/logging.properties
+ demo.hwRPCLit.client.Client
http://localhost:#/helloworldrpclit/cxf/hello_world_rpclit
For Windows:
- java -Djava.util.logging.config.file=%CELTIX_HOME%\etc\logging.properties
- demo.hwRPCLit.client.Client
http://localhost:#/helloworldrpclit/celtix/hello_world_rpclit
+ java -Djava.util.logging.config.file=%CXF_HOME%\etc\logging.properties
+ demo.hwRPCLit.client.Client
http://localhost:#/helloworldrpclit/cxf/hello_world_rpclit
Where # is the TCP/IP port used by the servlet container,
e.g., 8080.
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/build.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/build.xml?view=diff&rev=467857&r1=446547&r2=467857
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/build.xml
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/build.xml
Wed Oct 25 21:10:25 2006
@@ -1,30 +1,50 @@
-<?xml version="1.0"?>
+<?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.
+-->
<project name="hello world demo" default="build" basedir=".">
- <import file="../common_build.xml"/>
-
+ <import file="../common_build.xml"/>
+
<target name="client" description="run demo client" depends="build">
- <property name="param1" value=""/>
- <property name="param2" value=""/>
- <property name="param3" value=""/>
- <celtixrun classname="demo.hwRPCLit.client.Client"
param1="${basedir}/wsdl/hello_world_RPCLit.wsdl" param2="${op}"
param3="${param1}" param4="${param2}" param5="${param3}"/>
- </target>
-
+ <property name="param" value=""/>
+ <cxfrun classname="demo.hwRPCLit.client.Client"
+ param1="${basedir}/wsdl/hello_world_RPCLit.wsdl"
+ param2="${op}"
+ param3="${param}"/>
+ </target>
+
<target name="server" description="run demo server" depends="build">
- <celtixrun classname="demo.hwRPCLit.server.Server"
param1="${basedir}/wsdl/hello_world_RPCLit.wsdl"/>
+ <cxfrun classname="demo.hwRPCLit.server.Server"
+ param1="${basedir}/wsdl/hello_world_RPCLit.wsdl"/>
</target>
<target name="generate.code">
<echo level="info" message="Generating code using wsdl2java..."/>
<wsdl2java file="hello_world_RPCLit.wsdl"/>
- </target>
+ </target>
<target name="war" depends="build">
- <celtixwar wsdl="hello_world_RPCLit.wsdl"
filename="helloworldrpclit.war"/>
+ <cxfwar wsdl="hello_world_RPCLit.wsdl" filename="helloworld.war"/>
</target>
<target name="client-servlet" description="run demo client hitting
servlet" depends="build">
<property name="param" value=""/>
- <celtixrun classname="demo.hwRPCLit.client.Client"
param1="${base.url}/helloworldrpclit/celtix/hello_world_rpclit" param2="${op}"
param3="${param}"/>
- </target>
+ <cxfrun classname="demo.hwRPCLit.client.Client"
param1="${base.url}/helloworld/cxf/hello_world" param2="${op}"
param3="${param}"/>
+ </target>
</project>
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/src/demo/hwRPCLit/client/Client.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/src/demo/hwRPCLit/client/Client.java?view=diff&rev=467857&r1=446547&r2=467857
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/src/demo/hwRPCLit/client/Client.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/src/demo/hwRPCLit/client/Client.java
Wed Oct 25 21:10:25 2006
@@ -1,19 +1,37 @@
+/**
+ * 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.
+ */
package demo.hwRPCLit.client;
import java.io.File;
import java.net.URL;
import javax.xml.namespace.QName;
-import org.objectweb.hello_world_rpclit.GreeterRPCLit;
-import org.objectweb.hello_world_rpclit.SOAPServiceRPCLit;
-import org.objectweb.hello_world_rpclit.types.MyComplexStruct;
+import org.apache.hello_world_rpclit.GreeterRPCLit;
+import org.apache.hello_world_rpclit.SOAPServiceRPCLit;
+import org.apache.hello_world_rpclit.types.MyComplexStruct;
public final class Client {
private static final QName SERVICE_NAME =
- new QName("http://objectweb.org/hello_world_rpclit";,
"SOAPServiceRPCLit");
+ new QName("http://apache.org/hello_world_rpclit";, "SOAPServiceRPCLit");
private static final QName PORT_NAME =
- new QName("http://objectweb.org/hello_world_rpclit";, "SoapPortRPCLit");
+ new QName("http://apache.org/hello_world_rpclit";, "SoapPortRPCLit");
private Client() {
}
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/src/demo/hwRPCLit/server/GreeterRPCLitImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/src/demo/hwRPCLit/server/GreeterRPCLitImpl.java?view=diff&rev=467857&r1=446547&r2=467857
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/src/demo/hwRPCLit/server/GreeterRPCLitImpl.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/src/demo/hwRPCLit/server/GreeterRPCLitImpl.java
Wed Oct 25 21:10:25 2006
@@ -1,12 +1,30 @@
+/**
+ * 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.
+ */
package demo.hwRPCLit.server;
import java.util.logging.Logger;
-import org.objectweb.hello_world_rpclit.GreeterRPCLit;
-import org.objectweb.hello_world_rpclit.types.MyComplexStruct;
+import org.apache.hello_world_rpclit.GreeterRPCLit;
+import org.apache.hello_world_rpclit.types.MyComplexStruct;
@javax.jws.WebService(name = "GreeterRPCLit", serviceName =
"SOAPServiceRPCLit",
- targetNamespace =
"http://objectweb.org/hello_world_rpclit";,
- wsdlLocation = "file:./wsdl/hello_world_RPCLit.wsdl")
+ targetNamespace =
"http://apache.org/hello_world_rpclit";,
+ endpointInterface =
"org.apache.hello_world_rpclit.GreeterRPCLit")
public class GreeterRPCLitImpl implements GreeterRPCLit {
private static final Logger LOG =
Logger.getLogger(GreeterRPCLitImpl.class.getPackage().getName());
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/src/demo/hwRPCLit/server/Server.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/src/demo/hwRPCLit/server/Server.java?view=diff&rev=467857&r1=446547&r2=467857
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/src/demo/hwRPCLit/server/Server.java
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/src/demo/hwRPCLit/server/Server.java
Wed Oct 25 21:10:25 2006
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
package demo.hwRPCLit.server;
import javax.xml.ws.Endpoint;
Added:
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=auto&rev=467857
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/wsdl/cxf-servlet.xml
(added)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/wsdl/cxf-servlet.xml
Wed Oct 25 21:10:25 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="hello_world_rpclit"
+ interface="org.objectweb.hello_world_rpclit.GreeterRPCLit"
+ implementation="demo.hwRPCLit.server.GreeterRPCLitImpl"
+ wsdl="WEB-INF/wsdl/hello_world_RPCLit.wsdl"
+ service="{http://objectweb.org/hello_world_rpclit}SOAPServiceRPCLit";
+ port="{http://objectweb.org/hello_world_rpclit}SOAPPortRPCLit";
+ url-pattern="/hello_world_rpclit" />
+
+</endpoints>
Propchange:
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/wsdl/cxf-servlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/wsdl/cxf-servlet.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/wsdl/cxf-servlet.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/wsdl/hello_world_RPCLit.wsdl
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/wsdl/hello_world_RPCLit.wsdl?view=diff&rev=467857&r1=446547&r2=467857
==============================================================================
---
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/wsdl/hello_world_RPCLit.wsdl
(original)
+++
incubator/cxf/trunk/distribution/src/main/release/samples/hello_world_RPCLit/wsdl/hello_world_RPCLit.wsdl
Wed Oct 25 21:10:25 2006
@@ -1,14 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="HelloWorld"
targetNamespace="http://objectweb.org/hello_world_rpclit";
+<!--
+ 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.
+-->
+<wsdl:definitions name="HelloWorld"
targetNamespace="http://apache.org/hello_world_rpclit";
xmlns="http://schemas.xmlsoap.org/wsdl/";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
- xmlns:tns="http://objectweb.org/hello_world_rpclit";
- xmlns:x1="http://objectweb.org/hello_world_rpclit/types";
+ xmlns:tns="http://apache.org/hello_world_rpclit";
+ xmlns:x1="http://apache.org/hello_world_rpclit/types";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
<wsdl:types>
- <schema
targetNamespace="http://objectweb.org/hello_world_rpclit/types";
+ <schema targetNamespace="http://apache.org/hello_world_rpclit/types";
xmlns="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified">
<complexType name="myComplexStruct">
<sequence>
@@ -64,30 +82,30 @@
<wsdl:operation name="sayHi">
<soap:operation soapAction="" style="rpc"/>
<wsdl:input>
- <soap:body namespace="http://objectweb.org/hello_world_rpclit";
use="literal"/>
+ <soap:body namespace="http://apache.org/hello_world_rpclit";
use="literal"/>
</wsdl:input>
<wsdl:output>
- <soap:body namespace="http://objectweb.org/hello_world_rpclit";
use="literal"/>
+ <soap:body namespace="http://apache.org/hello_world_rpclit";
use="literal"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="greetMe">
<soap:operation soapAction="" style="rpc"/>
<wsdl:input>
- <soap:body namespace="http://objectweb.org/hello_world_rpclit";
use="literal"/>
+ <soap:body namespace="http://apache.org/hello_world_rpclit";
use="literal"/>
</wsdl:input>
<wsdl:output>
- <soap:body namespace="http://objectweb.org/hello_world_rpclit";
use="literal"/>
+ <soap:body namespace="http://apache.org/hello_world_rpclit";
use="literal"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="sendReceiveData">
<soap:operation soapAction="" style="rpc"/>
<wsdl:input>
- <soap:body
namespace="http://objectweb.org/hello_world_rpclit"; use="literal"/>
+ <soap:body namespace="http://apache.org/hello_world_rpclit";
use="literal"/>
</wsdl:input>
<wsdl:output>
- <soap:body
namespace="http://objectweb.org/hello_world_rpclit"; use="literal"/>
+ <soap:body namespace="http://apache.org/hello_world_rpclit";
use="literal"/>
</wsdl:output>
</wsdl:operation>
