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/11/20 17:27:30 UTC
svn commit: r345762 [2/2] - in
/webservices/sandesha/trunk/src/org/apache/sandesha2: ./ handlers/
msgprocessors/ msgreceivers/ policy/ storage/ storage/beanmanagers/
storage/beans/ storage/inmemory/ util/ workers/ wsrm/
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/RMBean.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/RMBean.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/RMBean.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/RMBean.java Sun Nov 20 08:23:27 2005
@@ -20,8 +20,10 @@
import java.io.Serializable;
/**
- * @author
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
*/
+
public interface RMBean extends Serializable {
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/RetransmitterBean.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/RetransmitterBean.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/RetransmitterBean.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/RetransmitterBean.java Sun Nov 20 08:23:27 2005
@@ -17,6 +17,11 @@
package org.apache.sandesha2.storage.beans;
+/**
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ */
+
public class RetransmitterBean implements RMBean {
private String messageId;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/SequencePropertyBean.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/SequencePropertyBean.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/SequencePropertyBean.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/SequencePropertyBean.java Sun Nov 20 08:23:27 2005
@@ -17,8 +17,10 @@
package org.apache.sandesha2.storage.beans;
/**
- * @author Sanka Samaranayake <ss...@gmail.com>
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
*/
+
public class SequencePropertyBean implements RMBean {
private String sequenceId;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/StorageMapBean.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/StorageMapBean.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/StorageMapBean.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/StorageMapBean.java Sun Nov 20 08:23:27 2005
@@ -18,8 +18,10 @@
package org.apache.sandesha2.storage.beans;
/**
- * @author
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
*/
+
public class StorageMapBean implements RMBean {
private String Key;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryCreateSeqBeanMgr.java Sun Nov 20 08:23:27 2005
@@ -28,8 +28,8 @@
import org.apache.sandesha2.storage.beans.CreateSeqBean;
/**
- * @author Chamikara Jayalath <ch...@wso2.com>
- * @author Sanka Samaranayake <ss...@gmail.com>
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
*/
public class InMemoryCreateSeqBeanMgr implements CreateSeqBeanMgr {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryNextMsgBeanMgr.java Sun Nov 20 08:23:27 2005
@@ -28,9 +28,10 @@
import org.apache.sandesha2.storage.beans.NextMsgBean;
/**
- * @author Chamikara Jayalath <ch...@wso2.com>
- * @author Sanka Samaranayake <ss...@gmail.com>
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
*/
+
public class InMemoryNextMsgBeanMgr implements NextMsgBeanMgr {
private Hashtable table = null;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryRetransmitterBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryRetransmitterBeanMgr.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryRetransmitterBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryRetransmitterBeanMgr.java Sun Nov 20 08:23:27 2005
@@ -30,9 +30,10 @@
import org.apache.sandesha2.storage.beans.RetransmitterBean;
/**
- * @author Chamikara Jayalath <ch...@wso2.com>
- * @author Sanka Samaranayake <ss...@gmail.com>
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
*/
+
public class InMemoryRetransmitterBeanMgr implements RetransmitterBeanMgr {
private Hashtable table = null;
@@ -71,7 +72,7 @@
RetransmitterBean temp;
while (iterator.hasNext()) {
-
+
temp = (RetransmitterBean) iterator.next();
boolean add = true;
@@ -96,9 +97,10 @@
&& bean.getMessageNumber() != temp.getMessageNumber())
add = false;
- if (bean.getMessagetype()!=Constants.MessageTypes.UNKNOWN && bean.getMessagetype()!=temp.getMessagetype())
+ if (bean.getMessagetype() != Constants.MessageTypes.UNKNOWN
+ && bean.getMessagetype() != temp.getMessagetype())
add = false;
-
+
if (add)
beans.add(temp);
}
@@ -111,105 +113,105 @@
Iterator iterator = table.values().iterator();
RetransmitterBean temp;
-
+
while (iterator.hasNext()) {
temp = (RetransmitterBean) iterator.next();
-
+
if (temp.isSend()) {
-
- long timeToSend = temp.getTimeToSend();
+
+ long timeToSend = temp.getTimeToSend();
long timeNow = System.currentTimeMillis();
if ((timeNow >= timeToSend)) {
beans.add(temp);
}
}
}
-
-// beans = sort (beans);
-// beans = reverse (beans);
-
+
+ // beans = sort (beans);
+ // beans = reverse (beans);
+
return beans;
}
-
- private ArrayList reverse (ArrayList beans) {
- ArrayList newBeans = new ArrayList ();
+
+ private ArrayList reverse(ArrayList beans) {
+ ArrayList newBeans = new ArrayList();
int count = beans.size();
-
-
- for (int i=count;i>0;i--) {
- newBeans.add(beans.get((i-1)));
+
+ for (int i = count; i > 0; i--) {
+ newBeans.add(beans.get((i - 1)));
}
-
+
return newBeans;
}
-
+
//FIXME - not complete
//SENDER SORTING
//--------------
//Sender Sorting is used to arrange the messages that get sent.
//This sending order may get dsturbed due to network latencies.
- //But doing the sort here, could improve the server preformance when network latencies are low (this is the common case).
- //Sender sorting will be enabled, when invocation type is InOrder.
- private ArrayList sort (ArrayList beans) {
- ArrayList newBeans = new ArrayList ();
- HashMap tempHash = new HashMap ();
-
+ //But doing the sort here, could improve the server preformance when
+ // network latencies are low (this is the common case).
+ //Sender sorting will be enabled, when invocation type is InOrder.
+ private ArrayList sort(ArrayList beans) {
+ ArrayList newBeans = new ArrayList();
+ HashMap tempHash = new HashMap();
+
Iterator iter1 = beans.iterator();
while (iter1.hasNext()) {
RetransmitterBean bean = (RetransmitterBean) iter1.next();
- if (!(bean.getMessageNumber()>0)) {
+ if (!(bean.getMessageNumber() > 0)) {
newBeans.add(bean);
}
}
-
+
Iterator iter2 = beans.iterator();
long maxMsgNo = 0;
long minMsgNo = 0;
while (iter2.hasNext()) {
RetransmitterBean bean = (RetransmitterBean) iter2.next();
-
- if (bean.getMessageNumber()>0) {
+
+ if (bean.getMessageNumber() > 0) {
maxMsgNo = bean.getMessageNumber();
minMsgNo = bean.getMessageNumber();
break;
}
}
-
+
//finding Max and Min msg numbers present in the current list.
- while (iter2.hasNext()){
+ while (iter2.hasNext()) {
RetransmitterBean bean = (RetransmitterBean) iter2.next();
long msgNo = bean.getMessageNumber();
- if (msgNo>0) {
+ if (msgNo > 0) {
//tempHash.put(new Long (bean.getMessageNumber()),bean);
- if (msgNo>maxMsgNo)
+ if (msgNo > maxMsgNo)
maxMsgNo = msgNo;
-
- if (msgNo<minMsgNo)
+
+ if (msgNo < minMsgNo)
minMsgNo = msgNo;
}
}
-
- for (long msgNo=minMsgNo;msgNo<=maxMsgNo;msgNo++) {
- ArrayList beansOfMsgNo = findBeansWithMsgNo(beans,msgNo);
+
+ for (long msgNo = minMsgNo; msgNo <= maxMsgNo; msgNo++) {
+ ArrayList beansOfMsgNo = findBeansWithMsgNo(beans, msgNo);
Iterator iter = beansOfMsgNo.iterator();
while (iter.hasNext()) {
-
+
}
}
return newBeans;
}
-
- private ArrayList findBeansWithMsgNo (ArrayList list, long msgNo) {
- ArrayList beans = new ArrayList ();
-
+
+ private ArrayList findBeansWithMsgNo(ArrayList list, long msgNo) {
+ ArrayList beans = new ArrayList();
+
Iterator it = list.iterator();
while (it.hasNext()) {
RetransmitterBean bean = (RetransmitterBean) it.next();
- if (bean.getMessageNumber()==msgNo)
+ if (bean.getMessageNumber() == msgNo)
beans.add(bean);
}
-
+
return beans;
}
@@ -217,7 +219,8 @@
if (!table.contains(bean))
return false;
- return true; //No need to update. Being a reference does the job:) //table.put(bean.getMessageId(), bean) != null;
+ return true; //No need to update. Being a reference does the job:)
+ // //table.put(bean.getMessageId(), bean) != null;
}
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java Sun Nov 20 08:23:27 2005
@@ -28,9 +28,10 @@
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
/**
- * @author Chamikara Jayalath <ch...@wso2.com>
- * @author Sanka Samaranayake <ss...@gmail.com>
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
*/
+
public class InMemorySequencePropertyBeanMgr implements SequencePropertyBeanMgr {
private Hashtable table = null;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java Sun Nov 20 08:23:27 2005
@@ -26,6 +26,11 @@
import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
import org.apache.sandesha2.storage.beanmanagers.StorageMapBeanMgr;
+/**
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ */
+
public class InMemoryStorageManager extends StorageManager {
private static InMemoryStorageManager instance = null;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageMapBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageMapBeanMgr.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageMapBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageMapBeanMgr.java Sun Nov 20 08:23:27 2005
@@ -27,9 +27,10 @@
import org.apache.sandesha2.storage.beans.StorageMapBean;
/**
- * @author Chamikara Jayalath <ch...@wso2.com>
- * @author Sanka Samaranayake <ss...@gmail.com>
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
*/
+
public class InMemoryStorageMapBeanMgr implements StorageMapBeanMgr {
private Hashtable table = null;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemoryTransaction.java Sun Nov 20 08:23:27 2005
@@ -19,6 +19,11 @@
import org.apache.sandesha2.storage.Transaction;
+/**
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ */
+
public class InMemoryTransaction implements Transaction {
public void commit() {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/FaultManager.java Sun Nov 20 08:23:27 2005
@@ -54,9 +54,8 @@
import org.apache.sandesha2.wsrm.TerminateSequence;
/**
- * @author Sanka
- * @author Chamikara
- *
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
*/
public class FaultManager {
@@ -66,63 +65,68 @@
public RMMsgContext checkForPossibleFaults(MessageContext msgCtx)
throws SandeshaException {
-
- //Cannot initialize message before checking for MsgNoRoleover - since initialization will give an exception
+
+ //Cannot initialize message before checking for MsgNoRoleover - since
+ // initialization will give an exception
//for rolled over messages.
-
+
SOAPEnvelope envelope = msgCtx.getEnvelope();
- if (envelope==null)
- throw new SandeshaException ("SOAP Envelope is null");
-
+ if (envelope == null)
+ throw new SandeshaException("SOAP Envelope is null");
+
RMMsgContext faultMessageContext = null;
-
+
SOAPHeader header = envelope.getHeader();
- if (header!=null) {
- OMElement sequenceHeaderBlock = header.getFirstChildWithName(new QName (Constants.WSRM.NS_URI_RM,Constants.WSRM.SEQUENCE));
- if (sequenceHeaderBlock!=null) {
- faultMessageContext = checkForMessageNumberRoleover (msgCtx);
- if (faultMessageContext!=null)
+ if (header != null) {
+ OMElement sequenceHeaderBlock = header
+ .getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
+ Constants.WSRM.SEQUENCE));
+ if (sequenceHeaderBlock != null) {
+ faultMessageContext = checkForMessageNumberRoleover(msgCtx);
+ if (faultMessageContext != null)
return faultMessageContext;
}
}
-
+
RMMsgContext rmMsgCtx = MsgInitializer.initializeMessage(msgCtx);
int msgType = rmMsgCtx.getMessageType();
- if (msgType==Constants.MessageTypes.APPLICATION || msgType==Constants.MessageTypes.TERMINATE_SEQ) {
- faultMessageContext = checkForUnknownSequence (msgCtx);
- if (faultMessageContext!=null)
+ if (msgType == Constants.MessageTypes.APPLICATION
+ || msgType == Constants.MessageTypes.TERMINATE_SEQ) {
+ faultMessageContext = checkForUnknownSequence(msgCtx);
+ if (faultMessageContext != null)
return faultMessageContext;
-
+
}
-
- if (msgType==Constants.MessageTypes.CREATE_SEQ) {
- faultMessageContext = checkForCreateSequenceRefused (msgCtx);
- if (faultMessageContext!=null)
+
+ if (msgType == Constants.MessageTypes.CREATE_SEQ) {
+ faultMessageContext = checkForCreateSequenceRefused(msgCtx);
+ if (faultMessageContext != null)
return faultMessageContext;
}
-
- if (msgType==Constants.MessageTypes.ACK) {
- faultMessageContext = checkForInvalidAcknowledgement (msgCtx);
- if (faultMessageContext!=null)
+
+ if (msgType == Constants.MessageTypes.ACK) {
+ faultMessageContext = checkForInvalidAcknowledgement(msgCtx);
+ if (faultMessageContext != null)
return faultMessageContext;
}
-
- if (msgType==Constants.MessageTypes.APPLICATION) {
- faultMessageContext = checkForLastMsgNumberExceeded (msgCtx);
- if (faultMessageContext!=null)
+
+ if (msgType == Constants.MessageTypes.APPLICATION) {
+ faultMessageContext = checkForLastMsgNumberExceeded(msgCtx);
+ if (faultMessageContext != null)
return faultMessageContext;
}
-
+
return faultMessageContext;
}
- private RMMsgContext checkForCreateSequenceRefused (
+ private RMMsgContext checkForCreateSequenceRefused(
MessageContext messageContext) throws SandeshaException {
-
- RMMsgContext rmMsgCtx = MsgInitializer.initializeMessage(messageContext);
-
+
+ RMMsgContext rmMsgCtx = MsgInitializer
+ .initializeMessage(messageContext);
+
CreateSequence createSequence = (CreateSequence) rmMsgCtx
.getMessagePart(Constants.MessageParts.CREATE_SEQ);
if (createSequence == null)
@@ -150,26 +154,33 @@
Collection collection = nextMsgBeanMgr.retrieveAll();
Iterator it = collection.iterator();
while (it.hasNext()) {
-
- //checking weather a incoming sequence with the given id exists.
+
+ //checking weather a incoming sequence with the given id
+ // exists.
NextMsgBean nextMsgBean = (NextMsgBean) it.next();
String sequenceId = nextMsgBean.getSequenceId();
if (sequenceId.equals(offeredSequenceId)) {
refuseSequence = true;
reason = "A sequence with offered sequenceId, already axists";
}
-
-
- //checking weather an outgoing sequence with the given id exists.
- SequencePropertyBeanMgr sequencePropertyBeanMgr = storageManager.getSequencePropretyBeanMgr();
- SequencePropertyBean sequencePropertyBean = sequencePropertyBeanMgr.retrieve(sequenceId,Constants.SequenceProperties.OUT_SEQUENCE_ID);
- if (sequencePropertyBean!=null) {
- String outSequenceId = (String) sequencePropertyBean.getValue();
- if (outSequenceId!=null && outSequenceId.equals(offeredSequenceId)) {
+
+ //checking weather an outgoing sequence with the given id
+ // exists.
+ SequencePropertyBeanMgr sequencePropertyBeanMgr = storageManager
+ .getSequencePropretyBeanMgr();
+ SequencePropertyBean sequencePropertyBean = sequencePropertyBeanMgr
+ .retrieve(
+ sequenceId,
+ Constants.SequenceProperties.OUT_SEQUENCE_ID);
+ if (sequencePropertyBean != null) {
+ String outSequenceId = (String) sequencePropertyBean
+ .getValue();
+ if (outSequenceId != null
+ && outSequenceId.equals(offeredSequenceId)) {
refuseSequence = true;
reason = "A sequence with offered sequenceId, already axists";
}
-
+
System.out.println("OutSequenceId:" + outSequenceId);
}
}
@@ -191,23 +202,25 @@
else
data.setCode(SOAP12Constants.FAULT_CODE_SENDER);
- data.setSubcode(Constants.SOAPFaults.Subcodes.CREATE_SEQUENCE_REFUSED);
+ data
+ .setSubcode(Constants.SOAPFaults.Subcodes.CREATE_SEQUENCE_REFUSED);
data.setReason(reason);
return getFault(rmMsgCtx, data);
}
-
+
return null;
}
- private RMMsgContext checkForLastMsgNumberExceeded (MessageContext msgCtx) {
+ private RMMsgContext checkForLastMsgNumberExceeded(MessageContext msgCtx) {
return null;
}
-
- private RMMsgContext checkForMessageNumberRoleover (MessageContext messageContext) {
+
+ private RMMsgContext checkForMessageNumberRoleover(
+ MessageContext messageContext) {
return null;
}
-
+
/**
* Check whether a Sequence message (a) belongs to a unknown sequence
* (generates an UnknownSequence fault) (b) message number exceeds a
@@ -220,38 +233,44 @@
public RMMsgContext checkForUnknownSequence(MessageContext messageContext)
throws SandeshaException {
- RMMsgContext rmMsgCtx = MsgInitializer.initializeMessage(messageContext);
+ RMMsgContext rmMsgCtx = MsgInitializer
+ .initializeMessage(messageContext);
String sequenceId = null;
-
- if (rmMsgCtx.getMessageType()==Constants.MessageTypes.APPLICATION) {
- Sequence sequence = (Sequence) rmMsgCtx.getMessagePart(Constants.MessageParts.SEQUENCE);
- if (sequence==null)
- throw new SandeshaException ("Sequence part not found in the application message");
-
+
+ if (rmMsgCtx.getMessageType() == Constants.MessageTypes.APPLICATION) {
+ Sequence sequence = (Sequence) rmMsgCtx
+ .getMessagePart(Constants.MessageParts.SEQUENCE);
+ if (sequence == null)
+ throw new SandeshaException(
+ "Sequence part not found in the application message");
+
sequenceId = sequence.getIdentifier().getIdentifier();
-
- }else if (rmMsgCtx.getMessageType()==Constants.MessageTypes.ACK) {
- SequenceAcknowledgement sequenceAcknowledgement = (SequenceAcknowledgement) rmMsgCtx.getMessagePart(Constants.MessageParts.SEQ_ACKNOWLEDGEMENT);
- sequenceId = sequenceAcknowledgement.getIdentifier().getIdentifier();
- } else if (rmMsgCtx.getMessageType()==Constants.MessageTypes.TERMINATE_SEQ) {
- TerminateSequence terminateSequence = (TerminateSequence) rmMsgCtx.getMessagePart(Constants.MessageParts.TERMINATE_SEQ);
+
+ } else if (rmMsgCtx.getMessageType() == Constants.MessageTypes.ACK) {
+ SequenceAcknowledgement sequenceAcknowledgement = (SequenceAcknowledgement) rmMsgCtx
+ .getMessagePart(Constants.MessageParts.SEQ_ACKNOWLEDGEMENT);
+ sequenceId = sequenceAcknowledgement.getIdentifier()
+ .getIdentifier();
+ } else if (rmMsgCtx.getMessageType() == Constants.MessageTypes.TERMINATE_SEQ) {
+ TerminateSequence terminateSequence = (TerminateSequence) rmMsgCtx
+ .getMessagePart(Constants.MessageParts.TERMINATE_SEQ);
sequenceId = terminateSequence.getIdentifier().getIdentifier();
- }else {
+ } else {
//sequenceId not found.
return null;
}
-
+
StorageManager storageManager = SandeshaUtil
.getSandeshaStorageManager(messageContext.getSystemContext());
-
+
NextMsgBeanMgr mgr = storageManager.getNextMsgBeanMgr();
SOAPEnvelope envelope = messageContext.getEnvelope();
Collection coll = mgr.retrieveAll();
Iterator it = coll.iterator();
-
+
boolean validSequence = false;
-
+
while (it.hasNext()) {
NextMsgBean nextMsgBean = (NextMsgBean) it.next();
String tempId = nextMsgBean.getSequenceId();
@@ -260,30 +279,32 @@
break;
}
}
-
+
if (!validSequence) {
//Return an UnknownSequence error
int SOAPVersion = SandeshaUtil.getSOAPVersion(envelope);
-
- FaultData data = new FaultData ();
+
+ FaultData data = new FaultData();
if (SOAPVersion == Constants.SOAPVersion.v1_1)
data.setCode(SOAP11Constants.FAULT_CODE_SENDER);
else
data.setCode(SOAP12Constants.FAULT_CODE_SENDER);
-
+
data.setSubcode(Constants.SOAPFaults.Subcodes.UNKNOWN_SEQUENCE);
-
- SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SOAPVersion);
- Identifier identifier = new Identifier (factory);
+
+ SOAPFactory factory = SOAPAbstractFactory
+ .getSOAPFactory(SOAPVersion);
+ Identifier identifier = new Identifier(factory);
identifier.setIndentifer(sequenceId);
OMElement identifierOMElem = identifier.getOMElement();
data.setDetail(identifierOMElem);
- data.setReason("The value of wsrm:Identifier is not a known Sequence identifier");
-
- return getFault(rmMsgCtx,data);
+ data
+ .setReason("The value of wsrm:Identifier is not a known Sequence identifier");
+
+ return getFault(rmMsgCtx, data);
}
-
+
return null;
}
@@ -296,39 +317,44 @@
public RMMsgContext checkForInvalidAcknowledgement(MessageContext msgCtx)
throws SandeshaException {
-
//check lower<=upper
//TODO acked for not-send message
- RMMsgContext rmMsgContext = new RMMsgContext ();
- if (rmMsgContext.getMessageType()!=Constants.MessageTypes.ACK)
+ RMMsgContext rmMsgContext = new RMMsgContext();
+ if (rmMsgContext.getMessageType() != Constants.MessageTypes.ACK)
return null;
-
- SequenceAcknowledgement sequenceAcknowledgement = (SequenceAcknowledgement) rmMsgContext.getMessagePart(Constants.MessageParts .SEQ_ACKNOWLEDGEMENT);
- List sequenceAckList = sequenceAcknowledgement.getAcknowledgementRanges();
+
+ SequenceAcknowledgement sequenceAcknowledgement = (SequenceAcknowledgement) rmMsgContext
+ .getMessagePart(Constants.MessageParts.SEQ_ACKNOWLEDGEMENT);
+ List sequenceAckList = sequenceAcknowledgement
+ .getAcknowledgementRanges();
Iterator it = sequenceAckList.iterator();
-
+
while (it.hasNext()) {
- AcknowledgementRange acknowledgementRange = (AcknowledgementRange) it.next();
+ AcknowledgementRange acknowledgementRange = (AcknowledgementRange) it
+ .next();
long upper = acknowledgementRange.getUpperValue();
long lower = acknowledgementRange.getLowerValue();
-
- if (lower>upper) {
+
+ if (lower > upper) {
//Invalid ack
- FaultData data = new FaultData ();
- int SOAPVersion = SandeshaUtil.getSOAPVersion(msgCtx.getEnvelope());
+ FaultData data = new FaultData();
+ int SOAPVersion = SandeshaUtil.getSOAPVersion(msgCtx
+ .getEnvelope());
if (SOAPVersion == Constants.SOAPVersion.v1_1)
data.setCode(SOAP11Constants.FAULT_CODE_SENDER);
else
data.setCode(SOAP12Constants.FAULT_CODE_SENDER);
-
- data.setSubcode(Constants.SOAPFaults.Subcodes.INVALID_ACKNOWLEDGEMENT);
- data.setSubcode("The SequenceAcknowledgement is invalid. Lower value is larger than upper value");
+
+ data
+ .setSubcode(Constants.SOAPFaults.Subcodes.INVALID_ACKNOWLEDGEMENT);
+ data
+ .setSubcode("The SequenceAcknowledgement is invalid. Lower value is larger than upper value");
data.setDetail(sequenceAcknowledgement.getOMElement());
-
- return getFault(rmMsgContext ,data);
+
+ return getFault(rmMsgContext, data);
}
}
-
+
return null;
}
@@ -349,7 +375,9 @@
MessageContext faultMsgContext = Utils
.createOutMessageContext(referenceMessage);
- StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(referenceMessage.getSystemContext());
+ StorageManager storageManager = SandeshaUtil
+ .getSandeshaStorageManager(referenceMessage
+ .getSystemContext());
//setting contexts.
faultMsgContext.setAxisServiceGroup(referenceMessage
@@ -365,44 +393,49 @@
.getServiceContext());
faultMsgContext.setServiceContextID(referenceMessage
.getServiceContextID());
-
- AxisOperation operation = AxisOperationFactory.getAxisOperation(AxisOperationFactory.MEP_CONSTANT_OUT_ONLY);
-
-
- OperationContext operationContext = new OperationContext (operation);
-
+
+ AxisOperation operation = AxisOperationFactory
+ .getAxisOperation(AxisOperationFactory.MEP_CONSTANT_OUT_ONLY);
+
+ OperationContext operationContext = new OperationContext(operation);
+
faultMsgContext.setAxisOperation(operation);
faultMsgContext.setOperationContext(operationContext);
-
- //String toStr = null;
+ //String toStr = null;
String acksToStr = null;
- if (referenceRMMsgContext.getMessageType()==Constants.MessageTypes.CREATE_SEQ) {
- CreateSequence createSequence = (CreateSequence) referenceRMMsgContext.getMessagePart(Constants.MessageParts.CREATE_SEQ);
- acksToStr = createSequence.getAcksTo().getAddress().getEpr().getAddress();
- }else {
- SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropretyBeanMgr();
- String sequenceId = data.getSequenceId();
- SequencePropertyBean acksToBean = seqPropMgr.retrieve(sequenceId,Constants.SequenceProperties.ACKS_TO_EPR);
- if (acksToBean!=null) {
- EndpointReference epr = (EndpointReference) acksToBean.getValue();
- if (epr!=null)
- acksToStr = epr.getAddress();
- }
- }
-
- if (acksToStr!=null && !acksToStr.equals(Constants.WSA.NS_URI_ANONYMOUS)) {
- faultMsgContext.setTo(new EndpointReference (acksToStr));
- }
-
-
+ if (referenceRMMsgContext.getMessageType() == Constants.MessageTypes.CREATE_SEQ) {
+ CreateSequence createSequence = (CreateSequence) referenceRMMsgContext
+ .getMessagePart(Constants.MessageParts.CREATE_SEQ);
+ acksToStr = createSequence.getAcksTo().getAddress().getEpr()
+ .getAddress();
+ } else {
+ SequencePropertyBeanMgr seqPropMgr = storageManager
+ .getSequencePropretyBeanMgr();
+ String sequenceId = data.getSequenceId();
+ SequencePropertyBean acksToBean = seqPropMgr.retrieve(
+ sequenceId, Constants.SequenceProperties.ACKS_TO_EPR);
+ if (acksToBean != null) {
+ EndpointReference epr = (EndpointReference) acksToBean
+ .getValue();
+ if (epr != null)
+ acksToStr = epr.getAddress();
+ }
+ }
+
+ if (acksToStr != null
+ && !acksToStr.equals(Constants.WSA.NS_URI_ANONYMOUS)) {
+ faultMsgContext.setTo(new EndpointReference(acksToStr));
+ }
+
int SOAPVersion = SandeshaUtil.getSOAPVersion(referenceMessage
.getEnvelope());
SOAPFaultEnvelopeCreator.addSOAPFaultEnvelope(faultMsgContext,
SOAPVersion, data);
-
- RMMsgContext faultRMMsgCtx = MsgInitializer.initializeMessage(faultMsgContext);
+
+ RMMsgContext faultRMMsgCtx = MsgInitializer
+ .initializeMessage(faultMsgContext);
return faultRMMsgCtx;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/MessageRetransmissionAdjuster.java Sun Nov 20 08:23:27 2005
@@ -18,76 +18,78 @@
package org.apache.sandesha2.util;
import org.apache.axis2.context.MessageContext;
-import org.apache.derby.iapi.sql.dictionary.ConsInfo;
import org.apache.sandesha2.Constants;
import org.apache.sandesha2.SandeshaDynamicProperties;
import org.apache.sandesha2.policy.RMPolicyBean;
import org.apache.sandesha2.storage.beans.RetransmitterBean;
-
/**
- * @author chamikara
+ * @author Chamikara Jayalath <ch...@gmail.com>
*/
public class MessageRetransmissionAdjuster {
- public RetransmitterBean adjustRetransmittion (RetransmitterBean retransmitterBean) {
+ public RetransmitterBean adjustRetransmittion(
+ RetransmitterBean retransmitterBean) {
String storedKey = (String) retransmitterBean.getKey();
-
- if (storedKey==null)
+
+ if (storedKey == null)
return retransmitterBean;
-
- MessageContext messageContext = SandeshaUtil.getStoredMessageContext(storedKey);
-
- if (messageContext.getSystemContext()==null)
+
+ MessageContext messageContext = SandeshaUtil
+ .getStoredMessageContext(storedKey);
+
+ if (messageContext.getSystemContext() == null)
return retransmitterBean;
-
- RMPolicyBean policyBean = (RMPolicyBean) messageContext.getProperty(Constants.WSP.RM_POLICY_BEAN);
- if (policyBean==null){
+
+ RMPolicyBean policyBean = (RMPolicyBean) messageContext
+ .getProperty(Constants.WSP.RM_POLICY_BEAN);
+ if (policyBean == null) {
policyBean = new SandeshaDynamicProperties().getPolicyBean();
}
-
- retransmitterBean.setSentCount(retransmitterBean.getSentCount()+1);
- adjustNextRetransmissionTime (retransmitterBean,policyBean);
-
- if (retransmitterBean.getSentCount()>=Constants.MAXIMUM_RETRANSMISSION_ATTEMPTS)
- stopRetransmission (retransmitterBean);
-
+
+ retransmitterBean.setSentCount(retransmitterBean.getSentCount() + 1);
+ adjustNextRetransmissionTime(retransmitterBean, policyBean);
+
+ if (retransmitterBean.getSentCount() >= Constants.MAXIMUM_RETRANSMISSION_ATTEMPTS)
+ stopRetransmission(retransmitterBean);
+
return retransmitterBean;
}
-
- private RetransmitterBean adjustNextRetransmissionTime (RetransmitterBean retransmitterBean,RMPolicyBean policyBean) {
-
+
+ private RetransmitterBean adjustNextRetransmissionTime(
+ RetransmitterBean retransmitterBean, RMPolicyBean policyBean) {
+
long lastSentTime = retransmitterBean.getTimeToSend();
-
+
int count = retransmitterBean.getSentCount();
-
+
long baseInterval = policyBean.getRetransmissionInterval();
-
+
long newInterval = baseInterval;
if (policyBean.isExponentialBackoff()) {
- newInterval = generateNextExponentialBackedoffDifference (count,baseInterval);
+ newInterval = generateNextExponentialBackedoffDifference(count,
+ baseInterval);
}
-
- retransmitterBean.setTimeToSend(lastSentTime+newInterval);
-
+
+ retransmitterBean.setTimeToSend(lastSentTime + newInterval);
+
return retransmitterBean;
}
-
- private void stopRetransmission (RetransmitterBean bean) {
+
+ private void stopRetransmission(RetransmitterBean bean) {
bean.setReSend(false);
}
-
-
+
//TODO: Have to change this to be plugable
- private long generateNextExponentialBackedoffDifference(int count,long initialInterval) {
+ private long generateNextExponentialBackedoffDifference(int count,
+ long initialInterval) {
long interval = initialInterval;
- for (int i=1;i<count;i++){
- interval = interval*2;
+ for (int i = 1; i < count; i++) {
+ interval = interval * 2;
}
-
+
return interval;
}
-
-
-}
+
+}
\ No newline at end of file
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgInitializer.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgInitializer.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgInitializer.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgInitializer.java Sun Nov 20 08:23:27 2005
@@ -23,6 +23,10 @@
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.wsrm.RMElements;
+/**
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ */
+
public class MsgInitializer {
public static RMMsgContext initializeMessage(MessageContext ctx)
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgValidator.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgValidator.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgValidator.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/MsgValidator.java Sun Nov 20 08:23:27 2005
@@ -21,18 +21,15 @@
import org.apache.sandesha2.RMMsgContext;
/**
- * @author Chamikara
- * @author Sanka
- * @author Jaliya
+ * @author Chamikara Jayalath <ch...@gmail.com>
*/
//TODO remove this class.
public class MsgValidator {
-
- private static void validateMessage(RMMsgContext rmMsgCtx) throws AxisFault{
+ private static void validateMessage(RMMsgContext rmMsgCtx) throws AxisFault {
- //no need of this method any more.
- //Validation is done in the message initialized
- }
-}
+ //no need of this method any more.
+ //Validation is done in the message initialized
+ }
+}
\ No newline at end of file
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java Sun Nov 20 08:23:27 2005
@@ -55,16 +55,19 @@
import org.apache.sandesha2.wsrm.SequenceOffer;
import org.apache.sandesha2.wsrm.TerminateSequence;
+/**
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ */
+
public class RMMsgCreator {
-
- private static void setUpMessage (MessageContext rmMsgCtx) {
+ private static void setUpMessage(MessageContext rmMsgCtx) {
//Seting RMPolicyBean
- RMPolicyBean policyBean = new RMPolicyBean ();
- rmMsgCtx.setProperty(Constants.WSP.RM_POLICY_BEAN,policyBean);
-
+ RMPolicyBean policyBean = new RMPolicyBean();
+ rmMsgCtx.setProperty(Constants.WSP.RM_POLICY_BEAN, policyBean);
+
}
-
+
public static RMMsgContext createCreateSeqMsg(
RMMsgContext applicationRMMsg, String tempSequenceId, String acksTo)
throws SandeshaException {
@@ -77,8 +80,9 @@
if (context == null)
throw new SandeshaException("Configuration Context is null");
- SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil.getSOAPVersion ( applicationMsgContext.getEnvelope()));
-
+ SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil
+ .getSOAPVersion(applicationMsgContext.getEnvelope()));
+
StorageManager storageManager = SandeshaUtil
.getSandeshaStorageManager(context);
SequencePropertyBeanMgr seqPropMgr = storageManager
@@ -104,15 +108,16 @@
.getServiceContextID());
setUpMessage(createSeqmsgContext);
-
+
String createSeqMsgId = SandeshaUtil.getUUID();
try {
AxisOperation appMsgOperationDesc = applicationMsgContext
.getAxisOperation();
AxisOperation createSeqOperationDesc = AxisOperationFactory
.getOperetionDescription(AxisOperationFactory.MEP_URI_OUT_IN);
-
- createSeqOperationDesc.setName(new QName ("CreateSequenceOperation"));
+
+ createSeqOperationDesc
+ .setName(new QName("CreateSequenceOperation"));
if (appMsgOperationDesc != null) {
createSeqOperationDesc.setPhasesOutFlow(appMsgOperationDesc
.getPhasesOutFlow());
@@ -130,7 +135,7 @@
//TODO set a suitable ope. description
OperationContext createSeqOpContext = new OperationContext(
createSeqmsgContext.getAxisOperation());
-
+
createSeqmsgContext.setOperationContext(createSeqOpContext);
createSeqOpContext.addMessageContext(createSeqmsgContext);
//registering opearion context
@@ -139,7 +144,7 @@
createSeqOpContext);
//Setting a new SOAP Envelop.
-
+
SOAPEnvelope envelope = factory.getDefaultEnvelope();
createSeqmsgContext.setEnvelope(envelope);
@@ -157,10 +162,11 @@
CreateSequence createSequencePart = new CreateSequence(factory);
//Adding sequence offer - if present
- ServiceContext serviceContext = applicationMsgContext.getServiceContext();
- if (serviceContext!=null) {
+ ServiceContext serviceContext = applicationMsgContext
+ .getServiceContext();
+ if (serviceContext != null) {
String offeredSequence = (String) serviceContext
- .getProperty(Constants.OFFERED_SEQUENCE_ID);
+ .getProperty(Constants.OFFERED_SEQUENCE_ID);
if (offeredSequence != null && !"".equals(offeredSequence)) {
SequenceOffer offerPart = new SequenceOffer(factory);
Identifier identifier = new Identifier(factory);
@@ -206,7 +212,8 @@
createSeqRMMsg.setReplyTo(replyToEPR);
//FIXME - Give user a seperate way to set acksTo (client side)
- createSequencePart.setAcksTo(new AcksTo(new Address(acksToEPR,factory),factory));
+ createSequencePart.setAcksTo(new AcksTo(
+ new Address(acksToEPR, factory), factory));
createSeqRMMsg.setMessagePart(Constants.MessageParts.CREATE_SEQ,
createSequencePart);
@@ -218,7 +225,8 @@
}
createSeqRMMsg.setAction(Constants.WSRM.Actions.ACTION_CREATE_SEQUENCE);
- createSeqRMMsg.setSOAPAction(Constants.WSRM.Actions.SOAP_ACTION_CREATE_SEQUENCE);
+ createSeqRMMsg
+ .setSOAPAction(Constants.WSRM.Actions.SOAP_ACTION_CREATE_SEQUENCE);
createSeqRMMsg.setMessageId(createSeqMsgId);
MessageContext createSeqMsg = createSeqRMMsg.getMessageContext();
@@ -249,8 +257,9 @@
throw new SandeshaException("MessageContext is null");
setUpMessage(terminateMessage);
-
- SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil.getSOAPVersion ( referenceMessage.getEnvelope()));
+
+ SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil
+ .getSOAPVersion(referenceMessage.getEnvelope()));
MessageInformationHeaders newMessageInfoHeaders = new MessageInformationHeaders();
terminateMessage.setMessageInformationHeaders(newMessageInfoHeaders);
@@ -263,9 +272,9 @@
AxisConfiguration axisConfig = configCtx.getAxisConfiguration();
AxisServiceGroup serviceGroup = new AxisServiceGroup(axisConfig);
AxisService service = new AxisService(new QName("RMClientService")); // This
- // is a
- // dummy
- // service.
+ // is a
+ // dummy
+ // service.
ServiceGroupContext serviceGroupContext = new ServiceGroupContext(
configCtx, serviceGroup);
ServiceContext serviceContext = new ServiceContext(service,
@@ -317,8 +326,9 @@
RMMsgContext createSeqMessage, MessageContext outMessage,
String newSequenceID) throws AxisFault {
- SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil.getSOAPVersion ( createSeqMessage.getSOAPEnvelope()));
-
+ SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil
+ .getSOAPVersion(createSeqMessage.getSOAPEnvelope()));
+
IOMRMElement messagePart = createSeqMessage
.getMessagePart(Constants.MessageParts.CREATE_SEQ);
CreateSequence cs = (CreateSequence) messagePart;
@@ -351,17 +361,18 @@
SOAPEnvelope envelope = factory.getDefaultEnvelope();
response.toOMElement(envelope.getBody());
- outMessage.setWSAAction(Constants.WSRM.Actions.ACTION_CREATE_SEQUENCE_RESPONSE);
- outMessage.setSoapAction(Constants.WSRM.Actions.SOAP_ACTION_CREATE_SEQUENCE_RESPONSE);
+ outMessage
+ .setWSAAction(Constants.WSRM.Actions.ACTION_CREATE_SEQUENCE_RESPONSE);
+ outMessage
+ .setSoapAction(Constants.WSRM.Actions.SOAP_ACTION_CREATE_SEQUENCE_RESPONSE);
-
String newMessageId = SandeshaUtil.getUUID();
outMessage.setMessageID(newMessageId);
outMessage.setEnvelope(envelope);
setUpMessage(outMessage);
-
+
RMMsgContext createSeqResponse = null;
try {
createSeqResponse = MsgInitializer.initializeMessage(outMessage);
@@ -375,8 +386,9 @@
//Adds a ack message to the following message.
public static void addAckMessage(RMMsgContext applicationMsg,
String sequenceId) throws SandeshaException {
-
- SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil.getSOAPVersion ( applicationMsg.getSOAPEnvelope()));
+
+ SOAPFactory factory = SOAPAbstractFactory.getSOAPFactory(SandeshaUtil
+ .getSOAPVersion(applicationMsg.getSOAPEnvelope()));
SOAPEnvelope envelope = applicationMsg.getSOAPEnvelope();
if (envelope == null) {
@@ -385,7 +397,8 @@
}
envelope = applicationMsg.getSOAPEnvelope();
- SequenceAcknowledgement sequenceAck = new SequenceAcknowledgement(factory);
+ SequenceAcknowledgement sequenceAck = new SequenceAcknowledgement(
+ factory);
Identifier id = new Identifier(factory);
id.setIndentifer(sequenceId);
sequenceAck.setIdentifier(id);
@@ -401,8 +414,8 @@
Constants.SequenceProperties.RECEIVED_MESSAGES);
String msgNoList = (String) seqBean.getValue();
- AcknowledgementRange[] ackRangeArr = SandeshaUtil
- .getAckRangeArray(msgNoList,factory);
+ AcknowledgementRange[] ackRangeArr = SandeshaUtil.getAckRangeArray(
+ msgNoList, factory);
int length = ackRangeArr.length;
@@ -410,8 +423,10 @@
sequenceAck.addAcknowledgementRanges(ackRangeArr[i]);
sequenceAck.toOMElement(envelope.getHeader());
- applicationMsg.setAction(Constants.WSRM.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT);
- applicationMsg.setSOAPAction(Constants.WSRM.Actions.SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT);
+ applicationMsg
+ .setAction(Constants.WSRM.Actions.ACTION_SEQUENCE_ACKNOWLEDGEMENT);
+ applicationMsg
+ .setSOAPAction(Constants.WSRM.Actions.SOAP_ACTION_SEQUENCE_ACKNOWLEDGEMENT);
applicationMsg.setMessageId(SandeshaUtil.getUUID());
}
@@ -438,9 +453,9 @@
.getAxisOperation());
ackMsgCtx.setOperationContext(ackOpCtx);
-
+
setUpMessage(ackMsgCtx);
-
+
ackOpCtx.addMessageContext(ackMsgCtx);
Sequence reqSequence = (Sequence) applicationRMMsgCtx
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMPolicyManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMPolicyManager.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMPolicyManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMPolicyManager.java Sun Nov 20 08:23:27 2005
@@ -18,13 +18,17 @@
package org.apache.sandesha2.util;
import org.apache.sandesha2.RMMsgContext;
-import org.apache.sandesha2.msgreceivers.RMMessageReceiver;
import org.apache.sandesha2.policy.RMPolicyBean;
+/**
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ */
+
public class RMPolicyManager {
- public static RMPolicyBean getPolicyBean (RMMsgContext msgContext) {
- RMPolicyBean policyBean = new RMPolicyBean ();
+ public static RMPolicyBean getPolicyBean(RMMsgContext msgContext) {
+ RMPolicyBean policyBean = new RMPolicyBean();
return policyBean;
}
-}
+}
\ No newline at end of file
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/SOAPAbstractFactory.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SOAPAbstractFactory.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SOAPAbstractFactory.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SOAPAbstractFactory.java Sun Nov 20 08:23:27 2005
@@ -18,26 +18,21 @@
package org.apache.sandesha2.util;
import org.apache.axis2.om.OMAbstractFactory;
-import org.apache.axis2.soap.SOAP11Constants;
-import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.sandesha2.Constants;
/**
- * @author Chamikara
- * @author Sanka
- * @author Jaliya
+ * @author Chamikara Jayalath <ch...@gmail.com>
*/
-
public class SOAPAbstractFactory {
- public static SOAPFactory getSOAPFactory (int SOAPVersion) {
-
- if (SOAPVersion==Constants.SOAPVersion.v1_1)
+ public static SOAPFactory getSOAPFactory(int SOAPVersion) {
+
+ if (SOAPVersion == Constants.SOAPVersion.v1_1)
return OMAbstractFactory.getSOAP11Factory();
- else
+ else
return OMAbstractFactory.getSOAP12Factory();
-
+
}
-}
+}
\ No newline at end of file
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java Sun Nov 20 08:23:27 2005
@@ -26,30 +26,21 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
+
import org.apache.axis2.AxisFault;
-import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.MessageInformationHeaders;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.i18n.Messages;
-import org.apache.axis2.om.OMConstants;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.om.impl.llom.builder.StAXBuilder;
import org.apache.axis2.om.impl.llom.builder.StAXOMBuilder;
import org.apache.axis2.soap.SOAP11Constants;
import org.apache.axis2.soap.SOAP12Constants;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.soap.SOAPFault;
-import org.apache.axis2.soap.SOAPFaultCode;
-import org.apache.axis2.soap.SOAPFaultDetail;
-import org.apache.axis2.soap.SOAPFaultReason;
-import org.apache.axis2.soap.SOAPFaultSubCode;
-import org.apache.axis2.soap.SOAPFaultText;
-import org.apache.axis2.soap.SOAPFaultValue;
import org.apache.axis2.soap.impl.llom.builder.StAXSOAPModelBuilder;
import org.apache.axis2.soap.impl.llom.soap11.SOAP11Factory;
import org.apache.axis2.transport.http.HTTPConstants;
@@ -58,9 +49,7 @@
import org.apache.axis2.util.Utils;
import org.apache.commons.httpclient.NameValuePair;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.FaultData;
import org.apache.sandesha2.RMMsgContext;
-import org.apache.sandesha2.SOAPFaultEnvelopeCreator;
import org.apache.sandesha2.SandeshaDynamicProperties;
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.StorageManager;
@@ -69,8 +58,7 @@
import org.apache.sandesha2.wsrm.AcknowledgementRange;
/**
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
*/
public class SandeshaUtil {
@@ -566,6 +554,6 @@
} catch (AxisFault e) {
throw new SandeshaException(e.getMessage());
}
- }
+ }
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SequenceManager.java Sun Nov 20 08:23:27 2005
@@ -5,6 +5,7 @@
* Window - Preferences - Java - Code Style - Code Templates
*/
package org.apache.sandesha2.util;
+
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.AbstractContext;
@@ -20,27 +21,27 @@
import org.apache.sandesha2.wsrm.CreateSequence;
/**
- * @author Chamikara
- * @author Sanka
- * @author Jaliya
+ * @author Chamikara Jayalath <ch...@gmail.com>
*/
+
public class SequenceManager {
- public static String setupNewSequence(RMMsgContext createSequenceMsg) throws AxisFault {
+ public static String setupNewSequence(RMMsgContext createSequenceMsg)
+ throws AxisFault {
// SequencePropertyBean seqPropBean = new SequencePropertyBean
// (sequenceId,Constants.SEQ_PROPERTY_RECEIVED_MESSAGES,"");
- // InMemorySequencePropertyBeanMgr beanMgr = new InMemorySequencePropertyBeanMgr
+ // InMemorySequencePropertyBeanMgr beanMgr = new
+ // InMemorySequencePropertyBeanMgr
// (Constants.DEFAULT_STORAGE_TYPE);
// beanMgr.create(seqPropBean);
String sequenceId = SandeshaUtil.getUUID();
AbstractContext context = createSequenceMsg.getContext();
-
+
EndpointReference to = createSequenceMsg.getTo();
- if (to==null)
- throw new AxisFault ("To is null");
-
-
+ if (to == null)
+ throw new AxisFault("To is null");
+
EndpointReference replyTo = createSequenceMsg.getReplyTo();
if (replyTo == null)
throw new AxisFault("ReplyTo is null");
@@ -57,22 +58,25 @@
throw new AxisFault("AcksTo is null");
StorageManager storageManager = null;
-
+
try {
- storageManager = SandeshaUtil.getSandeshaStorageManager(createSequenceMsg.getMessageContext().getSystemContext());
+ storageManager = SandeshaUtil
+ .getSandeshaStorageManager(createSequenceMsg
+ .getMessageContext().getSystemContext());
} catch (SandeshaException e) {
e.printStackTrace();
}
-
- SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropretyBeanMgr();
- //TODO - recheck following
+ SequencePropertyBeanMgr seqPropMgr = storageManager
+ .getSequencePropretyBeanMgr();
+
+ //TODO - recheck following
//incoming To - reply address of response messages
//imcoming replyTo - to address of response messages
SequencePropertyBean receivedMsgBean = new SequencePropertyBean(
sequenceId, Constants.SequenceProperties.RECEIVED_MESSAGES, "");
- SequencePropertyBean toBean = new SequencePropertyBean (sequenceId,
- Constants.SequenceProperties.TO_EPR,replyTo);
+ SequencePropertyBean toBean = new SequencePropertyBean(sequenceId,
+ Constants.SequenceProperties.TO_EPR, replyTo);
SequencePropertyBean replyToBean = new SequencePropertyBean(sequenceId,
Constants.SequenceProperties.REPLY_TO_EPR, to);
SequencePropertyBean acksToBean = new SequencePropertyBean(sequenceId,
@@ -85,49 +89,55 @@
NextMsgBeanMgr nextMsgMgr = storageManager.getNextMsgBeanMgr();
nextMsgMgr.insert(new NextMsgBean(sequenceId, 1)); // 1 will be the next
- // message to invoke
+ // message to invoke
//this will apply for only in-order invocations.
-
+
return sequenceId;
}
public void removeSequence(String sequence) {
}
-
- public static void setupNewClientSequence (MessageContext firstAplicationMsgCtx, String tempSequenceId) throws SandeshaException {
-
+
+ public static void setupNewClientSequence(
+ MessageContext firstAplicationMsgCtx, String tempSequenceId)
+ throws SandeshaException {
+
AbstractContext context = firstAplicationMsgCtx.getSystemContext();
-
- StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(firstAplicationMsgCtx.getSystemContext());
-
- SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropretyBeanMgr();
-
-
+
+ StorageManager storageManager = SandeshaUtil
+ .getSandeshaStorageManager(firstAplicationMsgCtx
+ .getSystemContext());
+
+ SequencePropertyBeanMgr seqPropMgr = storageManager
+ .getSequencePropretyBeanMgr();
+
EndpointReference toEPR = firstAplicationMsgCtx.getTo();
EndpointReference replyToEPR = firstAplicationMsgCtx.getReplyTo();
- String acksTo = (String) firstAplicationMsgCtx.getProperty(Constants.ClientProperties.AcksTo);
-
- if (toEPR==null)
- throw new SandeshaException ("WS-Addressing To is null");
-
- SequencePropertyBean toBean = new SequencePropertyBean (tempSequenceId, Constants.SequenceProperties.TO_EPR,toEPR);
-
+ String acksTo = (String) firstAplicationMsgCtx
+ .getProperty(Constants.ClientProperties.AcksTo);
+
+ if (toEPR == null)
+ throw new SandeshaException("WS-Addressing To is null");
+
+ SequencePropertyBean toBean = new SequencePropertyBean(tempSequenceId,
+ Constants.SequenceProperties.TO_EPR, toEPR);
+
//Default value for acksTo is anonymous
- if (acksTo==null)
+ if (acksTo == null)
acksTo = Constants.WSA.NS_URI_ANONYMOUS;
-
- EndpointReference acksToEPR = new EndpointReference (acksTo);
- SequencePropertyBean acksToBean = new SequencePropertyBean (tempSequenceId, Constants.SequenceProperties.ACKS_TO_EPR,acksToEPR);
-
-// //TODO - make default for replyTo anonymous
-// if (replyToEPR==null)
-// replyToEPR = new EndpointReference (Constants.WSA.NS_URI_ANONYMOUS);
-
+
+ EndpointReference acksToEPR = new EndpointReference(acksTo);
+ SequencePropertyBean acksToBean = new SequencePropertyBean(
+ tempSequenceId, Constants.SequenceProperties.ACKS_TO_EPR,
+ acksToEPR);
+
+ // //TODO - make default for replyTo anonymous
+ // if (replyToEPR==null)
+ // replyToEPR = new EndpointReference (Constants.WSA.NS_URI_ANONYMOUS);
+
seqPropMgr.insert(toBean);
seqPropMgr.insert(acksToBean);
-
-
-
+
}
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/workers/InOrderInvoker.java Sun Nov 20 08:23:27 2005
@@ -38,6 +38,10 @@
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.wsrm.Sequence;
+/**
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ */
+
public class InOrderInvoker extends Thread {
boolean invokerStarted = false;
@@ -135,17 +139,19 @@
new AxisEngine(msgToInvoke.getSystemContext())
.receive(msgToInvoke);
- ServiceContext serviceContext = msgToInvoke.getServiceContext();
+ ServiceContext serviceContext = msgToInvoke
+ .getServiceContext();
Object debug = null;
- if (serviceContext!=null) {
- debug = serviceContext.getProperty(Constants.SANDESHA_DEBUG_MODE);
+ if (serviceContext != null) {
+ debug = serviceContext
+ .getProperty(Constants.SANDESHA_DEBUG_MODE);
if (debug != null && "on".equals(debug)) {
System.out
- .println("DEBUG: Invoker invoking a '"
- + SandeshaUtil
- .getMessageTypeString(rmMsg
- .getMessageType())
- + "' message.");
+ .println("DEBUG: Invoker invoking a '"
+ + SandeshaUtil
+ .getMessageTypeString(rmMsg
+ .getMessageType())
+ + "' message.");
}
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java Sun Nov 20 08:23:27 2005
@@ -35,6 +35,10 @@
import org.apache.sandesha2.util.MsgInitializer;
import org.apache.sandesha2.util.SandeshaUtil;
+/**
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ */
+
public class Sender extends Thread {
private boolean senderStarted = false;
@@ -64,9 +68,9 @@
.getRetransmitterBeanMgr();
Collection coll = mgr.findMsgsToSend();
Iterator iter = coll.iterator();
-
+
while (iter.hasNext()) {
-
+
RetransmitterBean bean = (RetransmitterBean) iter.next();
String key = (String) bean.getKey();
MessageContext msgCtx = SandeshaUtil
@@ -75,41 +79,46 @@
try {
RMMsgContext rmMsgCtx = MsgInitializer
.initializeMessage(msgCtx);
-
-
+
updateMessage(msgCtx);
- ServiceContext serviceContext = msgCtx.getServiceContext();
+ ServiceContext serviceContext = msgCtx
+ .getServiceContext();
Object debug = null;
- if (serviceContext!=null) {
- debug = serviceContext.getProperty(Constants.SANDESHA_DEBUG_MODE);
+ if (serviceContext != null) {
+ debug = serviceContext
+ .getProperty(Constants.SANDESHA_DEBUG_MODE);
if (debug != null && "on".equals(debug)) {
- System.out.println("DEBUG: Sender is sending a '"
- + SandeshaUtil
- .getMessageTypeString(rmMsgCtx
- .getMessageType())
- + "' message.");
+ System.out
+ .println("DEBUG: Sender is sending a '"
+ + SandeshaUtil
+ .getMessageTypeString(rmMsgCtx
+ .getMessageType())
+ + "' message.");
}
}
-
- if (rmMsgCtx.getMessageType()==Constants.MessageTypes.APPLICATION) {
- //piggybacking if an ack if available for the same sequence.
- AcknowledgementManager.piggybackAckIfPresent(rmMsgCtx);
+
+ if (rmMsgCtx.getMessageType() == Constants.MessageTypes.APPLICATION) {
+ //piggybacking if an ack if available for the same
+ // sequence.
+ AcknowledgementManager
+ .piggybackAckIfPresent(rmMsgCtx);
}
-
+
try {
new AxisEngine(context).send(msgCtx);
- }catch (Exception e) {
+ } catch (Exception e) {
//Exception is sending. retry later
- System.out.println("Exception thrown in sending...");
+ System.out
+ .println("Exception thrown in sending...");
e.printStackTrace();
}
-
- MessageRetransmissionAdjuster retransmitterAdjuster = new MessageRetransmissionAdjuster ();
+
+ MessageRetransmissionAdjuster retransmitterAdjuster = new MessageRetransmissionAdjuster();
retransmitterAdjuster.adjustRetransmittion(bean);
-
+
mgr.update(bean);
-
+
if (!msgCtx.isServerSide())
checkForSyncResponses(msgCtx);
@@ -189,7 +198,6 @@
boolean responsePresent = (msgCtx
.getProperty(MessageContext.TRANSPORT_IN) != null);
-
if (responsePresent) {
//create the response
MessageContext response = new MessageContext(msgCtx
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java Sun Nov 20 08:23:27 2005
@@ -17,17 +17,17 @@
package org.apache.sandesha2.wsrm;
import javax.xml.namespace.QName;
+
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMException;
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class Accept implements IOMRMElement {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AckRequested.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AckRequested.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AckRequested.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AckRequested.java Sun Nov 20 08:23:27 2005
@@ -26,12 +26,11 @@
import org.apache.axis2.soap.SOAPHeader;
import org.apache.axis2.soap.SOAPHeaderBlock;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class AckRequested implements IOMRMPart {
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=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java Sun Nov 20 08:23:27 2005
@@ -24,12 +24,11 @@
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class AcknowledgementRange implements IOMRMElement {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java Sun Nov 20 08:23:27 2005
@@ -23,12 +23,11 @@
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class AcksTo implements IOMRMElement {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Address.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Address.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Address.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Address.java Sun Nov 20 08:23:27 2005
@@ -14,12 +14,11 @@
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class Address implements IOMRMElement {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java Sun Nov 20 08:23:27 2005
@@ -25,12 +25,11 @@
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class CreateSequence implements IOMRMPart {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java Sun Nov 20 08:23:27 2005
@@ -25,12 +25,11 @@
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class CreateSequenceResponse implements IOMRMPart {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Expires.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Expires.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Expires.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Expires.java Sun Nov 20 08:23:27 2005
@@ -24,12 +24,11 @@
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class Expires implements IOMRMElement {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/FaultCode.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/FaultCode.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/FaultCode.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/FaultCode.java Sun Nov 20 08:23:27 2005
@@ -23,12 +23,11 @@
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class FaultCode implements IOMRMElement {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMElement.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMElement.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMElement.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMElement.java Sun Nov 20 08:23:27 2005
@@ -17,11 +17,10 @@
package org.apache.sandesha2.wsrm;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
-
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMException;
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMPart.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMPart.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMPart.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/IOMRMPart.java Sun Nov 20 08:23:27 2005
@@ -19,6 +19,11 @@
import org.apache.axis2.soap.SOAPEnvelope;
+/**
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
+ */
public interface IOMRMPart extends IOMRMElement {
public void toSOAPEnvelope (SOAPEnvelope envelope);
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Identifier.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Identifier.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Identifier.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Identifier.java Sun Nov 20 08:23:27 2005
@@ -17,9 +17,9 @@
package org.apache.sandesha2.wsrm;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
import javax.xml.namespace.QName;
@@ -29,7 +29,6 @@
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
public class Identifier implements Constants, IOMRMElement {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/LastMessage.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/LastMessage.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/LastMessage.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/LastMessage.java Sun Nov 20 08:23:27 2005
@@ -23,12 +23,11 @@
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class LastMessage implements IOMRMElement {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/MessageNumber.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/MessageNumber.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/MessageNumber.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/MessageNumber.java Sun Nov 20 08:23:27 2005
@@ -23,12 +23,11 @@
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class MessageNumber implements IOMRMElement {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Nack.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Nack.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Nack.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Nack.java Sun Nov 20 08:23:27 2005
@@ -21,12 +21,11 @@
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class Nack implements IOMRMElement {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/RMElements.java Sun Nov 20 08:23:27 2005
@@ -17,10 +17,6 @@
package org.apache.sandesha2.wsrm;
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.OMElement;
import org.apache.axis2.om.OMException;
@@ -31,9 +27,9 @@
import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class RMElements {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Sequence.java Sun Nov 20 08:23:27 2005
@@ -26,12 +26,11 @@
import org.apache.axis2.soap.SOAPHeader;
import org.apache.axis2.soap.SOAPHeaderBlock;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class Sequence implements IOMRMPart {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceAcknowledgement.java Sun Nov 20 08:23:27 2005
@@ -29,12 +29,11 @@
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.SOAPHeader;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class SequenceAcknowledgement implements IOMRMPart {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceFault.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceFault.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceFault.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceFault.java Sun Nov 20 08:23:27 2005
@@ -24,12 +24,11 @@
import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class SequenceFault implements IOMRMElement {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceOffer.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceOffer.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceOffer.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/SequenceOffer.java Sun Nov 20 08:23:27 2005
@@ -23,12 +23,11 @@
import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class SequenceOffer implements IOMRMElement {
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/TerminateSequence.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/TerminateSequence.java?rev=345762&r1=345761&r2=345762&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/TerminateSequence.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/TerminateSequence.java Sun Nov 20 08:23:27 2005
@@ -25,12 +25,11 @@
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.util.SOAPAbstractFactory;
/**
- * @author Saminda
- * @author chamikara
- * @author sanka
+ * @author Chamikara Jayalath <ch...@gmail.com>
+ * @author Sanka Samaranayaka <ss...@gmail.com>
+ * @author Saminda Abeyruwan <sa...@opensource.lk>
*/
public class TerminateSequence implements IOMRMPart {
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org