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 ch...@apache.org on 2005/10/19 09:42:28 UTC
svn commit: r326430 - in /webservices/sandesha/trunk:
samples/interop/src/org/apache/sandesha2/samples/ src/org/apache/sandesha2/
src/org/apache/sandesha2/handlers/ src/org/apache/sandesha2/msgreceivers/
src/org/apache/sandesha2/wsrm/
Author: chamikara
Date: Wed Oct 19 00:41:38 2005
New Revision: 326430
URL: http://svn.apache.org/viewcvs?rev=326430&view=rev
Log:
Sandesha2 client <--> sandesha2 server interaction is working perfectly
Modified:
webservices/sandesha/trunk/samples/interop/src/org/apache/sandesha2/samples/RMInteropService.java
webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java
webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java
webservices/sandesha/trunk/src/org/apache/sandesha2/Sender.java
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java
webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java
Modified: webservices/sandesha/trunk/samples/interop/src/org/apache/sandesha2/samples/RMInteropService.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/samples/interop/src/org/apache/sandesha2/samples/RMInteropService.java?rev=326430&r1=326429&r2=326430&view=diff
==============================================================================
--- webservices/sandesha/trunk/samples/interop/src/org/apache/sandesha2/samples/RMInteropService.java (original)
+++ webservices/sandesha/trunk/samples/interop/src/org/apache/sandesha2/samples/RMInteropService.java Wed Oct 19 00:41:38 2005
@@ -17,9 +17,16 @@
package org.apache.sandesha2.samples;
+
import java.util.HashMap;
import java.util.Map;
+import javax.xml.namespace.QName;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMFactory;
@@ -34,15 +41,32 @@
private static Map sequences = new HashMap();
public OMElement echoString(OMElement in) {
- System.out.println("EchoString was called");
-
+
+ String responseText = null;
+ if (in!=null) {
+ String tempText = in.getText();
+ if (tempText==null || "".equals(tempText)) {
+ OMElement firstChild = in.getFirstElement();
+ if (firstChild!=null)
+ tempText = firstChild.getText();
+ }
+
+ if (tempText!=null)
+ responseText = tempText;
+ }
+
+
+ System.out.println("echoString got text:" + ((null==responseText)?"":responseText));
OMFactory fac = OMAbstractFactory.getOMFactory();
OMNamespace omNs = fac.createOMNamespace("http://tempuri.org/", "echoString");
OMElement method = fac.createOMElement("echoStringResponse", omNs);
- OMElement value = fac.createOMElement("Text", omNs);
- value.setText("echo response");
-
+ OMElement value = fac.createOMElement("text", omNs);
+
+ if (responseText==null || "".equals(responseText))
+ responseText = "echo response";
+
+ value.setText(responseText);
method.addChild(value);
return method;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java?rev=326430&r1=326429&r2=326430&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java Wed Oct 19 00:41:38 2005
@@ -225,6 +225,8 @@
String IN_HANDLER_NAME = "SandeshaInHandler";
String OUT_HANDLER_NAME = "SandeshaOutHandler";
+
+ String SEQUENCE_KEY = "SequenceKey";
//message context properties
String APPLICATION_PROCESSING_DONE = "AppProcessingDone";
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java?rev=326430&r1=326429&r2=326430&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/RMMsgContext.java Wed Oct 19 00:41:38 2005
@@ -135,8 +135,7 @@
}
public void test() {
- String opearaitonName = msgContext.getOperationContext()
- .getAxisOperation().getName().getLocalPart();
+ String opearaitonName = msgContext.getOperationContext().getOperationDescription().getName().getLocalPart();
System.out.println("Operation is:" + opearaitonName);
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/Sender.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/Sender.java?rev=326430&r1=326429&r2=326430&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/Sender.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/Sender.java Wed Oct 19 00:41:38 2005
@@ -91,7 +91,8 @@
updateMessage(msgCtx);
new AxisEngine(context).send(msgCtx);
- checkForSyncResponses(msgCtx);
+ if (!msgCtx.isServerSide())
+ checkForSyncResponses(msgCtx);
} catch (AxisFault e1) {
e1.printStackTrace();
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java?rev=326430&r1=326429&r2=326430&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java Wed Oct 19 00:41:38 2005
@@ -142,6 +142,12 @@
"TO End Point Reference is not set correctly. This is a must for the sandesha client side.");
tempSequenceId = toEPR.getAddress();
+ String sequenceKey = (String) context.getProperty(Constants.SEQUENCE_KEY);
+ if (sequenceKey!=null)
+ tempSequenceId = tempSequenceId + sequenceKey;
+
+
+
}
//check if the fist message
@@ -297,8 +303,7 @@
throw new SandeshaException("To EPR is not found");
String to = toEPR.getAddress();
- String operationName = msgCtx.getOperationContext()
- .getAxisOperation().getName().getLocalPart();
+ String operationName = msgCtx.getOperationContext().getOperationDescription().getName().getLocalPart();
msgCtx.setWSAAction(to + "/" + operationName);
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java?rev=326430&r1=326429&r2=326430&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java Wed Oct 19 00:41:38 2005
@@ -129,7 +129,8 @@
AbstractMessageReceiver msgReceiver = null;
- String replyTo = messgeCtx.getFrom().getAddress();
+ //String replyTo = messgeCtx.getFrom().getAddress();
+ String replyTo = messgeCtx.getReplyTo().getAddress();
if (rmMsgCtx.getMessageType() == Constants.MessageTypes.TERMINATE_SEQ)
msgReceiver = new RMInMsgReceiver();
else if (rmMsgCtx.getMessageType() == Constants.MessageTypes.CREATE_SEQ
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java?rev=326430&r1=326429&r2=326430&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java Wed Oct 19 00:41:38 2005
@@ -77,8 +77,8 @@
"Passed element does not contain upper or lower attributes");
try {
- long lower = Long.parseLong(lowerAttrib.getValue());
- long upper = Long.parseLong(upperAttrib.getValue());
+ long lower = Long.parseLong(lowerAttrib.getAttributeValue());
+ long upper = Long.parseLong(upperAttrib.getAttributeValue());
upperValue = upper;
lowerValue = lower;
} catch (Exception ex) {
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org