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/09/23 05:54:41 UTC
svn commit: r291067 [2/3] - in
/webservices/sandesha/trunk/src/org/apache/sandesha2: ./ handlers/
msgprocessors/ msgreceivers/ storage/ storage/beanmanagers/ storage/beans/
storage/inmemory/ util/ wsrm/
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java?rev=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/NextMsgBeanMgr.java Thu Sep 22 20:52:54 2005
@@ -25,10 +25,9 @@
import org.apache.axis2.context.AbstractContext;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.RMException;
+import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.beans.NextMsgBean;
-
/**
* @author Chamikara Jayalath <ch...@wso2.com>
* @author Sanka Samaranayake <ss...@gmail.com>
@@ -36,66 +35,66 @@
public class NextMsgBeanMgr {
private Hashtable table = null;
-
+
/**
- *
+ *
*/
public NextMsgBeanMgr(AbstractContext context) {
Object obj = context.getProperty(Constants.STORAGE_MAP_BEAN_MAP);
-
- if (obj!=null) {
+
+ if (obj != null) {
table = (Hashtable) obj;
- }else {
- table = new Hashtable ();
- context.setProperty(Constants.STORAGE_MAP_BEAN_MAP,table);
+ } else {
+ table = new Hashtable();
+ context.setProperty(Constants.STORAGE_MAP_BEAN_MAP, table);
}
}
- public boolean delete(String sequenceId) {
+ public boolean delete(String sequenceId) {
return table.remove(sequenceId) != null;
}
- public NextMsgBean retrieve(String sequenceId) {
+ public NextMsgBean retrieve(String sequenceId) {
return (NextMsgBean) table.get(sequenceId);
}
- public boolean insert(NextMsgBean bean) {
+ public boolean insert(NextMsgBean bean) {
table.put(bean.getSequenceId(), bean);
return true;
}
- public ResultSet find(String query){
+ public ResultSet find(String query) {
throw new UnsupportedOperationException("selectRS() is not supported");
}
- public Collection find(NextMsgBean bean) {
+ public Collection find(NextMsgBean bean) {
ArrayList beans = new ArrayList();
Iterator iterator = table.values().iterator();
-
+
NextMsgBean temp;
while (iterator.hasNext()) {
temp = (NextMsgBean) iterator.next();
-
- if ((bean.getSequenceId() != null
- && bean.getSequenceId().equals(temp.getSequenceId()))
- /*&& (bean.getNextMsgNoToProcess() != null
- && bean.getNextMsgNoToProcess().equals(temp.getNextMsgNoToProcess()))*/
- && (bean.getNextMsgNoToProcess() > 0)
- ) {
-
- beans.add(temp);
+
+ if ((bean.getSequenceId() != null && bean.getSequenceId().equals(
+ temp.getSequenceId()))
+ /*
+ * && (bean.getNextMsgNoToProcess() != null &&
+ * bean.getNextMsgNoToProcess().equals(temp.getNextMsgNoToProcess()))
+ */
+ && (bean.getNextMsgNoToProcess() > 0)) {
+
+ beans.add(temp);
}
-
+
}
return beans;
}
- public boolean update(NextMsgBean bean) {
- return table.put(bean.getSequenceId(), bean) != null ;
+ public boolean update(NextMsgBean bean) {
+ return table.put(bean.getSequenceId(), bean) != null;
}
-
-
+
public Collection retrieveAll() {
return table.values();
}
-}
+}
\ No newline at end of file
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/RetransmitterBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/RetransmitterBeanMgr.java?rev=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/RetransmitterBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/RetransmitterBeanMgr.java Thu Sep 22 20:52:54 2005
@@ -25,7 +25,7 @@
import org.apache.axis2.context.AbstractContext;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.RMException;
+import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.beans.RetransmitterBean;
/**
@@ -34,57 +34,78 @@
*/
public class RetransmitterBeanMgr {
private Hashtable table = null;
-
+
/**
- *
+ *
*/
- public RetransmitterBeanMgr(AbstractContext context) {
+ public RetransmitterBeanMgr(AbstractContext context) {
Object obj = context.getProperty(Constants.RETRANSMITTER_BEAN_MAP);
- if (obj!=null) {
+ if (obj != null) {
table = (Hashtable) obj;
- }else {
- table = new Hashtable ();
- context.setProperty(Constants.RETRANSMITTER_BEAN_MAP,table);
+ } else {
+ table = new Hashtable();
+ context.setProperty(Constants.RETRANSMITTER_BEAN_MAP, table);
}
}
- public boolean delete(String MessageId) {
+ public boolean delete(String MessageId) {
return table.remove(MessageId) != null;
}
-
- public RetransmitterBean retrieve(String MessageId){
+
+ public RetransmitterBean retrieve(String MessageId) {
return (RetransmitterBean) table.get(MessageId);
}
- public boolean insert(RetransmitterBean bean) {
+ public boolean insert(RetransmitterBean bean) throws SandeshaException {
+ if (bean.getMessageId()==null)
+ throw new SandeshaException ("Key (MessageId) is null. Cant insert.");
+
table.put(bean.getMessageId(), bean);
return true;
}
- public ResultSet find(String query) {
+ public ResultSet find(String query) {
throw new UnsupportedOperationException("selectRS() is not supported");
}
- public Collection find(RetransmitterBean bean) {
+ public Collection find(RetransmitterBean bean) {
ArrayList beans = new ArrayList();
Iterator iterator = table.values().iterator();
-
+
RetransmitterBean temp;
while (iterator.hasNext()) {
temp = (RetransmitterBean) iterator.next();
- if (!(bean.getMessageId() != null
- && bean.getMessageId().equals(temp.getMessageId()))
- && (bean.getCreateSeqMsgId() != null
- && bean.getCreateSeqMsgId().equals(temp.getCreateSeqMsgId()))
- && (bean.getKey() != null
- && bean.getKey().equals(temp.getKey()))
- && (bean.getLastSentTime() != -1
- && bean.getLastSentTime() == temp.getLastSentTime())){
-
- beans.add(temp);
- }
+ /*
+ * if (!(bean.getMessageId() != null &&
+ * bean.getMessageId().equals(temp.getMessageId())) &&
+ * (bean.getCreateSeqMsgId() != null &&
+ * bean.getCreateSeqMsgId().equals(temp.getCreateSeqMsgId())) &&
+ * (bean.getKey() != null && bean.getKey().equals(temp.getKey())) &&
+ * (bean.getLastSentTime() != -1 && bean.getLastSentTime() ==
+ * temp.getLastSentTime())){
+ *
+ * beans.add(temp); }
+ */
+ boolean add = false;
+ if (bean.getKey() != null && bean.getKey() != temp.getKey())
+ add = false;
+
+ if (bean.getLastSentTime() > 0
+ && bean.getLastSentTime() != temp.getLastSentTime())
+ add = false;
+
+ if (bean.getMessageId() != null
+ && bean.getMessageId() != temp.getMessageId())
+ add = false;
+
+ if (bean.getTempSequenceId() != null
+ && bean.getTempSequenceId() != temp.getTempSequenceId())
+ add = false;
+
+ if (add)
+ beans.add(temp);
}
-
+
return beans;
}
@@ -92,4 +113,4 @@
return table.put(bean.getMessageId(), bean) != null;
}
-}
+}
\ No newline at end of file
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SequencePropertyBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SequencePropertyBeanMgr.java?rev=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SequencePropertyBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/SequencePropertyBeanMgr.java Thu Sep 22 20:52:54 2005
@@ -25,7 +25,7 @@
import org.apache.axis2.context.AbstractContext;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.RMException;
+import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.beans.SequencePropertyBean;
/**
@@ -36,26 +36,26 @@
private Hashtable table = null;
/**
- *
+ *
*/
public SequencePropertyBeanMgr(AbstractContext context) {
Object obj = context.getProperty(Constants.SEQUENCE_PROPERTY_BEAN_MAP);
- if (obj!=null) {
+ if (obj != null) {
table = (Hashtable) obj;
- }else {
- table = new Hashtable ();
- context.setProperty(Constants.SEQUENCE_PROPERTY_BEAN_MAP,table);
+ } else {
+ table = new Hashtable();
+ context.setProperty(Constants.SEQUENCE_PROPERTY_BEAN_MAP, table);
}
}
public boolean delete(String sequenceId, String name) {
- return table.remove(sequenceId +":" + name) != null;
+ return table.remove(sequenceId + ":" + name) != null;
}
- public SequencePropertyBean retrieve(String sequenceId, String name){
+ public SequencePropertyBean retrieve(String sequenceId, String name) {
return (SequencePropertyBean) table.get(sequenceId + ":" + name);
}
-
+
public boolean insert(SequencePropertyBean bean) {
table.put(bean.getSequenceId() + ":" + bean.getName(), bean);
return true;
@@ -65,22 +65,22 @@
throw new UnsupportedOperationException("selectRS() is not supported");
}
- public Collection find(SequencePropertyBean bean){
+ public Collection find(SequencePropertyBean bean) {
ArrayList beans = new ArrayList();
Iterator iterator = table.values().iterator();
SequencePropertyBean temp;
-
+
while (iterator.hasNext()) {
temp = (SequencePropertyBean) iterator.next();
-
- if ((bean.getSequenceId() != null
- && bean.getSequenceId().equals(temp.getSequenceId()))
- && (bean.getName() != null
- && bean.getName().equals(temp.getName()))
- && (bean.getValue() != null
- && bean.getValue().equals(temp.getValue()))) {
-
- beans.add(temp);
+
+ if ((bean.getSequenceId() != null && bean.getSequenceId().equals(
+ temp.getSequenceId()))
+ && (bean.getName() != null && bean.getName().equals(
+ temp.getName()))
+ && (bean.getValue() != null && bean.getValue().equals(
+ temp.getValue()))) {
+
+ beans.add(temp);
}
}
return beans;
@@ -88,9 +88,9 @@
public boolean update(SequencePropertyBean bean) {
return table.put(getId(bean), bean) != null;
-
+
}
-
+
private String getId(SequencePropertyBean bean) {
return bean.getSequenceId() + ":" + bean.getName();
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/StorageMapBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/StorageMapBeanMgr.java?rev=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/StorageMapBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beanmanagers/StorageMapBeanMgr.java Thu Sep 22 20:52:54 2005
@@ -25,7 +25,7 @@
import org.apache.axis2.context.AbstractContext;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.sandesha2.Constants;
-import org.apache.sandesha2.RMException;
+import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.storage.beans.CreateSeqBean;
import org.apache.sandesha2.storage.beans.StorageMapBean;
@@ -35,28 +35,27 @@
*/
public class StorageMapBeanMgr {
private Hashtable table = null;
-
-
+
/**
- *
+ *
*/
public StorageMapBeanMgr(AbstractContext context) {
Object obj = context.getProperty(Constants.STORAGE_MAP_BEAN_MAP);
- if (obj!=null) {
+ if (obj != null) {
table = (Hashtable) obj;
- }else {
- table = new Hashtable ();
- context.setProperty(Constants.STORAGE_MAP_BEAN_MAP,table);
+ } else {
+ table = new Hashtable();
+ context.setProperty(Constants.STORAGE_MAP_BEAN_MAP, table);
}
}
- public boolean insert(StorageMapBean bean){
+ public boolean insert(StorageMapBean bean) {
table.put(bean.getKey(), bean);
return true;
}
-
+
public boolean delete(String key) {
- return table.remove(key) != null;
+ return table.remove(key) != null;
}
public StorageMapBean retrieve(String key) {
@@ -66,42 +65,41 @@
public ResultSet find(String query) {
throw new UnsupportedOperationException("selectRS() is not implemented");
}
-
+
public Collection find(StorageMapBean bean) {
ArrayList beans = new ArrayList();
Iterator iterator = table.values().iterator();
-
+
StorageMapBean temp = new StorageMapBean();
while (iterator.hasNext()) {
temp = (StorageMapBean) iterator.next();
boolean select = true;
- /*if ((temp.getKey() != null
- && bean.getKey().equals(temp.getKey()))
- && (bean.getMsgNo() != -1
- && bean.getMsgNo() == temp.getMsgNo())
- && (bean.getSequenceId() != null
- && bean.getSequenceId().equals(temp.getSequenceId()))) {
- */
+ /*
+ * if ((temp.getKey() != null &&
+ * bean.getKey().equals(temp.getKey())) && (bean.getMsgNo() != -1 &&
+ * bean.getMsgNo() == temp.getMsgNo()) && (bean.getSequenceId() !=
+ * null && bean.getSequenceId().equals(temp.getSequenceId()))) {
+ */
//}
-
- if (bean.getKey()!=null && !bean.getKey().equals(temp.getKey()))
- select=false;
-
- if (bean.getMsgNo()!=0 && bean.getMsgNo()!=temp.getMsgNo())
- select=false;
-
- if (bean.getSequenceId()!=null && !bean.getSequenceId().equals(temp.getSequenceId()))
- select=false;
-
+ if (bean.getKey() != null && !bean.getKey().equals(temp.getKey()))
+ select = false;
+
+ if (bean.getMsgNo() != 0 && bean.getMsgNo() != temp.getMsgNo())
+ select = false;
+
+ if (bean.getSequenceId() != null
+ && !bean.getSequenceId().equals(temp.getSequenceId()))
+ select = false;
+
if (select)
beans.add(temp);
}
return beans;
}
-
- public boolean update(StorageMapBean bean){
+
+ public boolean update(StorageMapBean bean) {
return table.put(bean.getKey(), bean) != null;
}
-}
+}
\ No newline at end of file
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java?rev=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/CreateSeqBean.java Thu Sep 22 20:52:54 2005
@@ -2,32 +2,49 @@
import java.io.Serializable;
-public class CreateSeqBean implements Serializable{
+public class CreateSeqBean implements Serializable {
+ private String tempSequenceId;
+
private String CreateSeqMsgId;
+
private String SequenceId;
-
+
/**
* @return Returns the createSeqMsgId.
*/
public String getCreateSeqMsgId() {
return CreateSeqMsgId;
}
+
/**
- * @param createSeqMsgId The createSeqMsgId to set.
+ * @param createSeqMsgId
+ * The createSeqMsgId to set.
*/
public void setCreateSeqMsgId(String createSeqMsgId) {
CreateSeqMsgId = createSeqMsgId;
}
+
/**
* @return Returns the sequenceId.
*/
public String getSequenceId() {
return SequenceId;
}
+
/**
- * @param sequenceId The sequenceId to set.
+ * @param sequenceId
+ * The sequenceId to set.
*/
public void setSequenceId(String sequenceId) {
SequenceId = sequenceId;
}
+
+ public String getTempSequenceId() {
+ return tempSequenceId;
+ }
+
+ public void setTempSequenceId(String tempSequenceId) {
+ this.tempSequenceId = tempSequenceId;
+ }
+
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/NextMsgBean.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/NextMsgBean.java?rev=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/NextMsgBean.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/beans/NextMsgBean.java Thu Sep 22 20:52:54 2005
@@ -20,45 +20,49 @@
import java.io.Serializable;
/**
- * @author
- *
+ * @author
*/
public class NextMsgBean implements Serializable {
private String SequenceId;
+
private long NextMsgNoToProcess;
-
-
- public NextMsgBean (){
-
+
+ public NextMsgBean() {
+
}
-
- public NextMsgBean (String sequenceId, long nextNsgNo) {
+
+ public NextMsgBean(String sequenceId, long nextNsgNo) {
this.SequenceId = sequenceId;
this.NextMsgNoToProcess = nextNsgNo;
}
-
+
/**
* @return Returns the nextMsgNoToProcess.
*/
public long getNextMsgNoToProcess() {
return NextMsgNoToProcess;
}
+
/**
- * @param nextMsgNoToProcess The nextMsgNoToProcess to set.
+ * @param nextMsgNoToProcess
+ * The nextMsgNoToProcess to set.
*/
public void setNextMsgNoToProcess(long nextMsgNoToProcess) {
NextMsgNoToProcess = nextMsgNoToProcess;
}
+
/**
* @return Returns the sequenceId.
*/
public String getSequenceId() {
return SequenceId;
}
+
/**
- * @param sequenceId The sequenceId to set.
+ * @param sequenceId
+ * The sequenceId to set.
*/
public void setSequenceId(String sequenceId) {
SequenceId = sequenceId;
}
-}
+}
\ No newline at end of file
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=291067&r1=291066&r2=291067&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 Thu Sep 22 20:52:54 2005
@@ -18,9 +18,8 @@
package org.apache.sandesha2.storage.beans;
/**
- * @author
- *
+ * @author
*/
public interface RMBean {
-}
+}
\ No newline at end of file
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=291067&r1=291066&r2=291067&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 Thu Sep 22 20:52:54 2005
@@ -20,76 +20,98 @@
import java.io.Serializable;
/**
- * @author
- *
+ * @author
*/
public class RetransmitterBean implements Serializable {
private String messageId;
+
private String key;
+
private long LastSentTime;
- private Boolean Send;
- private String CreateSeqMsgId;
-
-
- /**
- * @return Returns the createSeqMsgId.
- */
- public String getCreateSeqMsgId() {
- return CreateSeqMsgId;
+
+ private boolean Send;
+
+ private String tempSequenceId;
+
+ public RetransmitterBean() {
+
}
- /**
- * @param createSeqMsgId The createSeqMsgId to set.
- */
- public void setCreateSeqMsgId(String createSeqMsgId) {
- CreateSeqMsgId = createSeqMsgId;
+
+ public RetransmitterBean(String messageId, String key, long lastSentTime,
+ boolean send, String tempSequenceId) {
+ this.messageId = messageId;
+ this.key = key;
+ this.LastSentTime = lastSentTime;
+ this.Send = send;
+ this.tempSequenceId = tempSequenceId;
}
+
/**
* @return Returns the key.
*/
public String getKey() {
return key;
}
+
/**
- * @param key The key to set.
+ * @param key
+ * The key to set.
*/
public void setKey(String key) {
this.key = key;
}
+
/**
* @return Returns the lastSentTime.
*/
public long getLastSentTime() {
return LastSentTime;
}
+
/**
- * @param lastSentTime The lastSentTime to set.
+ * @param lastSentTime
+ * The lastSentTime to set.
*/
public void setLastSentTime(long lastSentTime) {
LastSentTime = lastSentTime;
}
+
/**
* @return Returns the messageId.
*/
public String getMessageId() {
return messageId;
}
+
/**
- * @param messageId The messageId to set.
+ * @param messageId
+ * The messageId to set.
*/
public void setMessageId(String messageId) {
this.messageId = messageId;
}
+
/**
* @return Returns the send.
*/
- public Boolean isSend() {
+ public boolean isSend() {
return Send;
}
+
/**
- * @param send The send to set.
+ * @param send
+ * The send to set.
*/
- public void setSend(Boolean send) {
+ public void setSend(boolean send) {
this.Send = send;
}
-}
+
+ public String getTempSequenceId() {
+ return tempSequenceId;
+ }
+
+ public void setTempSequenceId(String tempSequenceId) {
+ this.tempSequenceId = tempSequenceId;
+ }
+}
\ No newline at end of file
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=291067&r1=291066&r2=291067&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 Thu Sep 22 20:52:54 2005
@@ -24,17 +24,19 @@
public class SequencePropertyBean implements Serializable {
private String sequenceId;
+
private String name;
+
private Object value;
-
- public SequencePropertyBean (String seqId, String propertyName, Object value) {
+
+ public SequencePropertyBean(String seqId, String propertyName, Object value) {
this.sequenceId = seqId;
this.name = propertyName;
this.value = value;
}
-
- public SequencePropertyBean () {
-
+
+ public SequencePropertyBean() {
+
}
public String getName() {
@@ -60,4 +62,4 @@
public void setValue(Object value) {
this.value = value;
}
-}
+}
\ No newline at end of file
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=291067&r1=291066&r2=291067&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 Thu Sep 22 20:52:54 2005
@@ -20,59 +20,68 @@
import java.io.Serializable;
/**
- * @author
- *
+ * @author
*/
public class StorageMapBean implements Serializable {
private String Key;
+
private long MsgNo;
+
private String sequenceId;
-
-
- public StorageMapBean (){
-
+
+ public StorageMapBean() {
+
}
-
+
public StorageMapBean(String key, long msgNo, String sequenceId) {
this.Key = key;
this.MsgNo = msgNo;
this.sequenceId = sequenceId;
}
+
/**
* @return Returns the key.
*/
public String getKey() {
return Key;
}
+
/**
- * @param key The key to set.
+ * @param key
+ * The key to set.
*/
public void setKey(String key) {
Key = key;
}
+
/**
* @return Returns the msgNo.
*/
public long getMsgNo() {
return MsgNo;
}
+
/**
- * @param msgNo The msgNo to set.
+ * @param msgNo
+ * The msgNo to set.
*/
public void setMsgNo(long msgNo) {
MsgNo = msgNo;
}
+
/**
* @return Returns the sequenceId.
*/
public String getSequenceId() {
return sequenceId;
}
+
/**
- * @param sequenceId The sequenceId to set.
+ * @param sequenceId
+ * The sequenceId to set.
*/
public void setSequenceId(String sequenceId) {
this.sequenceId = sequenceId;
}
-}
+}
\ No newline at end of file
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemBeanMgrFactory.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemBeanMgrFactory.java?rev=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemBeanMgrFactory.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemBeanMgrFactory.java Thu Sep 22 20:52:54 2005
@@ -27,26 +27,21 @@
* @author Chamikara Jayalath <ch...@wso2.com>
* @author Sanka Samaranayake <ss...@gmail.com>
*/
-public class InMemBeanMgrFactory /*extends AbstractBeanMgrFactory*/ {
-/*
- public CreateSeqBeanMgr getCreateSeqBeanMgr() {
- return new InMemCreateSeqBeanMgr();
- }
-
- public NextMsgBeanMgr getNextMsgBeanMgr() {
- return new InMemNextMsgBeanMgr();
- }
-
- public RetransmitterBeanMgr getRetransmitterBeanMgr() {
- return new InMemRetransmitterBeanMgr();
- }
-
- public SequencePropertyBeanMgr getSequencePropretyBeanMgr() {
- return new InMemSequencePropretyBeanMgr();
- }
-
- public StorageMapBeanMgr getStorageMapBeanMgr() {
- return new InMemStorageMapBeanMgr();
- }
- */
-}
+public class InMemBeanMgrFactory /* extends AbstractBeanMgrFactory */{
+ /*
+ * public CreateSeqBeanMgr getCreateSeqBeanMgr() { return new
+ * InMemCreateSeqBeanMgr(); }
+ *
+ * public NextMsgBeanMgr getNextMsgBeanMgr() { return new
+ * InMemNextMsgBeanMgr(); }
+ *
+ * public RetransmitterBeanMgr getRetransmitterBeanMgr() { return new
+ * InMemRetransmitterBeanMgr(); }
+ *
+ * public SequencePropertyBeanMgr getSequencePropretyBeanMgr() { return new
+ * InMemSequencePropretyBeanMgr(); }
+ *
+ * public StorageMapBeanMgr getStorageMapBeanMgr() { return new
+ * InMemStorageMapBeanMgr(); }
+ */
+}
\ No newline at end of file
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemCreateSeqBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemCreateSeqBeanMgr.java?rev=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemCreateSeqBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemCreateSeqBeanMgr.java Thu Sep 22 20:52:54 2005
@@ -30,53 +30,37 @@
* @author Sanka Samaranayake <ss...@gmail.com>
*/
-public class InMemCreateSeqBeanMgr /*implements CreateSeqBeanMgr */ {
-
- /*
- private static Hashtable table = new Hashtable();
-
-
- public InMemCreateSeqBeanMgr() {
- }
-
- public boolean insert(CreateSeqBean bean) {
- table.put(bean.getCreateSeqMsgId(), bean);
- return true;
- }
-
- public boolean delete(String msgId) {
- return table.remove(msgId) != null;
- }
+public class InMemCreateSeqBeanMgr /* implements CreateSeqBeanMgr */{
- public CreateSeqBean retrieve(String msgId) {
- return (CreateSeqBean) table.get(msgId);
- }
-
- public boolean update(CreateSeqBean bean) {
- return table.put(bean.getCreateSeqMsgId(), bean) != null;
- }
-
- public Collection find(CreateSeqBean bean) {
- ArrayList beans = new ArrayList();
- Iterator iterator = table.values().iterator();
-
- CreateSeqBean temp;
- while (iterator.hasNext()) {
- temp = (CreateSeqBean) iterator.next();
- if ( (bean.getCreateSeqMsgId() != null
- && bean.getCreateSeqMsgId().equals(temp.getCreateSeqMsgId()))
- && (bean.getSequenceId() != null
- && bean.getSequenceId().equals(bean.getSequenceId()))) {
- beans.add(temp);
-
- }
- }
- return beans;
- }
-
- public ResultSet find(String query) {
- throw new UnsupportedOperationException("selectRS() is not supported");
- }
- */
+ /*
+ * private static Hashtable table = new Hashtable();
+ *
+ *
+ * public InMemCreateSeqBeanMgr() { }
+ *
+ * public boolean insert(CreateSeqBean bean) {
+ * table.put(bean.getCreateSeqMsgId(), bean); return true; }
+ *
+ * public boolean delete(String msgId) { return table.remove(msgId) != null; }
+ *
+ * public CreateSeqBean retrieve(String msgId) { return (CreateSeqBean)
+ * table.get(msgId); }
+ *
+ * public boolean update(CreateSeqBean bean) { return
+ * table.put(bean.getCreateSeqMsgId(), bean) != null; }
+ *
+ * public Collection find(CreateSeqBean bean) { ArrayList beans = new
+ * ArrayList(); Iterator iterator = table.values().iterator();
+ *
+ * CreateSeqBean temp; while (iterator.hasNext()) { temp = (CreateSeqBean)
+ * iterator.next(); if ( (bean.getCreateSeqMsgId() != null &&
+ * bean.getCreateSeqMsgId().equals(temp.getCreateSeqMsgId())) &&
+ * (bean.getSequenceId() != null &&
+ * bean.getSequenceId().equals(bean.getSequenceId()))) { beans.add(temp);
+ * } } return beans; }
+ *
+ * public ResultSet find(String query) { throw new
+ * UnsupportedOperationException("selectRS() is not supported"); }
+ */
-}
+}
\ No newline at end of file
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemNextMsgBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemNextMsgBeanMgr.java?rev=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemNextMsgBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemNextMsgBeanMgr.java Thu Sep 22 20:52:54 2005
@@ -25,63 +25,45 @@
import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
import org.apache.sandesha2.storage.beans.NextMsgBean;
-
/**
* @author Chamikara Jayalath <ch...@wso2.com>
* @author Sanka Samaranayake <ss...@gmail.com>
*/
-public class InMemNextMsgBeanMgr /*implements NextMsgBeanMgr*/ {
-/*
- private static Hashtable table = new Hashtable();
-
- public InMemNextMsgBeanMgr() {
- }
-
- public boolean delete(String sequenceId) {
- return table.remove(sequenceId) != null;
- }
-
- public NextMsgBean retrieve(String sequenceId) {
- return (NextMsgBean) table.get(sequenceId);
- }
-
- public boolean insert(NextMsgBean bean) {
- table.put(bean.getSequenceId(), bean);
- return true;
- }
-
- public ResultSet find(String query) {
- throw new UnsupportedOperationException("selectRS() is not supported");
- }
-
- public Collection find(NextMsgBean bean) {
- ArrayList beans = new ArrayList();
- Iterator iterator = table.values().iterator();
-
- NextMsgBean temp;
- while (iterator.hasNext()) {
- temp = (NextMsgBean) iterator.next();
-
- if ((bean.getSequenceId() != null
- && bean.getSequenceId().equals(temp.getSequenceId()))
-
- && (bean.getNextMsgNoToProcess() > 0)
- ) {
-
- beans.add(temp);
- }
-
- }
- return beans;
- }
-
- public boolean update(NextMsgBean bean) {
- return table.put(bean.getSequenceId(), bean) != null ;
- }
-
-
- public Collection retrieveAll() {
- return table.values();
- }
- */
-}
+public class InMemNextMsgBeanMgr /* implements NextMsgBeanMgr */{
+ /*
+ * private static Hashtable table = new Hashtable();
+ *
+ * public InMemNextMsgBeanMgr() { }
+ *
+ * public boolean delete(String sequenceId) { return
+ * table.remove(sequenceId) != null; }
+ *
+ * public NextMsgBean retrieve(String sequenceId) { return (NextMsgBean)
+ * table.get(sequenceId); }
+ *
+ * public boolean insert(NextMsgBean bean) { table.put(bean.getSequenceId(),
+ * bean); return true; }
+ *
+ * public ResultSet find(String query) { throw new
+ * UnsupportedOperationException("selectRS() is not supported"); }
+ *
+ * public Collection find(NextMsgBean bean) { ArrayList beans = new
+ * ArrayList(); Iterator iterator = table.values().iterator();
+ *
+ * NextMsgBean temp; while (iterator.hasNext()) { temp = (NextMsgBean)
+ * iterator.next();
+ *
+ * if ((bean.getSequenceId() != null &&
+ * bean.getSequenceId().equals(temp.getSequenceId()))
+ * && (bean.getNextMsgNoToProcess() > 0) ) {
+ *
+ * beans.add(temp); }
+ * } return beans; }
+ *
+ * public boolean update(NextMsgBean bean) { return
+ * table.put(bean.getSequenceId(), bean) != null ; }
+ *
+ *
+ * public Collection retrieveAll() { return table.values(); }
+ */
+}
\ No newline at end of file
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemRetransmitterBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemRetransmitterBeanMgr.java?rev=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemRetransmitterBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemRetransmitterBeanMgr.java Thu Sep 22 20:52:54 2005
@@ -29,59 +29,45 @@
* @author Chamikara Jayalath <ch...@wso2.com>
* @author Sanka Samaranayake <ss...@gmail.com>
*/
-public class InMemRetransmitterBeanMgr /*implements RetransmitterBeanMgr*/ {
-
- /*
- private static Hashtable table = new Hashtable();
-
-
- public InMemRetransmitterBeanMgr() {
- }
-
- public boolean delete(String MessageId) {
- return table.remove(MessageId) != null;
- }
-
- public RetransmitterBean retrieve(String MessageId) {
- return (RetransmitterBean) table.get(MessageId);
- }
-
- public boolean insert(RetransmitterBean bean) {
- table.put(bean.getMessageId(), bean);
- return true;
- }
+public class InMemRetransmitterBeanMgr /* implements RetransmitterBeanMgr */{
- public ResultSet find(String query) {
- throw new UnsupportedOperationException("selectRS() is not supported");
- }
-
- public Collection find(RetransmitterBean bean) {
- ArrayList beans = new ArrayList();
- Iterator iterator = table.values().iterator();
-
- RetransmitterBean temp;
- while (iterator.hasNext()) {
- temp = (RetransmitterBean) iterator.next();
- if (!(bean.getMessageId() != null
- && bean.getMessageId().equals(temp.getMessageId()))
- && (bean.getCreateSeqMsgId() != null
- && bean.getCreateSeqMsgId().equals(temp.getCreateSeqMsgId()))
- && (bean.getKey() != null
- && bean.getKey().equals(temp.getKey()))
- && (bean.getLastSentTime() != -1
- && bean.getLastSentTime() == temp.getLastSentTime())){
-
- beans.add(temp);
- }
- }
-
- return beans;
- }
-
- public boolean update(RetransmitterBean bean) {
- return table.put(bean.getMessageId(), bean) != null;
- }
-
- */
+ /*
+ * private static Hashtable table = new Hashtable();
+ *
+ *
+ * public InMemRetransmitterBeanMgr() { }
+ *
+ * public boolean delete(String MessageId) { return table.remove(MessageId) !=
+ * null; }
+ *
+ * public RetransmitterBean retrieve(String MessageId) { return
+ * (RetransmitterBean) table.get(MessageId); }
+ *
+ * public boolean insert(RetransmitterBean bean) {
+ * table.put(bean.getMessageId(), bean); return true; }
+ *
+ * public ResultSet find(String query) { throw new
+ * UnsupportedOperationException("selectRS() is not supported"); }
+ *
+ * public Collection find(RetransmitterBean bean) { ArrayList beans = new
+ * ArrayList(); Iterator iterator = table.values().iterator();
+ *
+ * RetransmitterBean temp; while (iterator.hasNext()) { temp =
+ * (RetransmitterBean) iterator.next(); if (!(bean.getMessageId() != null &&
+ * bean.getMessageId().equals(temp.getMessageId())) &&
+ * (bean.getCreateSeqMsgId() != null &&
+ * bean.getCreateSeqMsgId().equals(temp.getCreateSeqMsgId())) &&
+ * (bean.getKey() != null && bean.getKey().equals(temp.getKey())) &&
+ * (bean.getLastSentTime() != -1 && bean.getLastSentTime() ==
+ * temp.getLastSentTime())){
+ *
+ * beans.add(temp); } }
+ *
+ * return beans; }
+ *
+ * public boolean update(RetransmitterBean bean) { return
+ * table.put(bean.getMessageId(), bean) != null; }
+ *
+ */
-}
+}
\ No newline at end of file
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemSequencePropretyBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemSequencePropretyBeanMgr.java?rev=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemSequencePropretyBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemSequencePropretyBeanMgr.java Thu Sep 22 20:52:54 2005
@@ -29,59 +29,45 @@
* @author Chamikara Jayalath <ch...@wso2.com>
* @author Sanka Samaranayake <ss...@gmail.com>
*/
-public class InMemSequencePropretyBeanMgr /*implements SequencePropertyBeanMgr */{
+public class InMemSequencePropretyBeanMgr /* implements SequencePropertyBeanMgr */{
/*
- private static Hashtable table = new Hashtable();
-
- public InMemSequencePropretyBeanMgr() {
- }
-
- public boolean delete(String sequenceId, String name) {
- return table.remove(sequenceId +":" + name) != null;
- }
-
- public SequencePropertyBean retrieve(String sequenceId, String name) {
- return (SequencePropertyBean) table.get(sequenceId + ":" + name);
- }
-
- public boolean insert(SequencePropertyBean bean) {
- table.put(bean.getSequenceId() + ":" + bean.getName(), bean);
- return true;
- }
-
- public ResultSet find(String query) {
- throw new UnsupportedOperationException("selectRS() is not supported");
- }
-
- public Collection find(SequencePropertyBean bean) {
- ArrayList beans = new ArrayList();
- Iterator iterator = table.values().iterator();
- SequencePropertyBean temp;
-
- while (iterator.hasNext()) {
- temp = (SequencePropertyBean) iterator.next();
-
- if ((bean.getSequenceId() != null
- && bean.getSequenceId().equals(temp.getSequenceId()))
- && (bean.getName() != null
- && bean.getName().equals(temp.getName()))
- && (bean.getValue() != null
- && bean.getValue().equals(temp.getValue()))) {
-
- beans.add(temp);
- }
- }
- return beans;
- }
-
- public boolean update(SequencePropertyBean bean) {
- return table.put(getId(bean), bean) != null;
-
- }
-
- private String getId(SequencePropertyBean bean) {
- return bean.getSequenceId() + ":" + bean.getName();
- }
- */
+ * private static Hashtable table = new Hashtable();
+ *
+ * public InMemSequencePropretyBeanMgr() { }
+ *
+ * public boolean delete(String sequenceId, String name) { return
+ * table.remove(sequenceId +":" + name) != null; }
+ *
+ * public SequencePropertyBean retrieve(String sequenceId, String name) {
+ * return (SequencePropertyBean) table.get(sequenceId + ":" + name); }
+ *
+ * public boolean insert(SequencePropertyBean bean) {
+ * table.put(bean.getSequenceId() + ":" + bean.getName(), bean); return
+ * true; }
+ *
+ * public ResultSet find(String query) { throw new
+ * UnsupportedOperationException("selectRS() is not supported"); }
+ *
+ * public Collection find(SequencePropertyBean bean) { ArrayList beans = new
+ * ArrayList(); Iterator iterator = table.values().iterator();
+ * SequencePropertyBean temp;
+ *
+ * while (iterator.hasNext()) { temp = (SequencePropertyBean)
+ * iterator.next();
+ *
+ * if ((bean.getSequenceId() != null &&
+ * bean.getSequenceId().equals(temp.getSequenceId())) && (bean.getName() !=
+ * null && bean.getName().equals(temp.getName())) && (bean.getValue() !=
+ * null && bean.getValue().equals(temp.getValue()))) {
+ *
+ * beans.add(temp); } } return beans; }
+ *
+ * public boolean update(SequencePropertyBean bean) { return
+ * table.put(getId(bean), bean) != null;
+ * }
+ *
+ * private String getId(SequencePropertyBean bean) { return
+ * bean.getSequenceId() + ":" + bean.getName(); }
+ */
}
Modified: webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemStorageMapBeanMgr.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemStorageMapBeanMgr.java?rev=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemStorageMapBeanMgr.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemStorageMapBeanMgr.java Thu Sep 22 20:52:54 2005
@@ -30,61 +30,45 @@
* @author Chamikara Jayalath <ch...@wso2.com>
* @author Sanka Samaranayake <ss...@gmail.com>
*/
-public class InMemStorageMapBeanMgr /*implements StorageMapBeanMgr */ {
-
- /*
- private static Hashtable table = new Hashtable();
-
-
- public InMemStorageMapBeanMgr() {
- }
-
- public boolean insert(StorageMapBean bean) {
- table.put(bean.getKey(), bean);
- return true;
- }
-
- public boolean delete(String key) {
- return table.remove(key) != null;
- }
+public class InMemStorageMapBeanMgr /* implements StorageMapBeanMgr */{
- public StorageMapBean retrieve(String key) {
- return (StorageMapBean) table.get(key);
- }
-
- public ResultSet find(String query) {
- throw new UnsupportedOperationException("selectRS() is not implemented");
- }
-
- public Collection find(StorageMapBean bean) {
- ArrayList beans = new ArrayList();
- Iterator iterator = table.values().iterator();
-
- StorageMapBean temp = new StorageMapBean();
- while (iterator.hasNext()) {
- temp = (StorageMapBean) iterator.next();
- boolean select = true;
-
- //}
-
- if (bean.getKey()!=null && !bean.getKey().equals(temp.getKey()))
- select=false;
-
- if (bean.getMsgNo()!=0 && bean.getMsgNo()!=temp.getMsgNo())
- select=false;
-
- if (bean.getSequenceId()!=null && !bean.getSequenceId().equals(temp.getSequenceId()))
- select=false;
-
- if (select)
- beans.add(temp);
- }
- return beans;
- }
-
- public boolean update(StorageMapBean bean) {
- return table.put(bean.getKey(), bean) != null;
- }
- */
+ /*
+ * private static Hashtable table = new Hashtable();
+ *
+ *
+ * public InMemStorageMapBeanMgr() { }
+ *
+ * public boolean insert(StorageMapBean bean) { table.put(bean.getKey(),
+ * bean); return true; }
+ *
+ * public boolean delete(String key) { return table.remove(key) != null; }
+ *
+ * public StorageMapBean retrieve(String key) { return (StorageMapBean)
+ * table.get(key); }
+ *
+ * public ResultSet find(String query) { throw new
+ * UnsupportedOperationException("selectRS() is not implemented"); }
+ *
+ * public Collection find(StorageMapBean bean) { ArrayList beans = new
+ * ArrayList(); Iterator iterator = table.values().iterator();
+ *
+ * StorageMapBean temp = new StorageMapBean(); while (iterator.hasNext()) {
+ * temp = (StorageMapBean) iterator.next(); boolean select = true;
+ *
+ * //}
+ *
+ * if (bean.getKey()!=null && !bean.getKey().equals(temp.getKey()))
+ * select=false;
+ *
+ * if (bean.getMsgNo()!=0 && bean.getMsgNo()!=temp.getMsgNo()) select=false;
+ *
+ * if (bean.getSequenceId()!=null &&
+ * !bean.getSequenceId().equals(temp.getSequenceId())) select=false;
+ *
+ * if (select) beans.add(temp); } return beans; }
+ *
+ * public boolean update(StorageMapBean bean) { return
+ * table.put(bean.getKey(), bean) != null; }
+ */
-}
+}
\ 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=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/SandeshaUtil.java Thu Sep 22 20:52:54 2005
@@ -21,9 +21,11 @@
import java.util.Hashtable;
import java.util.StringTokenizer;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.om.impl.MIMEOutputUtils;
import org.apache.axis2.util.UUIDGenerator;
+import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.wsrm.AcknowledgementRange;
/**
@@ -33,72 +35,72 @@
public class SandeshaUtil {
- private static Hashtable storedMsgContexts = new Hashtable ();
-
- public static String getUUID () {
+ private static Hashtable storedMsgContexts = new Hashtable();
+
+ public static String getUUID() {
String uuid = "uuid:" + UUIDGenerator.getUUID();
return uuid;
}
-
- public static AcknowledgementRange[] getAckRangeArray (String msgNoStr) {
+
+ public static AcknowledgementRange[] getAckRangeArray(String msgNoStr) {
String[] msgNoStrs = msgNoStr.split(",");
- long[] msgNos = getLongArr (msgNoStrs);
-
- long[] sortedMsgNos = sort (msgNos);
-
+ long[] msgNos = getLongArr(msgNoStrs);
+
+ long[] sortedMsgNos = sort(msgNos);
+
int length = sortedMsgNos.length;
- if (length==0)
+ if (length == 0)
return null;
- //for (int i=0;i<length;i++)
+ //for (int i=0;i<length;i++)
// System.out.println (sortedMsgNos[i]);
-
+
ArrayList ackRanges = new ArrayList();
// upper = 0;
long lower = sortedMsgNos[0];
//long max = sortedMsgNos[sortedMsgNos.length];
long temp = sortedMsgNos[0];
-
- for (long i=1;i<length;i++) {
+
+ for (long i = 1; i < length; i++) {
int intI = (int) i;
- if ((sortedMsgNos[intI]==(temp+1)) || (sortedMsgNos[intI]==(temp))) {
+ if ((sortedMsgNos[intI] == (temp + 1))
+ || (sortedMsgNos[intI] == (temp))) {
temp = sortedMsgNos[intI];
continue;
}
-
-
- AcknowledgementRange ackRange = new AcknowledgementRange ();
+
+ AcknowledgementRange ackRange = new AcknowledgementRange();
ackRange.setLowerValue(lower);
ackRange.setUpperValue(temp);
ackRanges.add(ackRange);
-
+
lower = sortedMsgNos[intI];
temp = sortedMsgNos[intI];
-
+
}
-
- AcknowledgementRange ackRange = new AcknowledgementRange ();
+
+ AcknowledgementRange ackRange = new AcknowledgementRange();
ackRange.setLowerValue(lower);
ackRange.setUpperValue(temp);
ackRanges.add(ackRange);
-
+
Object[] objs = ackRanges.toArray();
int l = objs.length;
- AcknowledgementRange[] ackRangeArr = new AcknowledgementRange [l];
- for (int i=0;i<l;i++)
+ AcknowledgementRange[] ackRangeArr = new AcknowledgementRange[l];
+ for (int i = 0; i < l; i++)
ackRangeArr[i] = (AcknowledgementRange) objs[i];
-
+
return ackRangeArr;
}
-// TODO remove int from folowing methods. (to make them truly Long :) )
-
-
+
+ // TODO remove int from folowing methods. (to make them truly Long :) )
+
private static long[] sort(long[] input) {
int length = input.length;
-
+
long temp = 0;
- for (int i=0;i<length;i++) {
+ for (int i = 0; i < length; i++) {
temp = 0;
- for (int j=i;j<length;j++) {
+ for (int j = i; j < length; j++) {
if (input[j] < input[i]) {
//swap
temp = input[i];
@@ -107,40 +109,37 @@
}
}
}
-
+
return input;
}
-
-
-
+
private static long[] getLongArr(String[] strings) {
int length = strings.length;
long[] longs = new long[length];
- for (int i=0;i<length;i++) {
+ for (int i = 0; i < length; i++) {
longs[i] = Long.parseLong(strings[i]);
}
-
+
return longs;
}
-
-
-
- public static String storeMessageContext (MessageContext ctx) throws Exception {
- if (ctx==null)
- throw new Exception ("Stored Msg Ctx is null");
-
+
+ public static String storeMessageContext(MessageContext ctx)
+ throws SandeshaException {
+ if (ctx == null)
+ throw new SandeshaException("Stored Msg Ctx is null");
+
String key = getUUID();
- storedMsgContexts.put(key,ctx);
+ storedMsgContexts.put(key, ctx);
return key;
}
-
- public static MessageContext getStoredMessageContext (String key) {
+
+ public static MessageContext getStoredMessageContext(String key) {
return (MessageContext) storedMsgContexts.get(key);
}
-
-// public static void main (String[] args) {
-// String msgList = "13,2,6,4,4,1,999,12,3";
-// getAckRangeArray( msgList);
-//
-// }
-}
+
+ // public static void main (String[] args) {
+ // String msgList = "13,2,6,4,4,1,999,12,3";
+ // getAckRangeArray( msgList);
+ //
+ // }
+}
\ No newline at end of file
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=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Accept.java Thu Sep 22 20:52:54 2005
@@ -37,56 +37,66 @@
public class Accept implements IOMRMElement {
private OMElement acceptElement;
+
private AcksTo acksTo;
-
- OMNamespace rmNamespace =
- SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMNamespace(Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
-
- public Accept(){
- acceptElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSRM.ACCEPT,rmNamespace);
+
+ OMNamespace rmNamespace = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMNamespace(
+ Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+
+ public Accept() {
+ acceptElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.ACCEPT, rmNamespace);
}
+
public OMElement getOMElement() throws OMException {
return acceptElement;
}
-
+
public Object fromOMElement(OMElement element) throws OMException {
-
- OMElement acceptPart = element.getFirstChildWithName(
- new QName (Constants.WSRM.NS_URI_RM,Constants.WSRM.ACCEPT));
- if (acceptPart==null)
- throw new OMException ("Passed element does not contain an Accept part");
-
+
+ OMElement acceptPart = element.getFirstChildWithName(new QName(
+ Constants.WSRM.NS_URI_RM, Constants.WSRM.ACCEPT));
+ if (acceptPart == null)
+ throw new OMException(
+ "Passed element does not contain an Accept part");
+
acksTo = new AcksTo();
acksTo.fromOMElement(acceptPart);
-
- acceptElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSRM.ACCEPT,rmNamespace);
-
+
+ acceptElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.ACCEPT, rmNamespace);
+
return this;
}
public OMElement toOMElement(OMElement element) throws OMException {
- if (acceptElement==null)
- throw new OMException ("Cant add Accept part since the internal element is null");
-
- if (acksTo==null)
- throw new OMException ("Cant add Accept part since AcksTo object is null");
-
+ if (acceptElement == null)
+ throw new OMException(
+ "Cant add Accept part since the internal element is null");
+
+ if (acksTo == null)
+ throw new OMException(
+ "Cant add Accept part since AcksTo object is null");
+
acksTo.toOMElement(acceptElement);
element.addChild(acceptElement);
-
- acceptElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSRM.ACCEPT,rmNamespace);
-
+
+ acceptElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.ACCEPT, rmNamespace);
+
return element;
}
-
- public void setAcksTo(AcksTo acksTo){
+
+ public void setAcksTo(AcksTo acksTo) {
this.acksTo = acksTo;
}
- public AcksTo getAcksTo(){
+
+ public AcksTo getAcksTo() {
return acksTo;
}
-}
+}
\ No newline at end of file
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=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AckRequested.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AckRequested.java Thu Sep 22 20:52:54 2005
@@ -36,94 +36,103 @@
public class AckRequested implements IOMRMPart {
private OMElement ackRequestedElement;
+
private Identifier identifier;
+
private MessageNumber messageNumber;
-
- OMNamespace rmNamespace =
- SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMNamespace(Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
-
- public AckRequested(){
- ackRequestedElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSRM.ACK_REQUESTED,rmNamespace);
+
+ OMNamespace rmNamespace = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMNamespace(
+ Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+
+ public AckRequested() {
+ ackRequestedElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.ACK_REQUESTED, rmNamespace);
}
-
+
public OMElement getOMElement() throws OMException {
return ackRequestedElement;
}
public Object fromOMElement(OMElement header) throws OMException {
-
- if (header==null || !(header instanceof SOAPHeader))
- throw new OMException ("Cant add the Ack Requested part to a non-header element");
-
- OMElement ackReqPart = header.getFirstChildWithName
- (new QName (Constants.WSRM.NS_URI_RM,Constants.WSRM.ACK_REQUESTED));
-
- if (ackReqPart==null)
- throw new OMException ("the passed element does not contain an ack requested part");
-
+
+ if (header == null || !(header instanceof SOAPHeader))
+ throw new OMException(
+ "Cant add the Ack Requested part to a non-header element");
+
+ OMElement ackReqPart = header.getFirstChildWithName(new QName(
+ Constants.WSRM.NS_URI_RM, Constants.WSRM.ACK_REQUESTED));
+
+ if (ackReqPart == null)
+ throw new OMException(
+ "the passed element does not contain an ack requested part");
+
identifier = new Identifier();
identifier.fromOMElement(ackReqPart);
-
- OMElement msgNoPart = ackReqPart.getFirstChildWithName
- (new QName (Constants.WSRM.NS_URI_RM,Constants.WSRM.MSG_NUMBER));
-
- if (msgNoPart!=null){
+
+ OMElement msgNoPart = ackReqPart.getFirstChildWithName(new QName(
+ Constants.WSRM.NS_URI_RM, Constants.WSRM.MSG_NUMBER));
+
+ if (msgNoPart != null) {
messageNumber = new MessageNumber();
messageNumber.fromOMElement(ackReqPart);
}
-
- ackRequestedElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSRM.ACK_REQUESTED,rmNamespace);
-
+
+ ackRequestedElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.ACK_REQUESTED, rmNamespace);
+
return this;
}
public OMElement toOMElement(OMElement header) throws OMException {
- if (header==null || !(header instanceof SOAPHeader))
- throw new OMException ("Cant add the Ack Requested part to a non-header element");
+ if (header == null || !(header instanceof SOAPHeader))
+ throw new OMException(
+ "Cant add the Ack Requested part to a non-header element");
+
+ if (identifier == null)
+ throw new OMException(
+ "Cant add ack Req block since the identifier is null");
- if( identifier == null)
- throw new OMException ("Cant add ack Req block since the identifier is null");
-
SOAPHeader SOAPHdr = (SOAPHeader) header;
SOAPHeaderBlock ackReqHdrBlock = SOAPHdr.addHeaderBlock(
- Constants.WSRM.ACK_REQUESTED,rmNamespace);
+ Constants.WSRM.ACK_REQUESTED, rmNamespace);
ackReqHdrBlock.setMustUnderstand(true);
-
+
identifier.toOMElement(ackReqHdrBlock);
- if ( messageNumber != null){
+ if (messageNumber != null) {
messageNumber.toOMElement(ackReqHdrBlock);
}
-
- ackRequestedElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSRM.ACK_REQUESTED,rmNamespace);
-
+
+ ackRequestedElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.ACK_REQUESTED, rmNamespace);
+
return header;
}
-
- public void setIdentifier(Identifier identifier){
+
+ public void setIdentifier(Identifier identifier) {
this.identifier = identifier;
}
-
- public void setMessageNumber(MessageNumber messageNumber){
+
+ public void setMessageNumber(MessageNumber messageNumber) {
this.messageNumber = messageNumber;
}
-
- public Identifier getIdentifier(){
+
+ public Identifier getIdentifier() {
return identifier;
}
-
- public MessageNumber getMessageNumber(){
+
+ public MessageNumber getMessageNumber() {
return messageNumber;
}
-
+
public void toSOAPEnvelope(SOAPEnvelope envelope) {
SOAPHeader header = envelope.getHeader();
toOMElement(header);
}
-
-}
+}
\ No newline at end of file
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=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcknowledgementRange.java Thu Sep 22 20:52:54 2005
@@ -41,74 +41,91 @@
public class AcknowledgementRange implements IOMRMElement {
private OMElement acknowledgementRangeElement;
+
private long upperValue;
+
private long lowerValue;
-
- OMNamespace rmNamespace =
- SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMNamespace(Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
-
- public AcknowledgementRange(){
- acknowledgementRangeElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSRM.ACK_RANGE,rmNamespace);
+
+ OMNamespace rmNamespace = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMNamespace(
+ Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+
+ public AcknowledgementRange() {
+ acknowledgementRangeElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.ACK_RANGE, rmNamespace);
}
-
+
public OMElement getOMElement() throws OMException {
return acknowledgementRangeElement;
}
-
- public Object fromOMElement(OMElement ackRangePart) throws OMException{
-
- /*OMElement ackRangePart = sequenceAckElement.getFirstChildWithName(
- new QName (Constants.WSRM.NS_URI_RM,Constants.WSRM.ACK_RANGE)); */
-
- if (ackRangePart==null)
- throw new OMException ("The passed element is null");
-
- OMAttribute lowerAttrib = ackRangePart.getAttribute(new QName (Constants.WSRM.LOWER));
- OMAttribute upperAttrib = ackRangePart.getAttribute(new QName (Constants.WSRM.UPPER));
-
- if (lowerAttrib==null || upperAttrib==null)
- throw new OMException ("Passed element does not contain upper or lower attributes");
-
- try{
+
+ public Object fromOMElement(OMElement ackRangePart) throws OMException {
+
+ /*
+ * OMElement ackRangePart = sequenceAckElement.getFirstChildWithName(
+ * new QName (Constants.WSRM.NS_URI_RM,Constants.WSRM.ACK_RANGE));
+ */
+
+ if (ackRangePart == null)
+ throw new OMException("The passed element is null");
+
+ OMAttribute lowerAttrib = ackRangePart.getAttribute(new QName(
+ Constants.WSRM.LOWER));
+ OMAttribute upperAttrib = ackRangePart.getAttribute(new QName(
+ Constants.WSRM.UPPER));
+
+ if (lowerAttrib == null || upperAttrib == null)
+ throw new OMException(
+ "Passed element does not contain upper or lower attributes");
+
+ try {
long lower = Long.parseLong(lowerAttrib.getValue());
long upper = Long.parseLong(upperAttrib.getValue());
upperValue = upper;
lowerValue = lower;
- }catch (Exception ex) {
- throw new OMException ("The ack range does not have proper long values for Upper and Lower attributes");
+ } catch (Exception ex) {
+ throw new OMException(
+ "The ack range does not have proper long values for Upper and Lower attributes");
}
-
- acknowledgementRangeElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSRM.ACK_RANGE,rmNamespace);
-
+
+ acknowledgementRangeElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.ACK_RANGE, rmNamespace);
+
return this;
- }
+ }
- public OMElement toOMElement(OMElement sequenceAckElement) throws OMException {
+ public OMElement toOMElement(OMElement sequenceAckElement)
+ throws OMException {
+
+ if (sequenceAckElement == null)
+ throw new OMException(
+ "Cant set Ack Range part since element is null");
+
+ if (upperValue <= 0 || lowerValue <= 0 || lowerValue > upperValue)
+ throw new OMException(
+ "Cant set Ack Range part since Upper or Lower is not set to the correct value");
+
+ OMAttribute lowerAttrib = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMAttribute(
+ Constants.WSRM.LOWER, rmNamespace, Long.toString(lowerValue));
+ OMAttribute upperAttrib = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMAttribute(
+ Constants.WSRM.UPPER, rmNamespace, Long.toString(upperValue));
- if (sequenceAckElement==null)
- throw new OMException ("Cant set Ack Range part since element is null");
-
- if (upperValue<=0 || lowerValue<=0 || lowerValue>upperValue)
- throw new OMException ("Cant set Ack Range part since Upper or Lower is not set to the correct value");
-
- OMAttribute lowerAttrib = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMAttribute(
- Constants.WSRM.LOWER,rmNamespace,Long.toString(lowerValue));
- OMAttribute upperAttrib = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMAttribute(
- Constants.WSRM.UPPER,rmNamespace,Long.toString(upperValue));
-
acknowledgementRangeElement.addAttribute(lowerAttrib);
acknowledgementRangeElement.addAttribute(upperAttrib);
-
+
sequenceAckElement.addChild(acknowledgementRangeElement);
-
- acknowledgementRangeElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSRM.ACK_RANGE,rmNamespace);
-
+
+ acknowledgementRangeElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.ACK_RANGE, rmNamespace);
+
return sequenceAckElement;
}
-
+
public long getLowerValue() {
return lowerValue;
}
@@ -124,4 +141,4 @@
public void setUpperValue(long upperValue) {
this.upperValue = upperValue;
}
-}
+}
\ No newline at end of file
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=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/AcksTo.java Thu Sep 22 20:52:54 2005
@@ -39,58 +39,67 @@
* @author sanka
*/
-public class AcksTo implements IOMRMElement{
-
+public class AcksTo implements IOMRMElement {
+
private Address address;
+
private OMElement acksToElement;
+
//private OMElement addressElement;
-
- OMNamespace rmNamespace =
- SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMNamespace(
- Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
-
- public AcksTo(){
- acksToElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSRM.ACKS_TO,rmNamespace);
+
+ OMNamespace rmNamespace = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMNamespace(
+ Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+
+ public AcksTo() {
+ acksToElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.ACKS_TO, rmNamespace);
}
+ public AcksTo (Address address) {
+ this ();
+ this.address = address;
+ }
+
public OMElement getOMElement() throws OMException {
return acksToElement;
}
-
+
public Object fromOMElement(OMElement element) throws OMException {
- OMElement acksToPart = element.getFirstChildWithName( new QName (
- Constants.WSRM.NS_URI_RM,Constants.WSRM.ACKS_TO));
-
-
-
- if (acksToPart==null)
- throw new OMException ("Passed element does not contain an acksTo part");
-
- address = new Address ();
+ OMElement acksToPart = element.getFirstChildWithName(new QName(
+ Constants.WSRM.NS_URI_RM, Constants.WSRM.ACKS_TO));
+
+ if (acksToPart == null)
+ throw new OMException(
+ "Passed element does not contain an acksTo part");
+
+ address = new Address();
address.fromOMElement(acksToPart);
-
- acksToElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSRM.ACKS_TO,rmNamespace);
-
+
+ acksToElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.ACKS_TO, rmNamespace);
+
return this;
}
-
+
public OMElement toOMElement(OMElement element) throws OMException {
-
- if (acksToElement==null)
- throw new OMException ("Cant set AcksTo. AcksTo element is null");
- if (address==null)
- throw new OMException ("Cant set AcksTo. Address is null");
-
- OMElement acksToPart = element.getFirstChildWithName(
- new QName (Constants.WSA.NS_URI_ADDRESSING,Constants.WSRM.ACKS_TO));
-
+
+ if (acksToElement == null)
+ throw new OMException("Cant set AcksTo. AcksTo element is null");
+ if (address == null)
+ throw new OMException("Cant set AcksTo. Address is null");
+
+ OMElement acksToPart = element.getFirstChildWithName(new QName(
+ Constants.WSA.NS_URI_ADDRESSING, Constants.WSRM.ACKS_TO));
+
address.toOMElement(acksToElement);
element.addChild(acksToElement);
-
- acksToElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSRM.ACKS_TO,rmNamespace);
+
+ acksToElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.ACKS_TO, rmNamespace);
return element;
}
@@ -102,4 +111,4 @@
public void setAddress(Address address) {
this.address = address;
}
-}
+}
\ No newline at end of file
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=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Address.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/Address.java Thu Sep 22 20:52:54 2005
@@ -27,56 +27,69 @@
public class Address implements IOMRMElement {
EndpointReference epr = null;
+
OMElement addressElement;
-
- OMNamespace rmNamespace =
- SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMNamespace(
- Constants.WSA.NS_URI_ADDRESSING, Constants.WSA.NS_PREFIX_ADDRESSING);
-
- public Address (){
- addressElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSA.ADDRESS,rmNamespace);
+
+ OMNamespace rmNamespace = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION)
+ .createOMNamespace(Constants.WSA.NS_URI_ADDRESSING,
+ Constants.WSA.NS_PREFIX_ADDRESSING);
+
+ public Address() {
+ addressElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSA.ADDRESS, rmNamespace);
}
+ public Address (EndpointReference epr) {
+ this();
+ this.epr = epr;
+ }
+
public Object fromOMElement(OMElement element) throws OMException {
-
- OMElement addressPart = element.getFirstChildWithName( new QName (
- Constants.WSA.NS_URI_ADDRESSING,Constants.WSA.ADDRESS));
- if (addressPart==null)
- throw new OMException ("Cant find an Address element in the given part");
+
+ OMElement addressPart = element.getFirstChildWithName(new QName(
+ Constants.WSA.NS_URI_ADDRESSING, Constants.WSA.ADDRESS));
+ if (addressPart == null)
+ throw new OMException(
+ "Cant find an Address element in the given part");
String addressText = addressPart.getText();
- if(addressText==null||addressText=="")
- throw new OMException ("Passed element does not have a valid address text");
-
+ if (addressText == null || addressText == "")
+ throw new OMException(
+ "Passed element does not have a valid address text");
+
addressElement = addressPart;
- epr = new EndpointReference (addressText);
- addressElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSA.ADDRESS,rmNamespace);
+ epr = new EndpointReference(addressText);
+ addressElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSA.ADDRESS, rmNamespace);
return this;
-
+
}
public OMElement getOMElement() throws OMException {
return addressElement;
}
-
+
public OMElement toOMElement(OMElement element) throws OMException {
- if (addressElement==null)
- throw new OMException ("Cant set Address. The address element is null");
-
- if (epr==null || epr.getAddress()==null || epr.getAddress()=="")
- throw new OMException ("cant set the address. The address value is not valid");
-
+ if (addressElement == null)
+ throw new OMException(
+ "Cant set Address. The address element is null");
+
+ if (epr == null || epr.getAddress() == null || epr.getAddress() == "")
+ throw new OMException(
+ "cant set the address. The address value is not valid");
+
addressElement.setText(epr.getAddress());
element.addChild(addressElement);
-
- addressElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSA.ADDRESS,rmNamespace);
-
+ addressElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSA.ADDRESS, rmNamespace);
+
return element;
}
-
+
public EndpointReference getEpr() {
return epr;
}
@@ -84,4 +97,4 @@
public void setEpr(EndpointReference epr) {
this.epr = epr;
}
-}
+}
\ No newline at end of file
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=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequence.java Thu Sep 22 20:52:54 2005
@@ -36,100 +36,118 @@
* @author sanka
*/
-
public class CreateSequence implements IOMRMPart {
private OMElement createSequenceElement;
-
- private AcksTo acksTo=null;
- private Expires expires=null;
- private SequenceOffer sequenceOffer=null;
+
+ private AcksTo acksTo = null;
+
+ private Expires expires = null;
+
+ private SequenceOffer sequenceOffer = null;
+
//private SequritytokenReference;
-
- OMNamespace rmNamespace =
- SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMNamespace(Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
-
- public CreateSequence(){
- createSequenceElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSRM.CREATE_SEQUENCE,rmNamespace);
+
+ OMNamespace rmNamespace = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMNamespace(
+ Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+
+ public CreateSequence() {
+ createSequenceElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.CREATE_SEQUENCE, rmNamespace);
}
+ public CreateSequence (AcksTo acksTo) {
+ this ();
+ this.acksTo = acksTo;
+ }
+
public OMElement getOMElement() throws OMException {
return createSequenceElement;
}
public Object fromOMElement(OMElement bodyElement) throws OMException {
-
- OMElement createSequencePart = bodyElement.getFirstChildWithName(
- new QName (Constants.WSRM.NS_URI_RM,Constants.WSRM.CREATE_SEQUENCE));
- if (createSequencePart==null)
- throw new OMException ("Create sequence is not present in the passed element");
-
- createSequenceElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(Constants.WSRM.CREATE_SEQUENCE,
- rmNamespace);
-
+
+ OMElement createSequencePart = bodyElement
+ .getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
+ Constants.WSRM.CREATE_SEQUENCE));
+ if (createSequencePart == null)
+ throw new OMException(
+ "Create sequence is not present in the passed element");
+
+ createSequenceElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.CREATE_SEQUENCE, rmNamespace);
+
acksTo = new AcksTo();
- acksTo.fromOMElement (createSequencePart);
-
- OMElement offerPart = createSequencePart.getFirstChildWithName (
- new QName (Constants.WSRM.NS_URI_RM,Constants.WSRM.SEQUENCE_OFFER));
- if (offerPart!=null) {
+ acksTo.fromOMElement(createSequencePart);
+
+ OMElement offerPart = createSequencePart
+ .getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
+ Constants.WSRM.SEQUENCE_OFFER));
+ if (offerPart != null) {
sequenceOffer = new SequenceOffer();
sequenceOffer.fromOMElement(createSequencePart);
}
-
- OMElement expiresPart = createSequenceElement.getFirstChildWithName (
- new QName (Constants.WSRM.NS_URI_RM,Constants.WSRM.EXPIRES));
- if (expiresPart!=null) {
- expires = new Expires ();
+
+ OMElement expiresPart = createSequenceElement
+ .getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
+ Constants.WSRM.EXPIRES));
+ if (expiresPart != null) {
+ expires = new Expires();
expires.fromOMElement(createSequencePart);
}
-
+
return this;
}
public OMElement toOMElement(OMElement bodyElement) throws OMException {
-
- if (bodyElement==null || !(bodyElement instanceof SOAPBody))
- throw new OMException ("Cant add Create Sequence Part to a non-body element");
-
- if(acksTo==null)
- throw new OMException ("Cant add create seqeunce part, having acks to as null");
-
+
+ if (bodyElement == null || !(bodyElement instanceof SOAPBody))
+ throw new OMException(
+ "Cant add Create Sequence Part to a non-body element");
+
+ if (acksTo == null)
+ throw new OMException(
+ "Cant add create seqeunce part, having acks to as null");
+
SOAPBody soapBody = (SOAPBody) bodyElement;
acksTo.toOMElement(createSequenceElement);
-
- if(sequenceOffer != null){
+
+ if (sequenceOffer != null) {
sequenceOffer.toOMElement(createSequenceElement);
}
-
- if(expires!=null) {
+
+ if (expires != null) {
expires.toOMElement(createSequenceElement);
}
soapBody.addChild(createSequenceElement);
-
- createSequenceElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSRM.CREATE_SEQUENCE,rmNamespace);
+
+ createSequenceElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.CREATE_SEQUENCE, rmNamespace);
return soapBody;
}
-
- public void setAcksTo(AcksTo acksTo){
+
+ public void setAcksTo(AcksTo acksTo) {
this.acksTo = acksTo;
}
- public void setSequenceOffer(SequenceOffer sequenceOffer){
+
+ public void setSequenceOffer(SequenceOffer sequenceOffer) {
this.sequenceOffer = sequenceOffer;
}
- public AcksTo getAcksTo(){
+
+ public AcksTo getAcksTo() {
return acksTo;
}
- public SequenceOffer getSequenceOffer(){
+
+ public SequenceOffer getSequenceOffer() {
return sequenceOffer;
}
-
-
public void toSOAPEnvelope(SOAPEnvelope envelope) {
SOAPBody body = envelope.getBody();
toOMElement(body);
}
-}
+}
\ No newline at end of file
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=291067&r1=291066&r2=291067&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java (original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/wsrm/CreateSequenceResponse.java Thu Sep 22 20:52:54 2005
@@ -35,102 +35,121 @@
public class CreateSequenceResponse implements IOMRMPart {
private OMElement createSequenceResponseElement;
+
private Identifier identifier;
+
private Accept accept;
+
private Expires expires;
-
- OMNamespace createSeqResNoNamespace =
- SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMNamespace(Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
-
- public CreateSequenceResponse(){
- createSequenceResponseElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSRM.CREATE_SEQUENCE_RESPONSE,createSeqResNoNamespace);
+
+ OMNamespace createSeqResNoNamespace = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMNamespace(
+ Constants.WSRM.NS_URI_RM, Constants.WSRM.NS_PREFIX_RM);
+
+ public CreateSequenceResponse() {
+ createSequenceResponseElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.CREATE_SEQUENCE_RESPONSE,
+ createSeqResNoNamespace);
}
-
+
public OMElement getOMElement() throws OMException {
return createSequenceResponseElement;
}
public Object fromOMElement(OMElement bodyElement) throws OMException {
-
- if (bodyElement==null || !(bodyElement instanceof SOAPBody))
- throw new OMException ("Cant get create sequnce response from a non-body element");
-
-
+
+ if (bodyElement == null || !(bodyElement instanceof SOAPBody))
+ throw new OMException(
+ "Cant get create sequnce response from a non-body element");
+
SOAPBody SOAPBody = (SOAPBody) bodyElement;
- OMElement createSeqResponsePart = SOAPBody.getFirstChildWithName(
- new QName (Constants.WSRM.NS_URI_RM, Constants.WSRM.CREATE_SEQUENCE_RESPONSE));
- if(createSeqResponsePart==null)
- throw new OMException ("The passed element does not contain a create seqence response part");
-
- createSequenceResponseElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSRM.CREATE_SEQUENCE_RESPONSE,createSeqResNoNamespace);
-
+ OMElement createSeqResponsePart = SOAPBody
+ .getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
+ Constants.WSRM.CREATE_SEQUENCE_RESPONSE));
+ if (createSeqResponsePart == null)
+ throw new OMException(
+ "The passed element does not contain a create seqence response part");
+
+ createSequenceResponseElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.CREATE_SEQUENCE_RESPONSE,
+ createSeqResNoNamespace);
+
identifier = new Identifier();
identifier.fromOMElement(createSeqResponsePart);
-
- OMElement expiresPart = createSeqResponsePart.getFirstChildWithName(
- new QName (Constants.WSRM.NS_URI_RM, Constants.WSRM.EXPIRES));
- if (expiresPart!=null) {
- expires = new Expires ();
+
+ OMElement expiresPart = createSeqResponsePart
+ .getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
+ Constants.WSRM.EXPIRES));
+ if (expiresPart != null) {
+ expires = new Expires();
expires.fromOMElement(createSeqResponsePart);
}
-
- OMElement acceptPart = createSeqResponsePart.getFirstChildWithName(
- new QName (Constants.WSRM.NS_URI_RM, Constants.WSRM.ACCEPT));
- if (acceptPart!=null) {
- accept = new Accept ();
+
+ OMElement acceptPart = createSeqResponsePart
+ .getFirstChildWithName(new QName(Constants.WSRM.NS_URI_RM,
+ Constants.WSRM.ACCEPT));
+ if (acceptPart != null) {
+ accept = new Accept();
accept.fromOMElement(createSeqResponsePart);
}
-
+
return this;
}
public OMElement toOMElement(OMElement bodyElement) throws OMException {
-
- if (bodyElement==null || !(bodyElement instanceof SOAPBody))
- throw new OMException ("Cant get create sequnce response from a non-body element");
-
+
+ if (bodyElement == null || !(bodyElement instanceof SOAPBody))
+ throw new OMException(
+ "Cant get create sequnce response from a non-body element");
+
SOAPBody SOAPBody = (SOAPBody) bodyElement;
-
- if (createSequenceResponseElement==null)
- throw new OMException ("cant set create sequnce response since the internal element is not set");
- if (identifier==null)
- throw new OMException ("cant set create sequnce response since the Identifier is not set");
-
+
+ if (createSequenceResponseElement == null)
+ throw new OMException(
+ "cant set create sequnce response since the internal element is not set");
+ if (identifier == null)
+ throw new OMException(
+ "cant set create sequnce response since the Identifier is not set");
+
identifier.toOMElement(createSequenceResponseElement);
-
+
if (expires != null) {
expires.toOMElement(createSequenceResponseElement);
}
-
- if( accept != null){
+
+ if (accept != null) {
accept.toOMElement(createSequenceResponseElement);
}
-
+
SOAPBody.addChild(createSequenceResponseElement);
-
- createSequenceResponseElement = SOAPAbstractFactory.getSOAPFactory(Constants.DEFAULT_SOAP_VERSION).createOMElement(
- Constants.WSRM.CREATE_SEQUENCE_RESPONSE,createSeqResNoNamespace);
-
+
+ createSequenceResponseElement = SOAPAbstractFactory.getSOAPFactory(
+ Constants.DEFAULT_SOAP_VERSION).createOMElement(
+ Constants.WSRM.CREATE_SEQUENCE_RESPONSE,
+ createSeqResNoNamespace);
+
return SOAPBody;
}
-
- public void setIdentifier(Identifier identifier){
+
+ public void setIdentifier(Identifier identifier) {
this.identifier = identifier;
}
- public Identifier getIdentifier(){
+
+ public Identifier getIdentifier() {
return identifier;
}
-
- public void setAccept(Accept accept){
+
+ public void setAccept(Accept accept) {
this.accept = accept;
}
- public Accept getAccept(){
+
+ public Accept getAccept() {
return accept;
}
-
+
public Expires getExpires() {
return expires;
}
@@ -138,9 +157,9 @@
public void setExpires(Expires expires) {
this.expires = expires;
}
-
+
public void toSOAPEnvelope(SOAPEnvelope envelope) {
SOAPBody body = envelope.getBody();
toOMElement(body);
}
-}
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org