You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ja...@apache.org on 2005/06/11 10:24:57 UTC
cvs commit: ws-fx/sandesha/test/org/apache/sandesha/intergratedtest RMTestService.java TCScenarioTest.java
jaliya 2005/06/11 01:24:57
Modified: sandesha maven.xml project.xml
sandesha/samples README.txt build.xml
sandesha/src/org/apache/sandesha SandeshaContext.java
sandesha/src/org/apache/sandesha/server SenderWorker.java
sandesha/test/org/apache/sandesha/intergratedtest
RMTestService.java TCScenarioTest.java
Added: sandesha LICENSE.txt README.txt release-notes.html
Log:
License and the Readme file was added
Revision Changes Path
1.10 +1 -4 ws-fx/sandesha/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/maven.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- maven.xml 10 Jun 2005 12:39:58 -0000 1.9
+++ maven.xml 11 Jun 2005 08:24:56 -0000 1.10
@@ -88,7 +88,6 @@
<property name="bin.dist.dir" value="target/dist-bin/Sandesha-${pom.currentVersion}-bin"/>
<ant:mkdir dir="${bin.dist.dir}"/>
<ant:mkdir dir="${bin.dist.dir}/docs"/>
- <ant:mkdir dir="${bin.dist.dir}/target"/>
<ant:mkdir dir="${bin.dist.dir}/lib"/>
<ant:mkdir dir="${bin.dist.dir}/samples"/>
<ant:mkdir dir="${bin.dist.dir}/docs/api"/>
@@ -113,7 +112,6 @@
<ant:copy file="target/Sandesha-${pom.currentVersion}.jar" todir="${bin.dist.dir}"/>
-
<ant:copy todir="${bin.dist.dir}/samples">
<ant:fileset dir="samples">
<ant:include name="*.xml"/>
@@ -131,8 +129,7 @@
<ant:include name="*.html"/>
<ant:include name="*.txt"/>
</ant:fileset>
-
- </ant:copy>
+ </ant:copy>
<mkdir dir="target/dist"/>
1.10 +1 -1 ws-fx/sandesha/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 10 Jun 2005 11:46:37 -0000 1.9
+++ project.xml 11 Jun 2005 08:24:56 -0000 1.10
@@ -126,7 +126,7 @@
<include>**/*.wsdd</include>
</includes>
<excludes>
- <exclude>**/*TCScenarioTest.java</exclude>
+<!-- <exclude>**/*TCScenarioTest.java</exclude>-->
<!-- <exclude>**/*TCServerStorageManager.java</exclude>-->
</excludes>
<resources>
1.1 ws-fx/sandesha/LICENSE.txt
Index: LICENSE.txt
===================================================================
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed 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.
1.1 ws-fx/sandesha/README.txt
Index: README.txt
===================================================================
======================================================
Apache Sandesha beta build (June 11, 2005)
http://ws.apache.org/ws-fx/sandesha
------------------------------------------------------
___________________
Documentation
===================
Documentation can be found in the docs/ directory included in the
binary distribution and in xdocs/ directory in the source distribution.
___________________
Installation
===================
The binary distribution contains a Sandesha-beta.jar file. To configure Sandesha
in the server side simply follow the steps given bellow.
Step1: Copy Sandesha-beta.jar to the webapps/axis/WEB-INF/lib directory. (Assume that
the user has already configured axis in a servlet container)
Step2: Copy addressing-SNAPSHOT.jar that can be found in the lib directory of the binary
distribution of Sandesha to the same location.
To verify the installation, go to http://localhost:8080/axis/ and
click on the "List" link. Then if you can see the RMSampleService deployed then
you have successfully configured Sandesha on the server side.
________________________________________________
Enabling WS-ReliableMessaging for a Web Service
================================================
To enable WS-RM for a Web Service, the user has to add two handlers and a provider to the
server-config.wsdd of axis. Following xml lines shows the required changes
to enable WS-RM for a Web Service named MyService to its deployment descriptor
--------------------------------------------------------------------------------------------
<deployment xmlns="http://xml.apache.org/axis/wsdd/"
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
<service name="MyService" provider="Handler">
<requestFlow>
<handler type="java:org.apache.sandesha.ws.rm.handlers.RMServerRequestHandler"></handler>
<handler type="java:org.apache.axis.message.addressing.handler.AddressingHandler"></handler>
</requestFlow>
<parameter name="handlerClass" value="org.apache.sandesha.ws.rm.providers.RMProvider"/>
<parameter name="className" value="test.MyService"/>
<parameter name="allowedMethods" value="*"/>
<parameter name="scope" value="request"/>
</service>
</deployment>
----------------------------------------------------------------------------------------------
To build the Sandesha-beta.jar file using the source distribution use the
following command:
$ maven
The jar file will be created in the target/ directory.
_______________________________________________________
Enabling WS-ReliableMessaging for a Web Service Client
=======================================================
To enable WS-RM for a Web Service client the user has to add few code lines to the existing client
code. (Currently Sandesha can only use with the DII based clients, for clients that use generated
stubs, then the user has to manually add these lines to the stubs)
Following code fragment shows these additional lines that are required. A more detailed explanation
can be found in the User Guide.
----------------------------------------------------------------------------------------------
Service service = new Service();
Call call = (Call) service.createCall();
SandeshaContext ctx = new SandeshaContext();
ctx.addNewSequeceContext(call, targetUrl,
"urn:wsrm:echoString",Constants.ClientProperties.IN_OUT);
call.setOperationName(new QName("http://tempuri.org/", "echoString"));
call.addParameter("Text", XMLType.XSD_STRING, ParameterMode.IN);
call.addParameter("Seq", XMLType.XSD_STRING, ParameterMode.IN);
call.setReturnType(org.apache.axis.encoding.XMLType.XSD_STRING);
ctx.setLastMessage(call);
String ret = (String) call.invoke(new Object[]{"Sandesha Echo 1", "abcdef"});
System.out.println("The Response for First Messsage is :" + ret);
ctx.endSequence(call);
} catch (Exception e) { e.printStackTrace();
}
----------------------------------------------------------------------------------------------
___________________
Support
===================
Any problem with this release can be reported to WS-FX the mailing list
If you are sending email to the mailing list make sure to add the [Sandesha] prefix to the subject.
Mailing list subscription:
fx-dev-subscribe@ws.apache.org
Thank you for your support on Sandesha!
Apache Sandesha Team.
1.1 ws-fx/sandesha/release-notes.html
Index: release-notes.html
===================================================================
<html>
<head></head>
<body>
<h1>Apache Sandesha Release Notes</h1>
This is the beta release of the Apache Sandesha.
<h2>What's in this release?</h2>
<p>Following features are available in the release of Sandesha.</p>
<ol>
<li>Implementation of WS-ReliableMessaging specification (February 2005), on top
of Axis 1.2.</li>
<li>INORDER delivery assurance.</li>
<li>Support for synchronous and asynchronous reliable exchange of messages.</li>
<li>A Client API that will make it easy for users to work simultaneously with
different endpoints and different message sequences.</li>
<li>Updated documentation.</li>
<li>Support for WS-Policy integration.</li>
</ol>
<h3>Interop Endpoint </h3>
<p>
<b>Client</b><br>
http://ws.zones.apache.org:7070/sandesha-interop/interop.jsp<br>
<b>Server</b><br>
http://ws.zones.apache.org:7070/sandesha-interop/services/RMInteropService<br>
<br>
</p>
<p>Thanks for your interest in Apache Sandesha</p>
-- Sandesha Development Team
</body>
</html>
1.5 +7 -7 ws-fx/sandesha/samples/README.txt
Index: README.txt
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/samples/README.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- README.txt 10 Jun 2005 12:39:58 -0000 1.4
+++ README.txt 11 Jun 2005 08:24:56 -0000 1.5
@@ -1,15 +1,15 @@
Sandesha Samples.
-If you have downloaded the source distribution, then first build the source using maven.
+If you have downloaded the source distribution, Please build the source using maven first.
-Following targets are availble for Samples.
+Following ant targets are availble to test Samples.
-ping_sync --> runs interop test for AsyncPing
-ping_async --> runs interop test for SyncPing
-echo_sync_ack --> runs interop test for EchoStirng
-echo_async_ack --> runs interop test for EchoStirng
+ping_sync --> runs sample test for AsyncPing
+ping_async --> runs sample test for SyncPing
+echo_sync_ack --> runs sample test for EchoStirng
+echo_async_ack --> runs sample test for EchoStirng
clean --> cleans up all generated files and
usage --> provides help on using the build tool(default)
-For more information, about samples please
+For more information on Apache Sandesha usage, please refer to the Sandesha User Guide.
1.3 +11 -11 ws-fx/sandesha/samples/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/samples/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 10 Jun 2005 12:39:58 -0000 1.2
+++ build.xml 11 Jun 2005 08:24:56 -0000 1.3
@@ -39,23 +39,23 @@
<echo message=" "/>
</target>
-
<target name="check.jar">
<available property="sandesha.jar.found1" file="../Sandesha-beta.jar"/>
- <available property="sandesha.jar.found2" file="../target/Sandesha-beta.jar"/>
+ <available property="target.directory.found" file="../target/Sandesha-beta.jar"/>
</target>
<target name="set.jar.at.root" depends="check.jar" unless="sandesha.jar.found1">
- <antcall target="set.jar.at.target"/>
- </target>
-
- <target name="set.jar.at.target" depends="check.jar" unless="sandesha.jar.found2">
<echo message="Cannot find the Sandesha-beta.jar."/>
- <echo message="If you are using the source distribution, please build the source using maven before running the samples."/>
+ <fail message="If you are using the source distribution, please build the source using maven before running the samples."/>
+ </target>
+
+ <target name="check.target.dir" depends="check.jar" unless="target.directory.found">
+ <mkdir dir="../target"/>
+ <antcall target="set.jar.at.root"/>
</target>
- <target name="init" depends="set.jar.at.root">
+ <target name="init" depends="check.target.dir">
<property name="dir.libs" value="../lib"/>
<property name="dir.root" value="../"/>
<property name="dir.target" value="../target"/>
@@ -68,7 +68,7 @@
<fileset dir="${dir.root}">
<include name="${jar.name}"/>
</fileset>
- <fileset dir="${dir.target}" >
+ <fileset dir="${dir.target}">
<include name="${jar.name}"/>
</fileset>
</path>
@@ -106,7 +106,7 @@
<!-- =================================================================== -->
<!-- Launches the functional test HTTP server -->
<!-- =================================================================== -->
- <target name="run_server">
+ <target name="run_server" depends="init" >
<echo message="Starting test http server."/>
<java classname="org.apache.axis.transport.http.SimpleAxisServer" spawn="true" fork="yes">
<arg line="-p 8080"/> <!-- arbitrary port -->
@@ -139,7 +139,7 @@
</java>
</target>
- <target name="shutdown_server">
+ <target name="shutdown_server" depends="init" >
<echo message="ShutDown the server "/>
<java classname="org.apache.axis.client.AdminClient" fork="yes" spawn="true">
<classpath refid="classpath.libraries"/>
1.7 +5 -5 ws-fx/sandesha/src/org/apache/sandesha/SandeshaContext.java
Index: SandeshaContext.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/SandeshaContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SandeshaContext.java 8 Jun 2005 08:58:31 -0000 1.6
+++ SandeshaContext.java 11 Jun 2005 08:24:56 -0000 1.7
@@ -69,7 +69,7 @@
if (client) {
IStorageManager storageManager = new ClientStorageManager();
if (!cleintSenderStarted) {
- System.out.println(Constants.InfomationMessage.SENDER_STARTED);
+ log.info(Constants.InfomationMessage.SENDER_STARTED);
cleintSender = new Sender(storageManager);
SimpleChain reqChain = getRequestChain();
SimpleChain resChain = getResponseChain();
@@ -83,7 +83,7 @@
return storageManager;
} else {
if (!serverSenderStarted) {
- System.out.println(Constants.InfomationMessage.SENDER_STARTED);
+ log.info(Constants.InfomationMessage.SENDER_STARTED);
serverSender = new Sender();
serverSender.startSender();
serverSenderStarted = true;
@@ -140,7 +140,7 @@
long inactivityTimeOut = PolicyLoader.getInstance().getInactivityTimeout();
while (!storageManager.isAllSequenceComplete()) {
try {
- System.out.println(Constants.InfomationMessage.WAITING_TO_STOP_CLIENT);
+ log.info(Constants.InfomationMessage.WAITING_TO_STOP_CLIENT);
Thread.sleep(Constants.CLIENT_WAIT_PERIOD_FOR_COMPLETE);
if ((System.currentTimeMillis() - startingTime) >= inactivityTimeOut) {
stopClientByForce();
@@ -163,7 +163,7 @@
String seqId = (String) call.getProperty(Constants.ClientProperties.CALL_KEY);
while (!storageManager.isSequenceComplete(seqId)) {
try {
- System.out.println(Constants.InfomationMessage.WAITING_TO_STOP_CLIENT);
+ log.info(Constants.InfomationMessage.WAITING_TO_STOP_CLIENT);
Thread.sleep(Constants.CLIENT_WAIT_PERIOD_FOR_COMPLETE);
if ((System.currentTimeMillis() - startingTime) >= inactivityTimeOut) {
stopClientByForce();
@@ -262,7 +262,7 @@
if (!listenerStarted) {
listenerStarted = true;
try {
- System.out.println(Constants.InfomationMessage.CLIENT_LISTENER_STARTED);
+ log.info(Constants.InfomationMessage.CLIENT_LISTENER_STARTED);
sas = new SimpleAxisServer();
SimpleProvider sp = new SimpleProvider();
1.4 +8 -8 ws-fx/sandesha/src/org/apache/sandesha/server/SenderWorker.java
Index: SenderWorker.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/server/SenderWorker.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SenderWorker.java 10 Jun 2005 11:46:37 -0000 1.3
+++ SenderWorker.java 11 Jun 2005 08:24:56 -0000 1.4
@@ -119,8 +119,8 @@
inactivityTimeout) {
log.error("Inactivity Time Out Reached for the message with <wsa:MessageID> " +
rmMessageContext.getMessageID());
- storageManager.clearStorage();
-
+ //Need to clear the storage only for this sequece.
+ // storageManager.clearStorage();
} else if (rmMessageContext.getRetransmissionTime() <
(System.currentTimeMillis() - rmMessageContext.getLastPrecessedTime())) {
@@ -176,19 +176,19 @@
switch (rmMessageContext.getMessageType()) {
case Constants.MSG_TYPE_CREATE_SEQUENCE_REQUEST:
{
- System.out.println(Constants.InfomationMessage.SENDING_CREATE_SEQ);
+ log.info(Constants.InfomationMessage.SENDING_CREATE_SEQ);
sendCreateSequenceRequest(rmMessageContext);
break;
}
case Constants.MSG_TYPE_CREATE_SEQUENCE_RESPONSE:
{
- System.out.println(Constants.InfomationMessage.SENDING_CREATE_SEQ_RES);
+ log.info(Constants.InfomationMessage.SENDING_CREATE_SEQ_RES);
sendCreateSequenceResponse(rmMessageContext);
break;
}
case Constants.MSG_TYPE_TERMINATE_SEQUENCE:
{
- System.out.println(Constants.InfomationMessage.SENDING_TERMINATE_SEQ);
+ log.info(Constants.InfomationMessage.SENDING_TERMINATE_SEQ);
sendTerminateSequenceRequest(rmMessageContext);
storageManager.setTerminateSend(storageManager.getKeyFromOutgoingSeqId(
rmMessageContext.getSequenceID()));
@@ -196,19 +196,19 @@
}
case Constants.MSG_TYPE_ACKNOWLEDGEMENT:
{
- System.out.println(Constants.InfomationMessage.SENDING_ACK);
+ log.info(Constants.InfomationMessage.SENDING_ACK);
sendAcknowldgement(rmMessageContext);
break;
}
case Constants.MSG_TYPE_SERVICE_REQUEST:
{
- System.out.println(Constants.InfomationMessage.SENDING_REQ);
+ log.info(Constants.InfomationMessage.SENDING_REQ);
sendServiceRequest(rmMessageContext);
break;
}
case Constants.MSG_TYPE_SERVICE_RESPONSE:
{
- System.out.println(Constants.InfomationMessage.SENDING_RES);
+ log.info(Constants.InfomationMessage.SENDING_RES);
sendServiceResponse(rmMessageContext);
break;
}
1.2 +6 -2 ws-fx/sandesha/test/org/apache/sandesha/intergratedtest/RMTestService.java
Index: RMTestService.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/test/org/apache/sandesha/intergratedtest/RMTestService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RMTestService.java 25 May 2005 10:09:01 -0000 1.1
+++ RMTestService.java 11 Jun 2005 08:24:56 -0000 1.2
@@ -17,12 +17,16 @@
package org.apache.sandesha.intergratedtest;
+import org.apache.axis.components.logger.LogFactory;
+import org.apache.commons.logging.Log;
+
import java.util.HashMap;
import java.util.Map;
public class RMTestService {
private static Map sequences = new HashMap();
+ private static final Log log = LogFactory.getLog(RMTestService.class.getName());
public String echoString(String text, String sequence) {
@@ -33,11 +37,11 @@
sequences.put(sequence, (new String(text)));
}
- System.out.println("ECHO-STRING SERVICE " + text);
+ log.info("ECHO-STRING SERVICE " + text);
return text;
}
public void ping(String text) {
- System.out.println("PING-STRING SERVICE " + text);
+ log.info("PING-STRING SERVICE " + text);
}
}
1.5 +36 -48 ws-fx/sandesha/test/org/apache/sandesha/intergratedtest/TCScenarioTest.java
Index: TCScenarioTest.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/test/org/apache/sandesha/intergratedtest/TCScenarioTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TCScenarioTest.java 29 May 2005 11:22:04 -0000 1.4
+++ TCScenarioTest.java 11 Jun 2005 08:24:56 -0000 1.5
@@ -21,23 +21,21 @@
import org.apache.axis.client.Service;
import org.apache.axis.components.uuid.UUIDGen;
import org.apache.axis.components.uuid.UUIDGenFactory;
-import org.apache.axis.encoding.XMLType;
-import org.apache.axis.transport.http.SimpleAxisServer;
-import org.apache.axis.EngineConfiguration;
import org.apache.axis.deployment.wsdd.WSDDDeployment;
import org.apache.axis.deployment.wsdd.WSDDDocument;
+import org.apache.axis.encoding.XMLType;
+import org.apache.axis.transport.http.SimpleAxisServer;
import org.apache.sandesha.Constants;
import org.apache.sandesha.RMReport;
import org.apache.sandesha.SandeshaContext;
import org.w3c.dom.Document;
import javax.xml.namespace.QName;
-import javax.xml.rpc.ParameterMode;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-
-import java.net.ServerSocket;
+import javax.xml.rpc.ParameterMode;
import java.io.File;
+import java.net.ServerSocket;
/**
* Created by IntelliJ IDEA.
@@ -79,7 +77,7 @@
public void tearDown() throws InterruptedException {
if (testCount == 0) {
Thread.sleep(5000);
- sas.stop();
+ sas.stop();
}
}
@@ -90,7 +88,7 @@
* @throws Exception
*/
public void testPingSync() throws Exception {
- System.out.println("===================Synchronous Ping Test Started=====================");
+ System.out.println(" Synchronous Ping Test Started");
Service service = new Service();
Call call = (Call) service.createCall();
@@ -104,17 +102,16 @@
call.addParameter("arg1", XMLType.XSD_STRING, ParameterMode.IN);
- call.invoke(new Object[]{"Ping Message Number One"});
- call.invoke(new Object[]{"Ping Message Number Two"});
+ call.invoke(new Object[]{"Ping One"});
ctx.setLastMessage(call);
- call.invoke(new Object[]{"Ping Message Number Three"});
+ call.invoke(new Object[]{"Ping Two"});
RMReport report = ctx.endSequence(call);
assertEquals(report.isAllAcked(), true);
assertEquals(report.getNumberOfReturnMessages(), 0);
testCount--;
- System.out.println("===================Synchronous Ping Test Finished====================");
+ System.out.println(" Synchronous Ping Test Finished");
}
/**
@@ -124,7 +121,7 @@
* @throws Exception
*/
public void testPingAsync() throws Exception {
- System.out.println("==================ASynchronous Ping Test Started=====================");
+ System.out.println(" Asynchronous Ping Test Started");
Service service = new Service();
Call call = (Call) service.createCall();
@@ -138,17 +135,16 @@
call.setOperationName(new QName("http://tempuri.org", "Ping"));
call.addParameter("Text", XMLType.XSD_STRING, ParameterMode.IN);
- call.invoke(new Object[]{"Ping Message Number One"});
- call.invoke(new Object[]{"Ping Message Number Two"});
+ call.invoke(new Object[]{"Ping One"});
ctx.setLastMessage(call);
- call.invoke(new Object[]{"Ping Message Number Three"});
+ call.invoke(new Object[]{"Ping Two"});
RMReport report = ctx.endSequence(call);
assertEquals(report.isAllAcked(), true);
assertEquals(report.getNumberOfReturnMessages(), 0);
testCount--;
- System.out.println("==================ASynchronous Ping Test Finished====================");
+ System.out.println(" Asynchronous Ping Test Finished");
}
@@ -162,7 +158,7 @@
*/
public void testEchoSyncAck() throws Exception {
- System.out.println("=====================Echo(Sync Ack) Test Started=====================");
+ System.out.println(" Echo(Sync Ack) Test Started");
UUIDGen uuidGen = UUIDGenFactory.getUUIDGen(); //Can use this for continuous testing.
String str = uuidGen.nextUUID();
@@ -184,22 +180,19 @@
call.addParameter("arg2", XMLType.XSD_STRING, ParameterMode.IN);
call.setReturnType(org.apache.axis.encoding.XMLType.XSD_STRING);
- String ret = (String) call.invoke(new Object[]{"Sandesha Echo 1", str});
- System.out.println("The Response for First Messsage is :" + ret);
-
- ret = (String) call.invoke(new Object[]{"Sandesha Echo 2", str});
- System.out.println("The Response for Second Messsage is :" + ret);
+ String ret = (String) call.invoke(new Object[]{" Echo 1 ", str});
+ System.out.println(" The Response for First Messsage is :" + ret);
ctx.setLastMessage(call);
- ret = (String) call.invoke(new Object[]{"Sandesha Echo 3", str});
- System.out.println("The Response for Third Messsage is :" + ret);
+ ret = (String) call.invoke(new Object[]{" Echo 2 ", str});
+ System.out.println(" The Response for Second Messsage is :" + ret);
RMReport report = ctx.endSequence(call);
assertEquals(report.isAllAcked(), true);
- assertEquals(report.getNumberOfReturnMessages(), 3);
+ assertEquals(report.getNumberOfReturnMessages(), 2);
testCount--;
- System.out.println("====================Echo(Sync Ack) Test Finished=====================");
+ System.out.println(" Echo(Sync Ack) Test Finished");
}
/**
@@ -210,7 +203,7 @@
* @throws Exception
*/
public void testEchoAsyncAck() throws Exception {
- System.out.println("=====================Echo(Aync Ack) Test Started=====================");
+ System.out.println(" Echo(Aync Ack) Test Started");
UUIDGen uuidGen = UUIDGenFactory.getUUIDGen(); //Can use this for continuous testing.
String str = uuidGen.nextUUID();
@@ -233,22 +226,19 @@
call.addParameter("arg2", XMLType.XSD_STRING, ParameterMode.IN);
call.setReturnType(org.apache.axis.encoding.XMLType.XSD_STRING);
- String ret = (String) call.invoke(new Object[]{"Sandesha Echo 1", str});
- System.out.println("The Response for First Messsage is :" + ret);
-
- ret = (String) call.invoke(new Object[]{"Sandesha Echo 2", str});
- System.out.println("The Response for Second Messsage is :" + ret);
+ String ret = (String) call.invoke(new Object[]{" Echo 1 ", str});
+ System.out.println(" The Response for First Messsage is :" + ret);
ctx.setLastMessage(call);
- ret = (String) call.invoke(new Object[]{"Sandesha Echo 3", str});
- System.out.println("The Response for Third Messsage is :" + ret);
+ ret = (String) call.invoke(new Object[]{" Echo 2 ", str});
+ System.out.println(" The Response for Second Messsage is :" + ret);
RMReport report = ctx.endSequence(call);
assertEquals(report.isAllAcked(), true);
- assertEquals(report.getNumberOfReturnMessages(), 3);
+ assertEquals(report.getNumberOfReturnMessages(), 2);
testCount--;
- System.out.println("===================Echo(Async Ack) Test Finished=====================");
+ System.out.println(" Echo(Async Ack) Test Finished");
}
/**
@@ -260,7 +250,7 @@
* @throws Exception
*/
public void testEchoPing() throws Exception {
- System.out.println("================Echo and Ping Combined Test Started==================");
+ System.out.println(" Echo and Ping Combined Test Started");
UUIDGen uuidGen = UUIDGenFactory.getUUIDGen(); //Can use this for continuous testing.
String str = uuidGen.nextUUID();
@@ -296,30 +286,28 @@
//----------------------PING------------------------------------------------
- String ret = (String) echoCall.invoke(new Object[]{"Sandesha Echo 1", str});
- System.out.println("The Response for First Messsage is :" + ret);
+ String ret = (String) echoCall.invoke(new Object[]{" Echo 1 ", str});
+ System.out.println(" The Response for First Messsage is :" + ret);
pingCall.invoke(new Object[]{ret});
- ret = (String) echoCall.invoke(new Object[]{"Sandesha Echo 2", str});
- System.out.println("The Response for Second Messsage is :" + ret);
+ ctx.setLastMessage(echoCall);
+ ret = (String) echoCall.invoke(new Object[]{" Echo 2 ", str});
+ System.out.println(" The Response for Second Messsage is :" + ret);
pingCall.invoke(new Object[]{ret});
- ctx.setLastMessage(echoCall);
- ret = (String) echoCall.invoke(new Object[]{"Sandesha Echo 3", str});
- System.out.println("The Response for Third Messsage is :" + ret);
ctx.setLastMessage(pingCall);
pingCall.invoke(new Object[]{ret});
RMReport echoReport = ctx.endSequence(echoCall);
- RMReport pingReport=ctx.endSequence(pingCall);
+ RMReport pingReport = ctx.endSequence(pingCall);
assertEquals(echoReport.isAllAcked(), true);
- assertEquals(echoReport.getNumberOfReturnMessages(), 3);
+ assertEquals(echoReport.getNumberOfReturnMessages(), 2);
assertEquals(pingReport.isAllAcked(), true);
assertEquals(pingReport.getNumberOfReturnMessages(), 0);
testCount--;
- System.out.println("===============Echo and Ping Combined Test Finished==================");
+ System.out.println(" Echo and Ping Combined Test Finished");
}