jaliya 2005/05/23 21:52:23
Modified: sandesha/interop RMInteropServiceDeploy.wsdd build.xml
server-config.wsdd
sandesha/interop/org/apache/sandesha/samples/interop
EchoClientAsyncAck.java EchoClientSyncAck.java
IBMEcho.java
sandesha/interop/org/apache/sandesha/samples/interop/testclient
InteropStub.java
sandesha/interop/webapp/jsp interop.jsp
Removed: sandesha/interop/org/apache/sandesha/samples/interop/testclient
RMClientProvider.java
Log:
Modified the interop classes, and update the build.xml for interops
Revision Changes Path
1.3 +3 -4 ws-fx/sandesha/interop/RMInteropServiceDeploy.wsdd
Index: RMInteropServiceDeploy.wsdd
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/RMInteropServiceDeploy.wsdd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RMInteropServiceDeploy.wsdd 7 Mar 2005 05:34:34 -0000 1.2
+++ RMInteropServiceDeploy.wsdd 24 May 2005 04:52:23 -0000 1.3
@@ -1,5 +1,4 @@
-<deployment xmlns="http://xml.apache.org/axis/wsdd/";
- xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>
+<deployment xmlns="http://xml.apache.org/axis/wsdd/";
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>
<service name="RMInteropService" provider="Handler">
<requestFlow>
@@ -11,6 +10,6 @@
<parameter name="className"
value="org.apache.sandesha.samples.interop.RMInteropService"/>
<parameter name="allowedMethods" value="*"/>
<parameter name="scope" value="request"/>
- </service>
-
+ </service>
+
</deployment>
\ No newline at end of file
1.14 +58 -48 ws-fx/sandesha/interop/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 19 May 2005 04:20:24 -0000 1.13
+++ build.xml 24 May 2005 04:52:23 -0000 1.14
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<project name="Apache Sandesha" default="usage" basedir=".">
- <!-- ===================================================================
-->
<description>
Build file for Apache Sandesha
@@ -101,7 +100,6 @@
<path id="classpath.libraries" description="3rd party libs">
<fileset dir="${dir.libs}">
<include name="**/*.jar"/>
- <!-- <pathelement path="${java.class.path}"/> -->
</fileset>
</path>
@@ -170,24 +168,26 @@
</target>
<target name="usage" depends="init">
- <echo message="
"/>
- <echo message="
"/>
- <echo message=" Build instructions
"/>
- <echo
message="-------------------------------------------------------------------"/>
- <echo message="
"/>
- <echo message=" available targets are:
"/>
- <echo message=" ping_sync -->runs interop test for AsyncPing
"/>
- <echo message=" ping_async -->runs interop test for SyncPing
"/>
- <echo message=" echo_sync_ack -->runs interop test for
EchoStirng "/>
- <echo message=" echo_async_ack -->runs interop test for
EchoStirng "/>
- <echo message=" compile.interop --> compiles the interop source
code "/>
- <echo message=" clean --> cleans up all generated files
and "/>
- <echo message=" jar --> creates the JAR file
"/>
- <echo message=" usage --> provides help on using the
build tool "/>
- <echo message=" (default)
"/>
- <echo message=" See comments inside the build.xml file for more
details. "/>
- <echo
message="-------------------------------------------------------------------"/>
- <echo message="
"/>
+ <echo message="
"/>
+ <echo message="
"/>
+ <echo message=" Build instructions
"/>
+ <echo
message="----------------------------------------------------------------------------"/>
+ <echo message="
"/>
+ <echo message=" available targets are:
"/>
+ <echo message=" ping_sync -->runs interop test for AsyncPing
"/>
+ <echo message=" ping_async -->runs interop test for SyncPing
"/>
+ <echo message=" echo_sync_ack -->runs interop test for
EchoStirng "/>
+ <echo message=" echo_async_ack -->runs interop test for
EchoStirng "/>
+ <echo message=" clean --> cleans up all generated files
and "/>
+ <echo message=" jar --> creates the JAR file
"/>
+ <echo message=" war --> creates the interop war file
in ./dist/war directory "/>
+ <echo message=" war.copy --> creates the war and copy it to
"/>
+ <echo message=" CATALINA_HOME/webapps
"/>
+ <echo message=" usage --> provides help on using the
build tool "/>
+ <echo message=" (default)
"/>
+ <echo message=" See comments inside the build.xml file for more
details. "/>
+ <echo
message="----------------------------------------------------------------------------"/>
+ <echo message="
"/>
</target>
<target name="clean" depends="init" description="Clean up all temporary
build files">
@@ -240,7 +240,6 @@
<target name="compile" depends="compile.library" description="compile
everything"/>
-
<target name="compile.library" depends="prepare-src">
<!-- Compile the java code from ${dir.src} into ${build.classes} -->
<javac srcdir="${dir.src}" destdir="${build.classes}" debug="on">
@@ -270,7 +269,7 @@
<include name="log4j.properties"/>
<include name="WSRMPolicy.xml"/>
<include name="commons-logging.properties"/>
- <include name="sandesha.log"/>
+ <include name="sandesha.log"/>
</fileset>
</copy>
</target>
@@ -292,8 +291,12 @@
- <!-- Following targets were added to run the test -->
- <!-- Added on 01-03-2005-->
+ <!--===========================//Interop
Section//============================================-->
+ <!--
+ //Targets in this section is used to test the basic interops. Here
Sandesha client and the
+ //Sandesha server are tested with each other. TCP Monitors will be
started automatically to
+ //view the message flow.
+ -->
<target name="interop_prepare" depends="init" description="This target
creats the interop-classses directory">
<tstamp/>
@@ -317,7 +320,7 @@
<classpath refid="classpath.library"/>
</java>
</target>
-
+<!--
<target name="run_server">
<java classname="org.apache.axis.transport.http.SimpleAxisServer"
spawn="true" fork="true">
<arg value="-p"/>
@@ -331,7 +334,22 @@
<classpath refid="classpath.library"/>
<classpath refid="classpath.interop"/>
</java>
- </target>
+ </target>-->
+
+
+ <!-- ===================================================================
-->
+ <!-- Launches the functional test HTTP server -->
+ <!-- ===================================================================
-->
+ <target name="run_server">
+ <echo message="Starting test http server."/>
+ <java classname="org.apache.axis.transport.http.SimpleAxisServer" spawn
="true" fork="yes" dir="${build.classes}">
+ <arg line="-p 8080" /> <!-- arbitrary port -->
+ <classpath refid="classpath.library"/>
+ <classpath refid="classpath.interop"/>
+ </java>
+ </target>
+
+
<target name="run_interop_async_ping"
depends="compile.interop,run_tcp1,run_tcp2,run_server">
<java
classname="org.apache.sandesha.samples.interop.AsyncPingClient">
@@ -359,7 +377,8 @@
</java>
</target>
- <target name="shutdown_server" depends="run_server">
+ <target name="shutdown_server" >
+ <echo message="ShutDown the server "/>
<java classname="org.apache.axis.client.AdminClient" fork="yes">
<classpath refid="classpath.library"/>
<arg line="quit -p 8080"/>
@@ -371,6 +390,8 @@
<target name="echo_sync_ack"
depends="run_interop_echo_string_sync_ack,shutdown_server"> </target>
<target name="echo_async_ack"
depends="run_interop_echo_string_async_ack,shutdown_server"> </target>
+ <!--=============================//End of Interop
Testing//====================================-->
+
<target name="prepare-dist">
<mkdir dir="${dir.dist}"/>
@@ -385,55 +406,46 @@
<mkdir dir="${dir.dist.jar}"/>
<copy todir="${build.classes}">
-
- <fileset dir="${dir.config}">
+ <fileset dir="${dir.config}">
<include name="client-config.wsdd"/>
<include name="sandesha.properties"/>
<include name="log4j.properties"/>
<include name="WSRMPolicy.xml"/>
<include name="commons-logging.properties"/>
- <include name="sandesha.log"/>
+ <include name="sandesha.log"/>
</fileset>
</copy>
<copy todir="${build.classes}">
- <fileset dir="${dir.interop}">
+ <fileset dir="${dir.interop}">
<include name="sandesha-interop.properties"/>
<include name="server-config.wsdd"/>
</fileset>
</copy>
-
- </target>
+ </target>
<target name="jar" depends="prepare-jar" description="creates the
sandesha jar">
- <jar basedir="${build.classes}" destfile="${sandesha.jar}"/>
+ <jar basedir="${build.classes}" destfile="${sandesha.jar}"/>
</target>
<target name="prepare-war" depends="jar" description="prepares for
creating war">
<property name="interop.prop.file.name"
value="sandesha-interop.properties"/>
<property name="sandesha.war.name" value="sandesha-interop.war"/>
+ <property name="sandehsa.war.base.name" value="sandesha-interop"/>
<property name="webxml" value="${dir.interop}/webapp/web.xml"/>
<property name="dir.dist.war" value="${dir.dist}/war"/>
<property name="sandesha.war"
value="${dir.dist.war}/${sandesha.war.name}"/>
<property name="webapps" value="${env1.CATALINA_HOME}/webapps"/>
<mkdir dir="${dir.dist.war}"/>
-
- <!-- <copy todir="${build.interop}">-->
- <!-- <fileset dir="${dir.interop}"
includes="sandesha-interop.properties"/>-->
- <!-- </copy>-->
-
-
</target>
<target name="create.war" depends="prepare-war" description="creates the
sandesha war">
-
- <war destfile="${sandesha.war}" webxml="${webxml}">
+ <war destfile="${sandesha.war}" webxml="${webxml}">
<fileset dir="${dir.interop}/webapp/jsp"/>
<lib dir="${dir.libs}"/>
<lib file="${sandesha.jar}"/>
</war>
-
- </target>
+ </target>
<target name="war.copy.clean" depends="war.copy" description="cleans the
temporary files">
<delete dir="${dir.dist}"/>
@@ -442,7 +454,7 @@
<target name="war.copy" depends="war">
<delete file="${webapps}/${sandesha.war}"/>
- <delete dir="${webapps}/sandesha-interop"/>
+ <delete dir="${webapps}/${sandehsa.war.base.name}"/>
<copy file="${sandesha.war}" todir="${webapps}"/>
</target>
@@ -451,8 +463,6 @@
<copy file="${sandesha.jar}" todir="${axishome}"/>
</target>
-
- <target name="war" depends="create.war" description="creates the war
file"/>
-
+ <target name="war" depends="create.war" description="creates the war
file"/>
</project>
1.11 +6 -8 ws-fx/sandesha/interop/server-config.wsdd
Index: server-config.wsdd
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/server-config.wsdd,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- server-config.wsdd 19 May 2005 04:20:24 -0000 1.10
+++ server-config.wsdd 24 May 2005 04:52:23 -0000 1.11
@@ -30,28 +30,26 @@
<parameter name="allowedMethods" value="getVersion"/>
<parameter name="className" value="org.apache.axis.Version"/>
</service>
- <service name="RMInteropService" provider="Handler">
+ <service name="RMService" provider="Handler">
<requestFlow>
<handler
type="java:org.apache.sandesha.ws.rm.handlers.RMServerRequestHandler"/>
<handler
type="java:org.apache.axis.message.addressing.handler.AddressingHandler"/>
</requestFlow>
<parameter name="allowedMethods" value="*"/>
<parameter name="scope" value="request"/>
- <parameter name="className"
value="org.apache.sandesha.samples.interop.RMInteropService"/>
- <parameter name="handlerClass"
value="org.apache.sandesha.ws.rm.providers.RMProvider"/>
+ <parameter name="className" value="org.apache.sandesha.client.RMService"/>
+ <parameter name="handlerClass"
value="org.apache.sandesha.ws.rm.providers.RMClientProvider"/>
</service>
-
- <service name="RMService" provider="Handler">
+ <service name="RMInteropService" provider="Handler">
<requestFlow>
<handler
type="java:org.apache.sandesha.ws.rm.handlers.RMServerRequestHandler"/>
<handler
type="java:org.apache.axis.message.addressing.handler.AddressingHandler"/>
</requestFlow>
<parameter name="allowedMethods" value="*"/>
<parameter name="scope" value="request"/>
- <parameter name="className" value="org.apache.sandesha.client.RMService"/>
- <parameter name="handlerClass"
value="org.apache.sandesha.samples.interop.testclient.RMClientProvider"/>
+ <parameter name="className"
value="org.apache.sandesha.samples.interop.RMInteropService"/>
+ <parameter name="handlerClass"
value="org.apache.sandesha.ws.rm.providers.RMProvider"/>
</service>
-
<transport name="http">
<requestFlow>
<handler type="URLMapper"/>
1.9 +3 -3
ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/EchoClientAsyncAck.java
Index: EchoClientAsyncAck.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/EchoClientAsyncAck.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- EchoClientAsyncAck.java 22 May 2005 10:00:25 -0000 1.8
+++ EchoClientAsyncAck.java 24 May 2005 04:52:23 -0000 1.9
@@ -49,12 +49,12 @@
SandeshaContext ctx = new SandeshaContext();
ctx.addNewSequeceContext(call, targetURL, "urn:wsrm:echoString",
- Constants.ClientProperties.INOUT);
+ Constants.ClientProperties.IN_OUT);
ctx.setAcksToUrl(call,
"http://127.0.0.1:"; + defaultClientPort +
"/axis/services/RMService");
ctx.setReplyToUrl(call,
"http://127.0.0.1:"; + defaultClientPort +
"/axis/services/RMService");
- ctx.setSendOffer(call, true);
+ ctx.setSendOffer(call);
call.setOperationName(new QName("http://tempuri.org/";,
"echoString"));
@@ -77,7 +77,7 @@
if (report != null) {
System.out.println("\n***********Printing RM
Report***********");
- System.out.println("Were all messages acked - " +
report.isAllAcked());
+ System.out.println("Were all messages add - " +
report.isAllAcked());
System.out.println(
"No of response messages - " +
report.getNumberOfReturnMessages());
System.out.println("****************************************\n");
1.9 +2 -2
ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/EchoClientSyncAck.java
Index: EchoClientSyncAck.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/EchoClientSyncAck.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- EchoClientSyncAck.java 22 May 2005 10:00:25 -0000 1.8
+++ EchoClientSyncAck.java 24 May 2005 04:52:23 -0000 1.9
@@ -48,7 +48,7 @@
SandeshaContext ctx = new SandeshaContext();
ctx.addNewSequeceContext(call, targetURL, "urn:wsrm:echoString",
- Constants.ClientProperties.INOUT);
+ Constants.ClientProperties.IN_OUT);
ctx.setAcksToUrl(call, Constants.WSA.NS_ADDRESSING_ANONYMOUS);
ctx.setReplyToUrl(call,
@@ -76,7 +76,7 @@
if (report != null) {
System.out.println("\n***********Printing RM
Report***********");
- System.out.println("Were all messages acked -
" + report.isAllAcked());
+ System.out.println("Were all messages add - "
+ report.isAllAcked());
System.out.println(
"No of response messages - " +
report.getNumberOfReturnMessages());
System.out.println("****************************************\n");
1.3 +1 -1
ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/IBMEcho.java
Index: IBMEcho.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/IBMEcho.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IBMEcho.java 22 May 2005 04:54:20 -0000 1.2
+++ IBMEcho.java 24 May 2005 04:52:23 -0000 1.3
@@ -37,7 +37,7 @@
Call call = (Call) service.createCall();
SandeshaContext ctx = new SandeshaContext();
- ctx.addNewSequeceContext(call, targetURL,
"urn:wsrm:echoString",Constants.ClientProperties.INOUT);
+ ctx.addNewSequeceContext(call, targetURL,
"urn:wsrm:echoString",Constants.ClientProperties.IN_OUT);
ctx.setToUrl(call,
"http://wsi.alphaworks.ibm.com:8080/wsrm/services/rmDemos";);
ctx.setFaultToUrl(call,"http://"; + sourceHost + ":" + sourcePort
+ "/axis/services/RMService");
1.13 +2 -2
ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/testclient/InteropStub.java
Index: InteropStub.java
===================================================================
RCS file:
/home/cvs/ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/testclient/InteropStub.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- InteropStub.java 22 May 2005 05:15:37 -0000 1.12
+++ InteropStub.java 24 May 2005 04:52:23 -0000 1.13
@@ -153,7 +153,7 @@
if (sendOffer)
- ctx.setSendOffer(call,true);
+ ctx.setSendOffer(call);
call.setProperty(Constants.ClientProperties.SOURCE_URL,
bean.getSourceURL());
@@ -217,7 +217,7 @@
Call call = (Call) service.createCall();
SandeshaContext ctx = new SandeshaContext();
- ctx.addNewSequeceContext(call, target, "urn:wsrm:echoString",
Constants.ClientProperties.INOUT);
+ ctx.addNewSequeceContext(call, target, "urn:wsrm:echoString",
Constants.ClientProperties.IN_OUT);
configureContext(ctx,call,bean);
1.8 +2 -1 ws-fx/sandesha/interop/webapp/jsp/interop.jsp
Index: interop.jsp
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/webapp/jsp/interop.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- interop.jsp 19 May 2005 10:27:47 -0000 1.7
+++ interop.jsp 24 May 2005 04:52:23 -0000 1.8
@@ -6,7 +6,8 @@
org.apache.axis.SimpleChain,
java.util.Properties,
java.io.InputStream,
- java.io.IOException"%>
+ java.io.IOException,
+ org.apache.sandesha.ws.rm.providers.RMClientProvider"%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<jsp:useBean id="interopBean" scope="request"
class="org.apache.sandesha.samples.interop.testclient.InteropBean" />
<jsp:setProperty name="interopBean" property="*" />
