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 ga...@apache.org on 2007/01/15 13:37:23 UTC

svn commit: r496295 - in /webservices/sandesha/trunk/java: src/org/apache/sandesha2/client/ src/org/apache/sandesha2/storage/ src/org/apache/sandesha2/storage/beanmanagers/ src/org/apache/sandesha2/storage/beans/ src/org/apache/sandesha2/storage/inmemo...

Author: gatfora
Date: Mon Jan 15 04:37:22 2007
New Revision: 496295

URL: http://svn.apache.org/viewvc?view=rev&rev=496295
Log:
Remove SequencePropertyBeanMgr

Removed:
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beanmanagers/SequencePropertyBeanMgr.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/beans/SequencePropertyBean.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemorySequencePropertyBeanMgr.java
    webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/SequencePropertyBeanMgrTest.java
Modified:
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/StorageManager.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java?view=diff&rev=496295&r1=496294&r2=496295
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/client/SandeshaClient.java Mon Jan 15 04:37:22 2007
@@ -50,10 +50,8 @@
 import org.apache.sandesha2.storage.StorageManager;
 import org.apache.sandesha2.storage.Transaction;
 import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
 import org.apache.sandesha2.storage.beans.RMSBean;
 import org.apache.sandesha2.storage.beans.RMDBean;
-import org.apache.sandesha2.storage.beans.SequencePropertyBean;
 import org.apache.sandesha2.util.AcknowledgementManager;
 import org.apache.sandesha2.util.SandeshaUtil;
 import org.apache.sandesha2.util.SpecSpecificConstants;
@@ -389,8 +387,6 @@
 		
 		try {
 			
-			SequencePropertyBeanMgr seqPropMgr = storageManager.getSequencePropertyBeanMgr();
-			
 			RMSBean rmsBean = SandeshaUtil.getRMSBeanFromInternalSequenceId(storageManager, internalSequenceId);
 			//see if the sequence is terminated
 			boolean terminatedSequence = false;
@@ -403,9 +399,6 @@
 			}
 	
 			if (terminatedSequence) {		
-				// Find all properties which have a matching internal sequence id				
-				removeBeans(rmsBean.getSequenceID(), seqPropMgr);
-				removeBeans(rmsBean.getInternalSequenceID(), seqPropMgr);
 				// Delete the rmsBean
 				storageManager.getRMSBeanMgr().delete(rmsBean.getCreateSeqMsgID());
 			}
@@ -420,22 +413,6 @@
 		tran.commit();
 	}
 	
