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 2006/11/20 06:26:02 UTC
svn commit: r477053 [2/2] - in
/webservices/sandesha/branches/sandesha2/java/1_1:
src/org/apache/sandesha2/client/ src/org/apache/sandesha2/handlers/
src/org/apache/sandesha2/msgprocessors/ src/org/apache/sandesha2/polling/
src/org/apache/sandesha2/sto...
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/Sender.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/Sender.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/Sender.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/Sender.java Sun Nov 19 21:26:00 2006
@@ -168,8 +168,8 @@
// TODO make sure this locks on reads.
transaction = storageManager.getTransaction();
- SenderBeanMgr mgr = storageManager.getRetransmitterBeanMgr();
- SenderBean senderBean = mgr.getNextMsgToSend();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
+ SenderBean senderBean = senderBeanMgr.getNextMsgToSend();
if (senderBean == null) {
if (log.isDebugEnabled()) {
String message = SandeshaMessageHelper
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/SenderWorker.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/SenderWorker.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/SenderWorker.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/SenderWorker.java Sun Nov 19 21:26:00 2006
@@ -56,7 +56,7 @@
try {
StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configurationContext, configurationContext.getAxisConfiguration());
- SenderBeanMgr senderBeanMgr = storageManager.getRetransmitterBeanMgr();
+ SenderBeanMgr senderBeanMgr = storageManager.getSenderBeanMgr();
transaction = storageManager.getTransaction();
Modified: webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java?view=diff&rev=477053&r1=477052&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/wsrm/UsesSequenceSTR.java Sun Nov 19 21:26:00 2006
@@ -40,6 +40,7 @@
private SOAPFactory defaultFactory;
private String namespaceValue = null;
+ private boolean mustUnderstand = true;
public UsesSequenceSTR(SOAPFactory factory,String namespaceValue) throws SandeshaException {
if (!isNamespaceSupported(namespaceValue))
@@ -83,7 +84,7 @@
throw new OMException("Cant set UsesSequenceSTR since the element is null");
// This header _must_ always be understood
- sequenceAcknowledgementHeaderBlock.setMustUnderstand(true);
+ sequenceAcknowledgementHeaderBlock.setMustUnderstand(mustUnderstand);
SOAPHeader.addChild(sequenceAcknowledgementHeaderBlock);
@@ -110,4 +111,12 @@
return false;
}
+ public boolean isMustUnderstand() {
+ return mustUnderstand;
+ }
+
+ public void setMustUnderstand(boolean mustUnderstand) {
+ this.mustUnderstand = mustUnderstand;
+ }
+
}
Copied: webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/InvokerBeanMgrTest.java (from r468444, webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/InvokerBeanMgrTest.java?view=diff&rev=477053&p1=webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java&r1=468444&p2=webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/InvokerBeanMgrTest.java&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/InvokerBeanMgrTest.java Sun Nov 19 21:26:00 2006
@@ -29,12 +29,12 @@
import java.util.Iterator;
-public class StorageMapBeanMgrTest extends SandeshaTestCase {
+public class InvokerBeanMgrTest extends SandeshaTestCase {
InvokerBeanMgr mgr;
Transaction transaction;
- public StorageMapBeanMgrTest() {
+ public InvokerBeanMgrTest() {
super ("StorageMapBeanMgrTest");
}
@@ -53,7 +53,7 @@
StorageManager storageManager = SandeshaUtil.getInMemoryStorageManager(configCtx);
transaction = storageManager.getTransaction();
- mgr = storageManager.getStorageMapBeanMgr();
+ mgr = storageManager.getInvokerBeanMgr();
}
public void tearDown() throws Exception {
Copied: webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/RMDBeanMgrTest.java (from r468444, webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/RMDBeanMgrTest.java?view=diff&rev=477053&p1=webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java&r1=468444&p2=webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/RMDBeanMgrTest.java&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/RMDBeanMgrTest.java Sun Nov 19 21:26:00 2006
@@ -17,8 +17,8 @@
package org.apache.sandesha2.storage;
import org.apache.sandesha2.policy.SandeshaPolicyBean;
-import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;
-import org.apache.sandesha2.storage.beans.NextMsgBean;
+import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
+import org.apache.sandesha2.storage.beans.RMDBean;
import org.apache.sandesha2.util.PropertyManager;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.Sandesha2Constants;
@@ -29,12 +29,12 @@
import java.util.Iterator;
-public class NextMsgBeanMgrTest extends SandeshaTestCase {
+public class RMDBeanMgrTest extends SandeshaTestCase {
- private NextMsgBeanMgr mgr;
+ private RMDBeanMgr mgr;
Transaction transaction;
- public NextMsgBeanMgrTest(String name) {
+ public RMDBeanMgrTest(String name) {
super(name);
}
@@ -54,7 +54,7 @@
StorageManager storageManager = SandeshaUtil.getInMemoryStorageManager(configCtx);
transaction = storageManager.getTransaction();
- mgr = storageManager.getNextMsgBeanMgr();
+ mgr = storageManager.getRMDBeanMgr();
}
@@ -63,52 +63,52 @@
}
public void testDelete() throws SandeshaStorageException{
- mgr.insert(new NextMsgBean("SeqId1", 1001));
+ mgr.insert(new RMDBean("SeqId1", 1001));
mgr.delete("SeqId1");
assertNull(mgr.retrieve("SeqId1"));
}
public void testFind() throws SandeshaStorageException {
- mgr.insert(new NextMsgBean("SeqId2", 1002));
- mgr.insert(new NextMsgBean("SeqId3", 1002));
+ mgr.insert(new RMDBean("SeqId2", 1002));
+ mgr.insert(new RMDBean("SeqId3", 1002));
- NextMsgBean target = new NextMsgBean();
+ RMDBean target = new RMDBean();
target.setNextMsgNoToProcess(1002);
Iterator iterator = mgr.find(target).iterator();
- NextMsgBean tmp = (NextMsgBean) iterator.next();
+ RMDBean tmp = (RMDBean) iterator.next();
if (tmp.getSequenceID().equals("SeqId2")) {
- tmp = (NextMsgBean) iterator.next();
+ tmp = (RMDBean) iterator.next();
tmp.getSequenceID().equals("SeqId3");
} else {
- tmp = (NextMsgBean) iterator.next();
+ tmp = (RMDBean) iterator.next();
tmp.getSequenceID().equals("SeqId2");
}
}
public void testInsert() throws SandeshaStorageException {
- NextMsgBean bean = new NextMsgBean("SeqId4", 1004);
+ RMDBean bean = new RMDBean("SeqId4", 1004);
mgr.insert(bean);
- NextMsgBean tmp = mgr.retrieve("SeqId4");
+ RMDBean tmp = mgr.retrieve("SeqId4");
assertTrue(tmp.getNextMsgNoToProcess() == 1004);
}
public void testRetrieve() throws SandeshaStorageException {
assertNull(mgr.retrieve("SeqId5"));
- mgr.insert(new NextMsgBean("SeqId5", 1005));
+ mgr.insert(new RMDBean("SeqId5", 1005));
- NextMsgBean tmp = mgr.retrieve("SeqId5");
+ RMDBean tmp = mgr.retrieve("SeqId5");
assertTrue(tmp.getNextMsgNoToProcess() == 1005);
}
public void testUpdate() throws SandeshaStorageException {
- NextMsgBean bean = new NextMsgBean("SeqId6", 1006);
+ RMDBean bean = new RMDBean("SeqId6", 1006);
mgr.insert(bean);
bean.setNextMsgNoToProcess(1007);
mgr.update(bean);
- NextMsgBean tmp = mgr.retrieve("SeqId6");
+ RMDBean tmp = mgr.retrieve("SeqId6");
assertTrue(tmp.getNextMsgNoToProcess() ==1007);
}
Copied: webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/RMSBeanMgrTest.java (from r468444, webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/RMSBeanMgrTest.java?view=diff&rev=477053&p1=webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java&r1=468444&p2=webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/RMSBeanMgrTest.java&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/RMSBeanMgrTest.java Sun Nov 19 21:26:00 2006
@@ -17,8 +17,8 @@
package org.apache.sandesha2.storage;
import org.apache.sandesha2.policy.SandeshaPolicyBean;
-import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;
-import org.apache.sandesha2.storage.beans.CreateSeqBean;
+import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
+import org.apache.sandesha2.storage.beans.RMSBean;
import org.apache.sandesha2.util.PropertyManager;
import org.apache.sandesha2.util.SandeshaUtil;
import org.apache.sandesha2.Sandesha2Constants;
@@ -30,11 +30,11 @@
import java.util.Iterator;
-public class CreateSeqBeanMgrTest extends SandeshaTestCase {
- private CreateSeqBeanMgr mgr;
+public class RMSBeanMgrTest extends SandeshaTestCase {
+ private RMSBeanMgr mgr;
Transaction transaction;
- public CreateSeqBeanMgrTest() {
+ public RMSBeanMgrTest() {
super("CreateSeqBeanMgrTest");
}
@@ -54,7 +54,7 @@
StorageManager storageManager = SandeshaUtil.getInMemoryStorageManager(configCtx);
transaction = storageManager.getTransaction();
- mgr = storageManager.getCreateSeqBeanMgr();
+ mgr = storageManager.getRMSBeanMgr();
}
public void tearDown() throws Exception {
@@ -62,7 +62,7 @@
}
public void testDelete() throws SandeshaStorageException {
- CreateSeqBean createSeqBean = new CreateSeqBean ();
+ RMSBean createSeqBean = new RMSBean ();
createSeqBean.setInternalSequenceID("TmpSeqId1");
createSeqBean.setCreateSeqMsgID("CreateSeqMsgId1");
createSeqBean.setSequenceID("SeqId1");
@@ -72,12 +72,12 @@
}
public void testFind() throws SandeshaStorageException {
- CreateSeqBean createSeqBean1 = new CreateSeqBean ();
+ RMSBean createSeqBean1 = new RMSBean ();
createSeqBean1.setInternalSequenceID("TmpSeqId1");
createSeqBean1.setCreateSeqMsgID("CreateSeqMsgId1");
createSeqBean1.setSequenceID("SeqId1");
- CreateSeqBean createSeqBean2 = new CreateSeqBean ();
+ RMSBean createSeqBean2 = new RMSBean ();
createSeqBean2.setInternalSequenceID("TmpSeqId1");
createSeqBean2.setCreateSeqMsgID("CreateSeqMsgId2");
createSeqBean2.setSequenceID("SeqId2");
@@ -85,28 +85,28 @@
mgr.insert(createSeqBean1);
mgr.insert(createSeqBean2);
- CreateSeqBean target = new CreateSeqBean();
+ RMSBean target = new RMSBean();
target.setInternalSequenceID("TmpSeqId1");
Iterator iter = mgr.find(target).iterator();
- CreateSeqBean tmp = (CreateSeqBean) iter.next();
+ RMSBean tmp = (RMSBean) iter.next();
if (tmp.getCreateSeqMsgID().equals("CreateSeqMsgId1")) {
- tmp = (CreateSeqBean) iter.next();
+ tmp = (RMSBean) iter.next();
assertTrue(tmp.getCreateSeqMsgID().equals("CreateSeqMsgId2"));
} else {
- tmp = (CreateSeqBean) iter.next();
+ tmp = (RMSBean) iter.next();
assertTrue(tmp.getCreateSeqMsgID().equals("CreateSeqMsgId1"));
}
}
public void testInsert() throws SandeshaStorageException{
- CreateSeqBean createSeqBean = new CreateSeqBean ();
+ RMSBean createSeqBean = new RMSBean ();
createSeqBean.setInternalSequenceID("TmpSeqId4");
createSeqBean.setCreateSeqMsgID("CreateSeqMsgId4");
createSeqBean.setSequenceID("SeqId4");
mgr.insert(createSeqBean);
- CreateSeqBean tmpbean = mgr.retrieve("CreateSeqMsgId4");
+ RMSBean tmpbean = mgr.retrieve("CreateSeqMsgId4");
assertTrue(tmpbean.getCreateSeqMsgID().equals("CreateSeqMsgId4"));
assertTrue(tmpbean.getSequenceID().equals("SeqId4"));
assertTrue(tmpbean.getInternalSequenceID().equals("TmpSeqId4"));
@@ -116,17 +116,17 @@
public void testRetrieve() throws SandeshaStorageException{
assertNull(mgr.retrieve("CreateSeqMsgId5"));
- CreateSeqBean createSeqBean = new CreateSeqBean ();
+ RMSBean createSeqBean = new RMSBean ();
createSeqBean.setInternalSequenceID("TmpSeqId5");
createSeqBean.setCreateSeqMsgID("CreateSeqMsgId5");
createSeqBean.setSequenceID("SeqId5");
mgr.insert(createSeqBean);
- CreateSeqBean tmp = mgr.retrieve("CreateSeqMsgId5");
+ RMSBean tmp = mgr.retrieve("CreateSeqMsgId5");
assertTrue(tmp.getCreateSeqMsgID().equals("CreateSeqMsgId5"));
}
public void testUpdate() throws SandeshaStorageException {
- CreateSeqBean createSeqBean = new CreateSeqBean ();
+ RMSBean createSeqBean = new RMSBean ();
createSeqBean.setInternalSequenceID("TmpSeqId6");
createSeqBean.setCreateSeqMsgID("CreateSeqMsgId6");
createSeqBean.setSequenceID("SeqId6");
@@ -134,7 +134,7 @@
mgr.insert(createSeqBean);
createSeqBean.setInternalSequenceID("TmpSeqId7");
mgr.update(createSeqBean);
- CreateSeqBean tmp = mgr.retrieve("CreateSeqMsgId6");
+ RMSBean tmp = mgr.retrieve("CreateSeqMsgId6");
assertTrue(tmp.getInternalSequenceID().equals("TmpSeqId7"));
}
}
Copied: webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/SenderBeanMgrTest.java (from r468444, webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java)
URL: http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/SenderBeanMgrTest.java?view=diff&rev=477053&p1=webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java&r1=468444&p2=webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/SenderBeanMgrTest.java&r2=477053
==============================================================================
--- webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java (original)
+++ webservices/sandesha/branches/sandesha2/java/1_1/test/src/org/apache/sandesha2/storage/SenderBeanMgrTest.java Sun Nov 19 21:26:00 2006
@@ -31,12 +31,12 @@
import java.util.Iterator;
-public class RetransmitterBeanMgrTest extends SandeshaTestCase {
+public class SenderBeanMgrTest extends SandeshaTestCase {
private SenderBeanMgr mgr;
Transaction transaction;
- public RetransmitterBeanMgrTest() {
+ public SenderBeanMgrTest() {
super("RetransmitterBeanMgrTest");
}
@@ -55,7 +55,7 @@
StorageManager storageManager = SandeshaUtil.getInMemoryStorageManager(configCtx);
transaction = storageManager.getTransaction();
- mgr = storageManager.getRetransmitterBeanMgr();
+ mgr = storageManager.getSenderBeanMgr();
}
public void tearDown() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org