Author: chamikara
Date: Sun Sep 11 23:19:15 2005
New Revision: 280267
URL: http://svn.apache.org/viewcvs?rev=280267&view=rev
Log:
canceled in-order invocation - Until pause resume functionality is corrected
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java
webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/ServerOutHandler.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
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=280267&r1=280266&r2=280267&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/Constants.java Sun Sep
11 23:19:15 2005
@@ -171,7 +171,7 @@
String NOT_IN_ORDER = "NotInOrder";
- String DEFAULT_DELIVERY_ASSURANCE = IN_ORDER;
+ String DEFAULT_DELIVERY_ASSURANCE = NOT_IN_ORDER;
//invocation type
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java?rev=280267&r1=280266&r2=280267&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/SandeshaModule.java Sun
Sep 11 23:19:15 2005
@@ -36,12 +36,12 @@
//Start invoker thread
- inorderInvoker.start();
+ //inorderInvoker.start();
}
// shutdown the module
public void shutdown(AxisConfiguration axisSystem) throws AxisFault {
- inorderInvoker.stopWork();
+ //inorderInvoker.stopWork();
}
}
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/ServerOutHandler.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/ServerOutHandler.java?rev=280267&r1=280266&r2=280267&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/ServerOutHandler.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/ServerOutHandler.java
Sun Sep 11 23:19:15 2005
@@ -26,6 +26,7 @@
import org.apache.sandesha2.RMException;
import org.apache.sandesha2.RMMsgContext;
import org.apache.sandesha2.RMMsgCreator;
+import org.apache.sandesha2.msgprocessors.MsgProcessorException;
import org.apache.sandesha2.msgreceivers.RMMessageReceiver;
import org.apache.wsdl.MessageReference;
import org.apache.wsdl.WSDLConstants;
@@ -57,12 +58,10 @@
throw new AxisFault ("Cant initialize the message");
}
- //TODO change this to IF==MSG_TYPE_APPLICATION
-
if(requestRMMsgCtx.getMessageType()!=Constants.MESSAGE_TYPE_CREATE_SEQ){
- //set acknowledgement
+
+
+ if
(requestRMMsgCtx.getMessageType()!=Constants.MESSAGE_TYPE_CREATE_SEQ)
RMMsgCreator.addAckMessage(rmMsgCtx);
-
- }
-
+
}
}
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?rev=280267&r1=280266&r2=280267&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Sun Sep 11 23:19:15 2005
@@ -28,6 +28,7 @@
import org.apache.sandesha2.MsgInitializer;
import org.apache.sandesha2.MsgValidator;
import org.apache.sandesha2.RMMsgContext;
+import org.apache.sandesha2.RMMsgCreator;
import org.apache.sandesha2.storage.AbstractBeanMgrFactory;
import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
@@ -38,6 +39,7 @@
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.wsrm.AcknowledgementRange;
import org.apache.sandesha2.wsrm.Sequence;
+import org.ietf.jgss.MessageProp;
/**
* @author
@@ -96,7 +98,15 @@
if (acksToStr==null || messagesStr==null)
throw new MsgProcessorException ("Seqeunce properties
are not set correctly");
- if (acksToStr!=Constants.WSA.NS_URI_ANONYMOUS) {
+
+ if (acksToStr.equals(Constants.WSA.NS_URI_ANONYMOUS)) {
+
+ //Adding sync ack
+ //set acknowledgement
+ //TODO stop adding acks to every message. Add acks only
when needed.
+
+
+ }else {
//TODO Add async Ack
}
@@ -119,7 +129,11 @@
if (nextMsgno<msgNo) {
//pause and store the message (since it is not the next
message of the order)
- rmMsgCtx.getMessageContext().setPausedTrue(new QName
(Constants.IN_HANDLER_NAME));
+ //rmMsgCtx.getMessageContext().setPausedTrue(new QName
(Constants.IN_HANDLER_NAME));
+
+
+
+
try {
String key =
SandeshaUtil.storeMessageContext(rmMsgCtx.getMessageContext());
storageMapMgr.insert(new StorageMapBean
(key,msgNo,sequenceId));
@@ -137,7 +151,9 @@
if
(Constants.DEFAULT_DELIVERY_ASSURANCE==Constants.IN_ORDER) {
//store and let invoker handle for IN_ORDER
invocation
- rmMsgCtx.getMessageContext().setPausedTrue(new
QName (Constants.IN_HANDLER_NAME));
+
//rmMsgCtx.getMessageContext().setPausedTrue(new QName
(Constants.IN_HANDLER_NAME));
+
+
try {
String key =
SandeshaUtil.storeMessageContext(rmMsgCtx.getMessageContext());
storageMapMgr.insert(new StorageMapBean
(key,msgNo,sequenceId));
@@ -145,7 +161,7 @@
// This will avoid performing application
processing more than once.
rmMsgCtx.setProperty(Constants.APPLICATION_PROCESSING_DONE,"true");
- System.out.println ("paaused");
+ System.out.println ("paused");
}catch (Exception ex) {
throw new MsgProcessorException
(ex.getMessage());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
