Author: chamikara
Date: Tue Sep 6 00:26:03 2005
New Revision: 278935
URL: http://svn.apache.org/viewcvs?rev=278935&view=rev
Log:
Now Sync ping is working for a single message :)
Added:
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/MsgInitializer.java
webservices/sandesha/trunk/src/org/apache/sandesha2/SequenceMenager.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/MsgProcessorFactory.java
webservices/sandesha/trunk/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/MsgInitializer.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/MsgInitializer.java?rev=278935&r1=278934&r2=278935&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/MsgInitializer.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/MsgInitializer.java Tue
Sep 6 00:26:03 2005
@@ -22,6 +22,7 @@
import org.apache.axis2.addressing.om.AddressingHeaders;
import org.apache.axis2.context.MessageContext;
+import org.apache.sandesha2.msgreceivers.RMMessageReceiver;
import org.apache.sandesha2.wsrm.RMElements;
@@ -80,8 +81,12 @@
rmMsgCtx.setMessageType(Constants.MESSAGE_TYPE_CREATE_SEQ_RESPONSE);
else if
(rmMsgCtx.getMessagePart(Constants.MESSAGE_PART_TERMINATE_SEQ)!=null)
rmMsgCtx.setMessageType(Constants.MESSAGE_TYPE_TERMINATE_SEQ);
-
+ else if
(rmMsgCtx.getMessagePart(Constants.MESSAGE_PART_SEQUENCE)!=null)
+
rmMsgCtx.setMessageType(Constants.MESSAGE_TYPE_APPLICATION);
+ else
+ rmMsgCtx.setMessageType(Constants.MESSAGE_TYPE_UNKNOWN);
return true;
}
+
}
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/SequenceMenager.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/SequenceMenager.java?rev=278935&r1=278934&r2=278935&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/SequenceMenager.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/SequenceMenager.java
Tue Sep 6 00:26:03 2005
@@ -19,7 +19,6 @@
public class SequenceMenager {
public static void setUpNewSequence (String sequenceId) {
- ArrayList arr;
SequencePropertyBean seqPropBean = new SequencePropertyBean
(sequenceId,Constants.SEQ_PROPERTY_RECEIVED_MESSAGES,"");
SequencePropertyBeanMgr beanMgr = new SequencePropertyBeanMgr
(Constants.DEFAULT_STORAGE_TYPE);
beanMgr.create(seqPropBean);
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=278935&r1=278934&r2=278935&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Tue Sep 6 00:26:03 2005
@@ -47,7 +47,13 @@
String messagesStr = (String) msgsBean.getValue();
- String acksToStr = (String) acksToBean.getValue();
+
+ String acksToStr = null;
+ try {
+ acksToStr = (String) acksToBean.getValue();
+ }catch (Exception e) {
+ e.printStackTrace();
+ }
System.out.println ("Messages received:" +
Constants.SEQ_PROPERTY_RECEIVED_MESSAGES);
System.out.println ("Acks To:" +
Constants.SEQ_PROPERTY_ACKS_TO);
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java?rev=278935&r1=278934&r2=278935&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/CreateSeqMsgProcessor.java
Tue Sep 6 00:26:03 2005
@@ -32,7 +32,7 @@
CreateSequence createSeq = (CreateSequence)
rmMsgCtx.getMessagePart(Constants.MESSAGE_PART_CREATE_SEQ);
//rmMsgCtx.test();
- //Store AcksTo Value
+
//Change the Operation (to go throught CreateSequence)
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/MsgProcessorFactory.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/MsgProcessorFactory.java?rev=278935&r1=278934&r2=278935&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/MsgProcessorFactory.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/MsgProcessorFactory.java
Tue Sep 6 00:26:03 2005
@@ -30,8 +30,12 @@
{
case (Constants.MESSAGE_TYPE_CREATE_SEQ):
return new CreateSeqMsgProcessor ();
- default:
+ case (Constants.MESSAGE_TYPE_TERMINATE_SEQ):
+ return new TerminateSeqMsgProcessor ();
+ case (Constants.MESSAGE_TYPE_APPLICATION):
return new ApplicationMsgProcessor ();
+ default:
+ return null;
}
}
}
Added:
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java?rev=278935&view=auto
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
(added)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/msgprocessors/TerminateSeqMsgProcessor.java
Tue Sep 6 00:26:03 2005
@@ -0,0 +1,32 @@
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * 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.
+ *
+ */
+
+package org.apache.sandesha2.msgprocessors;
+
+import org.apache.sandesha2.RMMsgContext;
+
+/**
+ * @author
+ *
+ */
+public class TerminateSeqMsgProcessor implements MsgProcessor {
+
+ public void processMessage(RMMsgContext rmMsgCtx)
+ throws MsgProcessorException {
+ //TODO Add terminate sequence message logic.
+ }
+}
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=278935&r1=278934&r2=278935&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/msgreceivers/RMMessageReceiver.java
Tue Sep 6 00:26:03 2005
@@ -64,23 +64,25 @@
public class RMMessageReceiver extends AbstractMessageReceiver {
+
+ //TODO move this code to create seq msg processor.
public void setCreateSequence(MessageContext inMessage,
MessageContext outMessage) throws AxisFault {
System.out.println("set create seq was called in RM Msg
receiver");
- RMMsgContext rmMsgCtx = null;
+ RMMsgContext createSeqMsg = null;
try {
- rmMsgCtx = MsgInitializer.initializeMessage(inMessage);
+ createSeqMsg = MsgInitializer.initializeMessage(inMessage);
}catch (RMException ex) {
throw new AxisFault ("Cant initialize the message");
}
- if (rmMsgCtx.getMessageType()!=Constants.MESSAGE_TYPE_CREATE_SEQ)
+ if (createSeqMsg.getMessageType()!=Constants.MESSAGE_TYPE_CREATE_SEQ)
throw new AxisFault ("Wrong message type");
RMMsgContext createSeqResponse = RMMsgCreator
- .createCreateSeqResponseMsg(rmMsgCtx,
outMessage);
+
.createCreateSeqResponseMsg(createSeqMsg, outMessage);
CreateSequenceResponse createSeqResPart =
(CreateSequenceResponse) createSeqResponse.
getMessagePart(Constants.MESSAGE_PART_CREATE_SEQ_RESPONSE);
@@ -90,6 +92,18 @@
SequenceMenager.setUpNewSequence(newSequenceId);
+ CreateSequence createSeq = (CreateSequence)
createSeqMsg.getMessagePart(Constants.MESSAGE_PART_CREATE_SEQ);
+ if (createSeq==null)
+ throw new AxisFault ("Create sequence part not present
in the create sequence message");
+
+ String acksTo =
createSeq.getAcksTo().getAddress().getEpr().getAddress();
+ if (acksTo==null || acksTo=="")
+ throw new AxisFault ("Acks to not present in the create
sequence message");
+
+ SequencePropertyBean seqPropBean = new SequencePropertyBean
(newSequenceId,Constants.SEQ_PROPERTY_ACKS_TO,acksTo);
+ SequencePropertyBeanMgr beanMgr = new SequencePropertyBeanMgr
(Constants.DEFAULT_STORAGE_TYPE);
+ beanMgr.create(seqPropBean);
+
outMessage.setResponseWritten(true);
}
@@ -109,11 +123,13 @@
AbstractMessageReceiver msgReceiver = null;
String replyTo = messgeCtx.getFrom().getAddress();
- if((replyTo==null) ||
replyTo.equals(Constants.WSA.NS_URI_ANONYMOUS)) {
+ if
(rmMsgCtx.getMessageType()==Constants.MESSAGE_TYPE_TERMINATE_SEQ)
+ msgReceiver = new RMInMsgReceiver ();
+ else
if(rmMsgCtx.getMessageType()==Constants.MESSAGE_TYPE_CREATE_SEQ &&
((replyTo==null) || replyTo.equals(Constants.WSA.NS_URI_ANONYMOUS)))
msgReceiver = new RMInOutSyncMsgReceiver ();
- } else {
+ else if
(rmMsgCtx.getMessageType()==Constants.MESSAGE_TYPE_CREATE_SEQ)
msgReceiver = new RMInOutAsyncMsgReceiver ();
- }
+
if(msgReceiver!=null) {
msgReceiver.receive(messgeCtx);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
