From: Ovidiu F. <ovi...@jb...> - 2006-01-31 23:37:18
|
User: ovidiu Date: 06/01/31 18:37:15 Modified: src/main/org/jboss/jms/server CoreDestinationStore.java DestinationJNDIMapper.java Log: - Clarified the distinction between destination undeployment/re-deployment and destination drop. Added a test case that checks whether the current convention is enforced. Currently, is not possible to drop destinations, they will be always "re-deployed" or "activated". See http://jira.jboss.org/jira/browse/JBMESSAGING-220 - Move various tests under the correct packages. Revision Changes Path 1.5 +4 -4 jboss-jms/src/main/org/jboss/jms/server/CoreDestinationStore.java (In the diff below, changes in quantity of whitespace are not shown.) Index: CoreDestinationStore.java =================================================================== RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/jms/server/CoreDestinationStore.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- CoreDestinationStore.java 31 Jan 2006 04:36:03 -0000 1.4 +++ CoreDestinationStore.java 31 Jan 2006 23:37:15 -0000 1.5 @@ -33,7 +33,7 @@ import org.jboss.logging.Logger; import org.jboss.messaging.core.CoreDestination; import org.jboss.messaging.core.plugin.contract.TransactionLog; -import org.jboss.messaging.core.local.DurableSubscription; +import org.jboss.messaging.core.local.CoreDurableSubscription; import org.jboss.messaging.core.local.Queue; import org.jboss.messaging.core.local.Topic; @@ -44,9 +44,9 @@ * instance for each server peer. * * @author <a href="mailto:ov...@jb...">Ovidiu Feodorov</a> - * @version <tt>$Revision: 1.4 $</tt> + * @version <tt>$Revision: 1.5 $</tt> * - * $Id: CoreDestinationStore.java,v 1.4 2006/01/31 04:36:03 ovidiu Exp $ + * $Id: CoreDestinationStore.java,v 1.5 2006/01/31 23:37:15 ovidiu Exp $ */ class CoreDestinationStore { @@ -162,7 +162,7 @@ Iterator iter = durableSubs.iterator(); while (iter.hasNext()) { - DurableSubscription sub = (DurableSubscription)iter.next(); + CoreDurableSubscription sub = (CoreDurableSubscription)iter.next(); //load the state of the dub try { 1.7 +2 -3 jboss-jms/src/main/org/jboss/jms/server/DestinationJNDIMapper.java (In the diff below, changes in quantity of whitespace are not shown.) Index: DestinationJNDIMapper.java =================================================================== RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/jms/server/DestinationJNDIMapper.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- DestinationJNDIMapper.java 31 Jan 2006 05:43:00 -0000 1.6 +++ DestinationJNDIMapper.java 31 Jan 2006 23:37:15 -0000 1.7 @@ -49,9 +49,9 @@ * Manages JNDI mapping and delegates core destination state management to a CoreDestinationStore. * * @author <a href="mailto:ov...@jb...">Ovidiu Feodorov</a> - * @version <tt>$Revision: 1.6 $</tt> + * @version <tt>$Revision: 1.7 $</tt> * - * $Id: DestinationJNDIMapper.java,v 1.6 2006/01/31 05:43:00 ovidiu Exp $ + * $Id: DestinationJNDIMapper.java,v 1.7 2006/01/31 23:37:15 ovidiu Exp $ */ class DestinationJNDIMapper implements DestinationManager { @@ -195,7 +195,6 @@ } serverPeer.getSecurityManager().clearSecurityConfig(isQueue, name); - //serverPeer.getDurableSubscriptionStoreDelegate().clearTopic(); log.debug("unregistered " + (isQueue ? "queue " : "topic ") + name); } |