-	private static final void removeBeans(String sequenceId, SequencePropertyBeanMgr seqPropMgr) throws SandeshaStorageException {
-		// Find all properties which have a matching sequence id
-		SequencePropertyBean bean = new SequencePropertyBean();
-		bean.setSequencePropertyKey(sequenceId);
-		List beans = seqPropMgr.find(bean);
-		
-		Iterator iterator = beans.iterator();
-		
-		while (iterator.hasNext()) {
-			bean = (SequencePropertyBean)iterator.next();
-			
-			seqPropMgr.delete(bean.getSequencePropertyKey(), bean.getName());				
-		}
-
-	}
-	
 	/**
 	 * Clients can use this to create a sequence sequence.
 	 * 
@@ -451,7 +428,6 @@
 		if (options == null)
 			throw new SandeshaException(SandeshaMessageHelper.getMessage(
 					SandeshaMessageKeys.optionsObjectNotSet));
-
 		
 		String newSequenceKey = SandeshaUtil.getUUID();
 		createSequence(serviceClient, offer, newSequenceKey);

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/StorageManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/StorageManager.java?view=diff&rev=496295&r1=496294&r2=496295
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/StorageManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/StorageManager.java Mon Jan 15 04:37:22 2007
@@ -24,7 +24,6 @@
 import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
 import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
 import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
 import org.apache.sandesha2.workers.SandeshaThread;
 
 /**
@@ -68,8 +67,6 @@
 	public abstract RMDBeanMgr getRMDBeanMgr();
 
 	public abstract SenderBeanMgr getSenderBeanMgr();
-
-	public abstract SequencePropertyBeanMgr getSequencePropertyBeanMgr();
 
 	public abstract InvokerBeanMgr getInvokerBeanMgr();
 	

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java?view=diff&rev=496295&r1=496294&r2=496295
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/storage/inmemory/InMemoryStorageManager.java Mon Jan 15 04:37:22 2007
@@ -39,7 +39,6 @@
 import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
 import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
 import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
 import org.apache.sandesha2.storage.beans.RMBean;
 import org.apache.sandesha2.util.SandeshaUtil;
 import org.apache.sandesha2.workers.Invoker;
@@ -55,7 +54,6 @@
     private final String ENVELOPE_MAP_KEY = "Sandesha2EnvelopeMap";
     private RMSBeanMgr  rMSBeanMgr = null;
     private RMDBeanMgr rMDBeanMgr = null;
-    private SequencePropertyBeanMgr sequencePropertyBeanMgr = null;
     private SenderBeanMgr senderBeanMgr = null;
     private InvokerBeanMgr invokerBeanMgr = null;
     private Sender sender = null;
@@ -69,7 +67,6 @@
 		this.rMDBeanMgr = new InMemoryRMDBeanMgr (this, context);
 		this.senderBeanMgr = new InMemorySenderBeanMgr (this, context);
 		this.invokerBeanMgr = new InMemoryInvokerBeanMgr (this, context);
-		this.sequencePropertyBeanMgr = new InMemorySequencePropertyBeanMgr (this, context);
 		this.sender = new Sender();
 		this.invoker = new Invoker();
 	}
@@ -156,10 +153,6 @@
 		return senderBeanMgr;
 	}
 
-	public SequencePropertyBeanMgr getSequencePropertyBeanMgr() {
-		return sequencePropertyBeanMgr;
-	}
-
 	public InvokerBeanMgr getInvokerBeanMgr() {
 		return invokerBeanMgr;
 	}
@@ -287,6 +280,7 @@
 	}
 
 }
+
 
 
 

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java?view=diff&rev=496295&r1=496294&r2=496295
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/SandeshaUtil.java Mon Jan 15 04:37:22 2007
@@ -73,10 +73,8 @@
 import org.apache.sandesha2.storage.StorageManager;
 import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
 import org.apache.sandesha2.storage.beanmanagers.RMSBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
 import org.apache.sandesha2.storage.beans.RMDBean;
 import org.apache.sandesha2.storage.beans.RMSBean;
-import org.apache.sandesha2.storage.beans.SequencePropertyBean;
 import org.apache.sandesha2.transport.Sandesha2TransportOutDesc;
 import org.apache.sandesha2.workers.SandeshaThread;
 import org.apache.sandesha2.wsrm.AckRequested;
@@ -852,17 +850,6 @@
 		} catch (FactoryConfigurationError e) {
 			throw new SandeshaException(e.getMessage());
 		}
-	}
-
-	public static String getSequenceProperty(String id, String name, StorageManager storageManager)
-			throws SandeshaException {
-		SequencePropertyBeanMgr sequencePropertyBeanMgr = storageManager.getSequencePropertyBeanMgr();
-
-		SequencePropertyBean sequencePropertyBean = sequencePropertyBeanMgr.retrieve(id, name);
-		if (sequencePropertyBean == null)
-			return null;
-		
-		return sequencePropertyBean.getValue();
 	}
 
 	public static boolean isAllMsgsAckedUpto(long highestInMsgNo, String sequencePropertyKey,

Modified: webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java?view=diff&rev=496295&r1=496294&r2=496295
==============================================================================
--- webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java (original)
+++ webservices/sandesha/trunk/java/src/org/apache/sandesha2/util/TerminateManager.java Mon Jan 15 04:37:22 2007
@@ -37,12 +37,10 @@
 import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;
 import org.apache.sandesha2.storage.beanmanagers.RMDBeanMgr;
 import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;
-import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;
 import org.apache.sandesha2.storage.beans.RMSBean;
 import org.apache.sandesha2.storage.beans.InvokerBean;
 import org.apache.sandesha2.storage.beans.RMDBean;
 import org.apache.sandesha2.storage.beans.SenderBean;
-import org.apache.sandesha2.storage.beans.SequencePropertyBean;
 
 /**
  * Contains logic to remove all the storad data of a sequence. Methods of this
@@ -177,6 +175,7 @@
 
 		RMSBean rmsBean = SandeshaUtil.getRMSBeanFromInternalSequenceId(storageManager, internalSequenceId);
 		rmsBean.setTimedOut(true);
+		storageManager.getRMSBeanMgr().update(rmsBean);
 
 		cleanSendingSideData(sequencePropertyKey,internalSequenceId, serverside, storageManager);
 	}
@@ -184,7 +183,6 @@
 	private static void cleanSendingSideData(String sequencePropertyKey,String internalSequenceId,
 			boolean serverSide, StorageManager storageManager) throws SandeshaException {
 
-		SequencePropertyBeanMgr sequencePropertyBeanMgr = storageManager.getSequencePropertyBeanMgr();
 		SenderBeanMgr retransmitterBeanMgr = storageManager.getSenderBeanMgr();
 
 		// removing retransmitterMgr entries and corresponding message contexts.
@@ -196,19 +194,6 @@
 
 			String messageStoreKey = retransmitterBean.getMessageContextRefKey();
 			storageManager.removeMessageContext(messageStoreKey);
-		}
-		
-		// removing sequence properties
-		SequencePropertyBean findSequencePropertyBean1 = new SequencePropertyBean();
-		findSequencePropertyBean1.setSequencePropertyKey(sequencePropertyKey);
-		collection = sequencePropertyBeanMgr.find(findSequencePropertyBean1);
-		iterator = collection.iterator();
-		while (iterator.hasNext()) {
-			SequencePropertyBean sequencePropertyBean = (SequencePropertyBean) iterator.next();
-
-			// TODO all properties which hv the temm:Seq:id as the key should be
-			// deletable.
-			sequencePropertyBeanMgr.delete(sequencePropertyBean.getSequencePropertyKey(), sequencePropertyBean.getName());
 		}
 	}
 



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org