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/05/17 09:23:46 UTC
cvs commit: ws-fx/sandesha/src/org/apache/sandesha/ws/rm AckRequested.java CreateSequence.java CreateSequenceResponse.java Sequence.java SequenceAcknowledgement.java SequenceOffer.java TerminateSequence.java
jaliya 2005/05/17 00:23:46
Modified: sandesha/config WSRMPolicy.xml
sandesha/interop build.xml
sandesha/interop/org/apache/sandesha/samples/interop/testclient
InteropCallback.java InteropStub.java
sandesha/interop/webapp/jsp interop.jsp
sandesha maven.xml
sandesha/src/org/apache/sandesha Constants.java
EnvelopeCreator.java
sandesha/src/org/apache/sandesha/storage CallbackData.java
sandesha/src/org/apache/sandesha/ws/rm AckRequested.java
CreateSequence.java CreateSequenceResponse.java
Sequence.java SequenceAcknowledgement.java
SequenceOffer.java TerminateSequence.java
Log:
Changed the interop test client to handle to display exeption messages, and also modified the appearance
Revision Changes Path
1.5 +1 -1 ws-fx/sandesha/config/WSRMPolicy.xml
Index: WSRMPolicy.xml
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/config/WSRMPolicy.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WSRMPolicy.xml 16 May 2005 13:09:18 -0000 1.4
+++ WSRMPolicy.xml 17 May 2005 07:23:46 -0000 1.5
@@ -9,7 +9,7 @@
<wsp:Policy wsu:Id="MyPolicy" >
<wsrm:RMAssertion>
<!-- <wsrm:InactivityTimeout Milliseconds="600000" /> -->
- <wsrm:InactivityTimeout Milliseconds="120000" />
+ <wsrm:InactivityTimeout Milliseconds="60000" />
<wsrm:BaseRetransmissionInterval Milliseconds="3000" />
<wsrm:ExponentialBackoff />
<wsrm:AcknowledgementInterval Milliseconds="200" />
1.10 +5 -1 ws-fx/sandesha/interop/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 16 May 2005 13:09:18 -0000 1.9
+++ build.xml 17 May 2005 07:23:46 -0000 1.10
@@ -381,7 +381,7 @@
<target name="prepare-jar" depends="compile.library,prepare-dist" description="prepares for creating jar">
- <property name="sandesha.jar.name" value="sandesha-1.0.jar" />
+ <property name="sandesha.jar.name" value="SandeshaInterop.jar" />
<property name="dir.dist.jar" value="${dir.dist}/jar" />
<property name="sandesha.jar" value="${dir.dist.jar}/${sandesha.jar.name}" />
<property name="axishome" value="${env1.CATALINA_HOME}/webapps/axis/WEB-INF/lib" />
@@ -422,13 +422,17 @@
</target>
<target name="war.copy" depends="war" >
+ <delete file="${webapps}/${sandesha.war}" />
+ <delete dir="${webapps}/sandesha" />
<copy file="${sandesha.war}" todir="${webapps}" />
</target>
<target name="jar.copy" depends="jar" >
+ <delete file="${axishome}/${sandesha.jar.name}" />
<copy file="${sandesha.jar}" todir="${axishome}" />
</target>
+
<target name="war" depends="create.war" description="creates the war file" />
</project>
1.4 +95 -87 ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/testclient/InteropCallback.java
Index: InteropCallback.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/interop/org/apache/sandesha/samples/interop/testclient/InteropCallback.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InteropCallback.java 14 May 2005 17:18:54 -0000 1.3
+++ InteropCallback.java 17 May 2005 07:23:46 -0000 1.4
@@ -6,101 +6,109 @@
*/
package org.apache.sandesha.samples.interop.testclient;
-import java.io.IOException;
-import java.util.ArrayList;
-
-import javax.swing.JOptionPane;
-
import org.apache.sandesha.Constants;
import org.apache.sandesha.storage.Callback;
import org.apache.sandesha.storage.CallbackData;
/**
* @author root
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
+ * <p/>
+ * To change the template for this generated type comment go to
+ * Window>Preferences>Java>Code Generation>Code and Comments
*/
public class InteropCallback extends Callback {
- private ResponseWriter writer = null;
- private boolean testFinished = false;
-
- public synchronized void setTestFinished(boolean finished){
- this.testFinished = finished;
- }
-
- public synchronized boolean isTestFinished(){
- return testFinished;
- }
-
- public InteropCallback (ResponseWriter writer){
- this.writer = writer;
- }
-
- public synchronized void onIncomingMessage(CallbackData result) {
-
- String action = result.getAction();
- String msgType = action;
- if(action!=null) {
- if(action.equals(Constants.WSRM.ACTION_CREATE_SEQUENCE))
- msgType = "create sequence";
- else if(action.equals(Constants.WSRM.ACTION_CREATE_SEQUENCE_RESPONSE))
- msgType = "create sequence response";
- else if(action.equals(Constants.WSRM.ACTION_TERMINATE_SEQUENCE))
- msgType = "terminate sequence";
- else if(action.equals(Constants.WSRM.SEQUENCE_ACKNOWLEDGEMENT_ACTION))
- msgType = "acknowledgement";
- }else{
- msgType = "";
-
- }
-
- String entry = "";
- if(result.getMessageId()!=null && result.getMessageId()!="")
- entry = "<br /><font color='red' size='2' > Got " + msgType +" message. ID : " + result.getMessageId() + "</font>"; // + result.getSequenceId() + " </font>";
- else
- entry = "<br /><font color='red' size='2' > Got " + msgType + "</font>";
-
-
- boolean b = writer.write(entry);
- if(!b)
- setTestFinished(true);
- }
-
- public synchronized void onOutgoingMessage(CallbackData result) {
-
- int type = result.getMessageType();
- String msgType = null;
-
- if(type==Constants.MSG_TYPE_CREATE_SEQUENCE_REQUEST)
- msgType = "create sequence";
- else if(type==Constants.MSG_TYPE_CREATE_SEQUENCE_RESPONSE)
- msgType = "create sequence response";
- else if(type==Constants.MSG_TYPE_TERMINATE_SEQUENCE)
- msgType = "terminate sequence";
- else if(type==Constants.MSG_TYPE_ACKNOWLEDGEMENT)
- msgType = "acknowledgement";
- else if(type==Constants.MSG_TYPE_SERVICE_REQUEST)
- msgType = "service request";
- else if(type==Constants.MSG_TYPE_SERVICE_RESPONSE)
- msgType = "service response";
-
- String entry = "";
- if(result.getMessageId()!=null && result.getMessageId()!="")
- entry = "<br /><font color='blue' size='2' > Sent " + msgType +" message. ID : " + result.getMessageId() + "</font>";// + result.getSequenceId() + " </font>";
- else {
- entry = "<br /><font color='blue' size='2' > Sent " + msgType + "</font>";
- }
-
-
- boolean b = writer.write(entry);
- if(!b)
- setTestFinished(true);
-
- if(result.getMessageType()==6)
- setTestFinished(true);
-
- }
+ private ResponseWriter writer = null;
+ private boolean testFinished = false;
+
+ public synchronized void setTestFinished(boolean finished) {
+ this.testFinished = finished;
+ }
+
+ public synchronized boolean isTestFinished() {
+ return testFinished;
+ }
+
+ public InteropCallback(ResponseWriter writer) {
+ this.writer = writer;
+ }
+
+ public synchronized void onIncomingMessage(CallbackData result) {
+
+ String action = result.getAction();
+ String msgType = action;
+ if (action != null) {
+ if (action.equals(Constants.WSRM.ACTION_CREATE_SEQUENCE))
+ msgType = "Create Sequence";
+ else if (action.equals(Constants.WSRM.ACTION_CREATE_SEQUENCE_RESPONSE))
+ msgType = "Create Sequence Response";
+ else if (action.equals(Constants.WSRM.ACTION_TERMINATE_SEQUENCE))
+ msgType = "Terminate Sequence";
+ else if (action.equals(Constants.WSRM.SEQUENCE_ACKNOWLEDGEMENT_ACTION))
+ msgType = "Sequence Acknowledgement";
+ } else {
+ msgType = "";
+
+ }
+
+ String entry = "";
+ if (result.getMessageId() != null && result.getMessageId() != "")
+ entry = "<br /><font color='green' size='2' > Received " + msgType + " Message. ID : " +
+ result.getMessageId() +
+ "</font>"; // + result.getSequenceId() + " </font>";
+ else
+ entry = "<br /><font color='green' size='2' > Received " + msgType + "</font>";
+
+
+ boolean b = writer.write(entry);
+ if (!b)
+ setTestFinished(true);
+ }
+
+ public synchronized void onOutgoingMessage(CallbackData result) {
+
+ int type = result.getMessageType();
+ String msgType = null;
+
+ if (type == Constants.MSG_TYPE_CREATE_SEQUENCE_REQUEST)
+ msgType = "Create Sequence";
+ else if (type == Constants.MSG_TYPE_CREATE_SEQUENCE_RESPONSE)
+ msgType = "Create Sequence Response";
+ else if (type == Constants.MSG_TYPE_TERMINATE_SEQUENCE)
+ msgType = "Terminate Sequence";
+ else if (type == Constants.MSG_TYPE_ACKNOWLEDGEMENT)
+ msgType = "Sequence Acknowledgement";
+ else if (type == Constants.MSG_TYPE_SERVICE_REQUEST)
+ msgType = "Service Request";
+ else if (type == Constants.MSG_TYPE_SERVICE_RESPONSE)
+ msgType = "Service Response";
+
+ String entry = "";
+ if (result.getMessageId() != null && result.getMessageId() != "")
+ entry = "<br /><font color='blue' size='2' > Sent " + msgType + " Message. ID : " +
+ result.getMessageId() +
+ "</font>";// + result.getSequenceId() + " </font>";
+ else {
+ entry = "<br /><font color='blue' size='2' > Sent " + msgType + "</font>";
+ }
+
+
+ boolean b = writer.write(entry);
+ if (!b)
+ setTestFinished(true);
+
+ if (result.getMessageType() == 6)
+ setTestFinished(true);
+
+ }
+
+ public synchronized void onError(Exception exp) {
+ String entry = "<br /><font color='red' size='2' > Error : " + exp.getLocalizedMessage() +
+ "</font>";// + result.getSequenceId() + " </font>";
+ boolean b = writer.write(entry);
+ if (!b)
+ setTestFinished(true);
+
+ }
}
1.7 +15 -0 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InteropStub.java 16 May 2005 13:09:18 -0000 1.6
+++ InteropStub.java 17 May 2005 07:23:46 -0000 1.7
@@ -11,14 +11,25 @@
import org.apache.axis.client.Service;
import org.apache.axis.encoding.XMLType;
import org.apache.axis.message.addressing.util.AddressingUtils;
+import org.apache.axis.AxisFault;
import org.apache.sandesha.Constants;
import org.apache.sandesha.RMInitiator;
import org.apache.sandesha.RMTransport;
+import org.apache.sandesha.storage.CallbackData;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
public class InteropStub {
+ public static InteropCallback getCallback() {
+ return callback;
+ }
+
+ public static void setCallback(InteropCallback callback) {
+ InteropStub.callback = callback;
+ }
+
+ private static InteropCallback callback=null;
public void runPing(InteropBean bean) {
String target = bean.getTarget();
@@ -79,6 +90,8 @@
RMInitiator.stopClient();
} catch (Exception e) {
+ if(callback!=null)
+ callback.onError(e);
e.printStackTrace();
}
}
@@ -161,6 +174,8 @@
RMInitiator.stopClient();
} catch (Exception e) {
+ if(callback!=null)
+ callback.onError(e);
e.printStackTrace();
}
}
1.3 +25 -51 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- interop.jsp 16 May 2005 06:09:48 -0000 1.2
+++ interop.jsp 17 May 2005 07:23:46 -0000 1.3
@@ -1,15 +1,16 @@
-<%@ page import="org.apache.sandesha.server.*,org.apache.sandesha.samples.interop.testclient.*,org.apache.sandesha.client.ClientStorageManager,org.apache.sandesha.ws.rm.providers.RMProvider,javax.servlet.jsp.*"%>
+<%@ page import="org.apache.sandesha.server.*,org.apache.sandesha.samples.interop.testclient.*,org.apache.sandesha.client.ClientStorageManager,org.apache.sandesha.ws.rm.providers.RMProvider,javax.servlet.jsp.*,
+ java.io.Writer,
+ java.io.PrintWriter"%>
<%@ 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="*" />
<%
-response.getWriter().println("<html>");
-response.getWriter().println("<head>");
-response.getWriter().flush();
+out.println("<html>");
+out.println("<head>");
%>
-<title>Hi!! Welcome to Apache Sandesha Innterop Test</title>
+<title>Welcome to Apache Sandesha Innterop Test</title>
<script>
function displayServer(){
@@ -78,8 +79,7 @@
<h1>Apache Sandesha Interop Testing</h1>
<%
-
- String endPoint = request.getParameter("endPoint");
+ String endPoint = request.getParameter("endPoint");
String method = request.getParameter("method");
String run = request.getParameter("running");
@@ -98,11 +98,7 @@
serverSelected = "false";
clientSelected = "true";
}
-
- /*out.println( "client variable sorc is " + endPoint);
- out.println( "client variable method is " + endPoint);
- out.println( "running is " + run); */
-
+ ResponseWriter writer = new ResponseWriter (response.getWriter());
%>
<form method="post" name="InteropTesting" action="interop.jsp">
@@ -217,14 +213,14 @@
<tr>
<td width="4%">acks</td>
<td width="13%"><input type="checkbox" name="acks" value="checked" checked></td>
- <td width="14%">Terminate seq</td>
+ <td width="14%">Terminate Sequence</td>
<td width="49%"><input type="checkbox" name="terminate" value="checked" checked></td>
</tr>
</table>
</td>
</tr>
<tr>
- <td colspan='1'>no. of Msgs</td>
+ <td colspan='1'>No. of Messages</td>
<td colspan ='10' ><select name='noOfMsgs'>
<option value="1">1</option>
<option value="2">2</option>
@@ -249,9 +245,11 @@
</form>
<hr />
+<% out.flush();%>
<span>
<%
- runTest(interopBean,response);
+ runTest(interopBean,writer);
+ writer.flush();
%>
</span>
@@ -263,7 +261,7 @@
<%!
-public void runTest(InteropBean bean,HttpServletResponse res) throws Exception {
+public void runTest(InteropBean bean,ResponseWriter writer) throws Exception {
String to = null;
if(bean!=null){
@@ -272,9 +270,9 @@
if(to!=null) {
//session.setParameter("runTest");
- ResponseWriter writer = new ResponseWriter (res.getWriter());
+ //ResponseWriter writer = new ResponseWriter (res.getWriter());
- writer.write(" <br /> Starting test ....... <br /> ");
+ writer.write(" <span><br /><h3> Starting Test ....... <br /></h3> ");
writer.flush();
String target = bean.getTarget();
@@ -285,15 +283,8 @@
String operation = bean.getOperation();
int messages = bean.getNoOfMsgs();
- //set the callbacks
-
-
- //run the service
-
-
- // *********** code to run client test
-
//create callback classe and register
+
InteropCallback callback = new InteropCallback (writer);
ClientStorageManager csm = new ClientStorageManager ();
@@ -301,33 +292,16 @@
RMProvider.setCallback(callback);
Sender.setCallback(callback);
-
- //start the test
- //TestRunnerThread runner = new TestRunnerThread ();
- //runner.setDaemon(true);
- //runner.setMethod (method);
- //runner.setBean(bean);
-
-
-
- //runner.start();
-
- //while(!callback.isTestFinished()){
-
- // Thread.sleep(100);
- //}
- InteropStub stub= new InteropStub();
+ InteropStub stub= new InteropStub();
+ InteropStub.setCallback(callback);
if(operation.equalsIgnoreCase("ping")){
- stub.runPing(bean);
+ stub.runPing(bean);
+ }else if(operation.equalsIgnoreCase("echoString") ){
+ stub.runEcho(bean);
+ }
- }else if(operation.equalsIgnoreCase("echoString") ){
- stub.runEcho(bean);
- }
-
-
- writer.write (" <br /> <br />Test finished... ");
- writer.write ("<hr /><br />");
- writer.flush();
+ writer.write (" <br /> <br /><h3>Test Finished... </h3>");
+ writer.write ("<hr /><br /></span>");
csm.removeCallback();
RMProvider.removeCallback();
1.7 +2 -2 ws-fx/sandesha/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/maven.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven.xml 16 May 2005 13:09:18 -0000 1.6
+++ maven.xml 17 May 2005 07:23:46 -0000 1.7
@@ -44,7 +44,7 @@
</preGoal>
<goal name="interop.jar" prereqs="java:compile">
- <ant:property name="sandesha.jar.name" value="sandesha-interop.jar"/>
+ <ant:property name="sandesha.jar.name" value="Sandesha-interop.jar"/>
<ant:mkdir dir="${basedir}/dist/jar"/>
<ant:jar basedir="${maven.build.dir}/classes" destfile="${sandesha.jar.name}"/>
</goal>
1.47 +17 -28 ws-fx/sandesha/src/org/apache/sandesha/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/Constants.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Constants.java 16 May 2005 06:08:17 -0000 1.46
+++ Constants.java 17 May 2005 07:23:46 -0000 1.47
@@ -39,7 +39,7 @@
public static final String URL_RM_SERVICE = "/axis/services/RMService";
public static final String IGNORE_ACTION = "ignoreAction";
- public static final String RESPONSE="Response";
+ public static final String RESPONSE = "Response";
public static final long RETRANSMISSION_INTERVAL = 4000;
public static final long ACKNOWLEDGEMENT_INTERVAL = 200;
@@ -60,24 +60,23 @@
public static final int MSG_TYPE_ACKNOWLEDGEMENT = 5;
public static final int MSG_TYPE_TERMINATE_SEQUENCE = 6;
-
//To identify the end point
public static final byte SERVER = 1;
public static final byte CLIENT = 0;
- public interface WSA{
+ public interface WSA {
public static final String NS_ADDRESSING_ANONYMOUS = AddressingUtils.getAnonymousRoleURI();
}
-
public interface WSRM {
public static final String NS_PREFIX_RM = "wsrm";
public static final String NS_URI_RM = "http://schemas.xmlsoap.org/ws/2005/02/rm";
- public static final String ACTION_CREATE_SEQUENCE = NS_URI_RM+"/CreateSequence";
- public static final String ACTION_CREATE_SEQUENCE_RESPONSE = NS_URI_RM+"/CreateSequenceResponse";
- public static final String ACTION_TERMINATE_SEQUENCE = NS_URI_RM+"/TerminateSequence";
- public static final String SEQUENCE_ACKNOWLEDGEMENT_ACTION = NS_URI_RM+"/SequenceAcknowledgement";
-
+ public static final String ACTION_CREATE_SEQUENCE = NS_URI_RM + "/CreateSequence";
+ public static final String ACTION_CREATE_SEQUENCE_RESPONSE = NS_URI_RM +
+ "/CreateSequenceResponse";
+ public static final String ACTION_TERMINATE_SEQUENCE = NS_URI_RM + "/TerminateSequence";
+ public static final String SEQUENCE_ACKNOWLEDGEMENT_ACTION = NS_URI_RM +
+ "/SequenceAcknowledgement";
public static final String ACK_RANGE = "AcknowledgementRange";
public static final String UPPER = "Upper";
@@ -95,18 +94,10 @@
public static final String SEQUENCE_FAULT = "SequenceFault";
public static final String ACKS_TO = "AcksTo";
public static final String SEQUENCE_OFFER = "Offer";
- public static final String ACCEPT="Accept";
- public static final String IDENTIFIER="Identifier";
-
+ public static final String ACCEPT = "Accept";
+ public static final String IDENTIFIER = "Identifier";
public static final double MAX_MSG_NO = 18446744073709551615d;
-
- }
-
- public interface WSU {
- public static final String WSU_PREFIX = "wsrm";
- public static final String WSU_NS = "http://schemas.xmlsoap.org/ws/2005/02/rm";
- public static final String IDENTIFIER = "Identifier";
}
public interface FaultMessages {
@@ -114,8 +105,8 @@
public static final String NO_ADDRESSING_HEADERS = "No Addressing Headers Available in this Message";
public static final String NO_MESSAGE_ID = "MessageID should be present in the message";
- public static final String NO_TO="Required header <wsa:To> NOT found.";
- public static final String NO_ACTION="Required header <wsa:Action> NOT found.";
+ public static final String NO_TO = "Required header <wsa:To> NOT found.";
+ public static final String NO_ACTION = "Required header <wsa:Action> NOT found.";
public static final String NO_RM_HEADES = "No RM Headers Available in this Message";
@@ -123,12 +114,11 @@
public static final String UNKNOWN_SEQUENCE = "The value of wsrm:Identifier is not a known Sequence identifier.";
public static final String MSG_NO_ROLLOVER = "The maximum value for wsrm:MessageNumber has been exceeded.";
public static final String LAST_MSG_NO_EXCEEDED = "The value for wsrm:MessageNumber exceeds the value of the MessageNumber accompanying a LastMessage element in this Sequence.";
- public static final String INVALID_MESSAGE="Invalid Message";
+ public static final String INVALID_MESSAGE = "Invalid Message";
}
public interface FaultCodes {
public static final String WSRM_SERVER_INTERNAL_ERROR = "ServerInternalError";
-
public static final String IN_CORRECT_MESSAGE = "Incorrect Message";
public static final String WSRM_FAULT_INVALID_ACKNOWLEDGEMENT = "wsrm:InvalidAcknowledgement";
public static final String WSRM_FAULT_UNKNOWN_SEQUENCE = "wsrm:UnknownSequence";
@@ -167,7 +157,6 @@
}
-
//Constants related to the queue.
public interface Queue {
public static final String ADD_ERROR = "Error in adding message";
@@ -195,10 +184,10 @@
public static final String LAST_MESSAGE = "lastMessage";
public static final String SYNC = "sync";
public static final String ACTION = "action";
- public static final String ACKS_TO="acksTo";
- public static final String TO="To";
- public static final String FAULT_TO="faultTo";
- public static final String SEND_OFFER="offer";
+ public static final String ACKS_TO = "acksTo";
+ public static final String TO = "to";
+ public static final String FAULT_TO = "faultTo";
+ public static final String SEND_OFFER = "offer";
public static final String REQUEST_HANDLER = "requestHandler";
public static final String RESPONSE_HANDLER = "responseHandler";
1.39 +6 -26 ws-fx/sandesha/src/org/apache/sandesha/EnvelopeCreator.java
Index: EnvelopeCreator.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/EnvelopeCreator.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- EnvelopeCreator.java 16 May 2005 13:09:18 -0000 1.38
+++ EnvelopeCreator.java 17 May 2005 07:23:46 -0000 1.39
@@ -80,8 +80,7 @@
To to = new To(new URI(incommingAddress.toString()));
outGoingAddressingHaders.setTo(to);
-
- }
+ }
outGoingAddressingHaders.toEnvelope(envelope, null);
//now set the body elements
@@ -105,27 +104,11 @@
public static SOAPEnvelope createCreateSequenceEnvelope(RMMessageContext rmMsgCtx) throws Exception {
- AddressingHeaders addressingHeaders = rmMsgCtx.getAddressingHeaders();
+ AddressingHeaders addressingHeaders = rmMsgCtx.getAddressingHeaders();
SOAPEnvelope envelope = createBasicEnvelop();
addressingHeaders.toEnvelope(envelope);
CreateSequence crSeq= rmMsgCtx.getRMHeaders().getCreateSequence();
- //uncommenting following will send the sequence with a offer (for response seq) to the create seq msg.
- //offer
-// SequenceOffer offer = new SequenceOffer ();
-// Identifier id = new Identifier ();
-// UUIDGen uuidGen = UUIDGenFactory.getUUIDGen();
-// String offerUuid = Constants.UUID + uuidGen.nextUUID();
-// id.setIdentifier(offerUuid);
-//
-// offer.setIdentifier(id);
-// crSeq.setOffer(offer);
-
- //offered sequence will be considered as a requested one and will be added. So that the validation wont fail in response
- //path
-
- //end offer
-
crSeq.toSoapEnvelop(envelope);
return envelope;
}
@@ -135,16 +118,14 @@
SOAPEnvelope soapEnv = new SOAPEnvelope();
addNamespaceDeclarations(soapEnv);
return soapEnv;
-
- }
+ }
public static void addNamespaceDeclarations(SOAPEnvelope soapEnv) throws Exception {
soapEnv.addNamespaceDeclaration(Constants.WSRM.NS_PREFIX_RM, Constants.WSRM.NS_URI_RM);
soapEnv.addNamespaceDeclaration(org.apache.axis.message.addressing.Constants.NS_PREFIX_ADDRESSING, org.apache.axis.message.addressing.Constants.NS_URI_ADDRESSING_DEFAULT);
- soapEnv.addNamespaceDeclaration(Constants.WSU.WSU_PREFIX, Constants.WSU.WSU_NS);
-
- }
+ soapEnv.addNamespaceDeclaration(Constants.WSRM.NS_PREFIX_RM, Constants.WSRM.NS_URI_RM);
+ }
public static SOAPEnvelope createAcknowledgementEnvelope(RMMessageContext rmMessageContext, String toAddress,Vector ackRangeVector) throws Exception {
@@ -172,8 +153,7 @@
outGoingAddressingHaders.setFrom(from);
//Add to <To>
-
- To to = new To(new URI(toAddress));
+ To to = new To(new URI(toAddress));
outGoingAddressingHaders.setTo(to);
//Set the addressing headers to the SOAPEnvelope.
1.2 +15 -3 ws-fx/sandesha/src/org/apache/sandesha/storage/CallbackData.java
Index: CallbackData.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/storage/CallbackData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CallbackData.java 9 May 2005 04:18:33 -0000 1.1
+++ CallbackData.java 17 May 2005 07:23:46 -0000 1.2
@@ -6,6 +6,8 @@
*/
package org.apache.sandesha.storage;
+import org.apache.axis.AxisFault;
+
import java.util.ArrayList;
/**
@@ -21,12 +23,22 @@
private long messageNumber;
private String messageId;
private String sequenceId;
+
+ public AxisFault getFault() {
+ return fault;
+ }
+
+ public void setFault(AxisFault fault) {
+ this.fault = fault;
+ }
+
private long ackStart;
private long ackEnd;
private ArrayList ackNack;
-
-
-
+ private AxisFault fault;
+
+
+
/**
* @return Returns the action.
*/
1.18 +2 -2 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/AckRequested.java
Index: AckRequested.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/AckRequested.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AckRequested.java 2 May 2005 04:34:04 -0000 1.17
+++ AckRequested.java 17 May 2005 07:23:46 -0000 1.18
@@ -135,13 +135,13 @@
while (iterator.hasNext()) {
childElement = (MessageElement) iterator.next();
- if (childElement.getName().equals(Constants.WSU.WSU_PREFIX + Constants.COLON + Constants.WSU.IDENTIFIER)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);
}
- if (childElement.getName().equals(Constants.WSU.IDENTIFIER)) {
+ if (childElement.getName().equals(Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);
1.18 +2 -2 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/CreateSequence.java
Index: CreateSequence.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/CreateSequence.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CreateSequence.java 11 Apr 2005 02:58:55 -0000 1.17
+++ CreateSequence.java 17 May 2005 07:23:46 -0000 1.18
@@ -116,13 +116,13 @@
//TODO add offer processing code here
//TEST OFFER
childElement = (MessageElement) iterator.next();
- if (childElement.getName().equals(Constants.WSU.WSU_PREFIX + Constants.COLON + Constants.WSRM.SEQUENCE_OFFER)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.SEQUENCE_OFFER)) {
offer = new SequenceOffer();
offer.fromSOAPEnvelope(childElement);
} else if (childElement.getName().equals(Constants.WSRM.SEQUENCE_OFFER)) {
offer = new SequenceOffer();
offer.fromSOAPEnvelope(childElement);
- } else if (childElement.getName().equals(Constants.WSU.WSU_PREFIX + Constants.COLON + Constants.WSRM.ACKS_TO)) {
+ } else if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.ACKS_TO)) {
acksTo = new AcksTo();
acksTo.fromSOAPEnvelope(childElement);
} else if (childElement.getName().equals(Constants.WSRM.ACKS_TO)) {
1.18 +2 -2 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/CreateSequenceResponse.java
Index: CreateSequenceResponse.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/CreateSequenceResponse.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CreateSequenceResponse.java 16 May 2005 06:08:17 -0000 1.17
+++ CreateSequenceResponse.java 17 May 2005 07:23:46 -0000 1.18
@@ -110,12 +110,12 @@
while (iterator.hasNext()) {
childElement = (MessageElement) iterator.next();
- if (childElement.getName().equals(Constants.WSU.WSU_PREFIX + Constants.COLON + Constants.WSU.IDENTIFIER)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM+ Constants.COLON + Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);
}
- if (childElement.getName().equals(Constants.WSU.IDENTIFIER)) {
+ if (childElement.getName().equals(Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);
}
1.17 +2 -2 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/Sequence.java
Index: Sequence.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/Sequence.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Sequence.java 2 May 2005 04:34:04 -0000 1.16
+++ Sequence.java 17 May 2005 07:23:46 -0000 1.17
@@ -139,12 +139,12 @@
while (iterator.hasNext()) {
childElement = (MessageElement) iterator.next();
- if (childElement.getName().equals(Constants.WSU.WSU_PREFIX + Constants.COLON + Constants.WSU.IDENTIFIER)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);
}
- if (childElement.getName().equals(Constants.WSU.IDENTIFIER)) {
+ if (childElement.getName().equals(Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);
}
1.14 +2 -2 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/SequenceAcknowledgement.java
Index: SequenceAcknowledgement.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/SequenceAcknowledgement.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SequenceAcknowledgement.java 2 May 2005 04:34:04 -0000 1.13
+++ SequenceAcknowledgement.java 17 May 2005 07:23:46 -0000 1.14
@@ -170,13 +170,13 @@
childElement = (MessageElement) iterator.next();
- if (childElement.getName().equals(Constants.WSU.WSU_PREFIX + Constants.COLON + Constants.WSU.IDENTIFIER)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM + Constants.COLON + Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);
}
- if (childElement.getName().equals(Constants.WSU.IDENTIFIER)) {
+ if (childElement.getName().equals(Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);
}
1.6 +2 -2 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/SequenceOffer.java
Index: SequenceOffer.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/SequenceOffer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SequenceOffer.java 16 May 2005 06:08:17 -0000 1.5
+++ SequenceOffer.java 17 May 2005 07:23:46 -0000 1.6
@@ -57,12 +57,12 @@
childElement = (MessageElement) iterator.next();
- if (childElement.getName().equals(Constants.WSU.WSU_PREFIX+Constants.COLON+Constants.WSU.IDENTIFIER)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM+Constants.COLON+Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);
}
- if (childElement.getName().equals(Constants.WSU.IDENTIFIER)) {
+ if (childElement.getName().equals(Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);
}
1.13 +2 -2 ws-fx/sandesha/src/org/apache/sandesha/ws/rm/TerminateSequence.java
Index: TerminateSequence.java
===================================================================
RCS file: /home/cvs/ws-fx/sandesha/src/org/apache/sandesha/ws/rm/TerminateSequence.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TerminateSequence.java 2 May 2005 04:34:04 -0000 1.12
+++ TerminateSequence.java 17 May 2005 07:23:46 -0000 1.13
@@ -118,13 +118,13 @@
childElement = (MessageElement) iterator.next();
- if (childElement.getName().equals(Constants.WSU.WSU_PREFIX+Constants.COLON+Constants.WSU.IDENTIFIER)) {
+ if (childElement.getName().equals(Constants.WSRM.NS_PREFIX_RM+Constants.COLON+Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);
}
- if (childElement.getName().equals(Constants.WSU.IDENTIFIER)) {
+ if (childElement.getName().equals(Constants.WSRM.IDENTIFIER)) {
identifier = new Identifier();
identifier.fromSOAPEnvelope(childElement);