You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2009/06/19 13:31:17 UTC
svn commit: r786460 - in /activemq/sandbox/activemq-flow:
activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/
activemq-broker/src/main/java/org/apache/activemq/filter/
activemq-broker/src/test/java/org/apache/activemq/apollo/broke...
Author: chirino
Date: Fri Jun 19 11:31:16 2009
New Revision: 786460
URL: http://svn.apache.org/viewvc?rev=786460&view=rev
Log:
changing the package names so it's under apollo
Added:
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/
- copied from r786459, activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/filter/
activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/
activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/wildcard/
- copied from r786459, activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/filter/
Removed:
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/filter/
activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/filter/
Modified:
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/AnyChildDestinationNode.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/CompositeDestinationFilter.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationFilter.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationMap.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapEntry.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapNode.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationNode.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationPath.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/PrefixDestinationFilter.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/SimpleDestinationFilter.java
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/WildcardDestinationFilter.java
activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapMemoryTest.java
activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapTempDestinationTest.java
activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapTest.java
activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/filter/DestinationFilter.java
activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/filter/SimpleDestinationFilter.java
activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/ConduitBridge.java
activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DurableConduitBridge.java
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/AnyChildDestinationNode.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/AnyChildDestinationNode.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/AnyChildDestinationNode.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/AnyChildDestinationNode.java Fri Jun 19 11:31:16 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.broker.wildcard;
import java.util.ArrayList;
import java.util.Collection;
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/CompositeDestinationFilter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/CompositeDestinationFilter.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/CompositeDestinationFilter.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/CompositeDestinationFilter.java Fri Jun 19 11:31:16 2009
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.broker.wildcard;
import java.util.Collection;
import org.apache.activemq.apollo.broker.Destination;
+import org.apache.activemq.filter.FilterException;
/**
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationFilter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationFilter.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationFilter.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationFilter.java Fri Jun 19 11:31:16 2009
@@ -15,11 +15,14 @@
* limitations under the License.
*/
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.broker.wildcard;
import java.util.Collection;
import org.apache.activemq.apollo.broker.Destination;
+import org.apache.activemq.filter.BooleanExpression;
+import org.apache.activemq.filter.FilterException;
+import org.apache.activemq.filter.MessageEvaluationContext;
/**
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationMap.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationMap.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationMap.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationMap.java Fri Jun 19 11:31:16 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.broker.wildcard;
import java.util.Collection;
import java.util.HashSet;
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapEntry.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapEntry.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapEntry.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapEntry.java Fri Jun 19 11:31:16 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.broker.wildcard;
import org.apache.activemq.apollo.broker.Destination;
import org.springframework.beans.factory.InitializingBean;
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapNode.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapNode.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapNode.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapNode.java Fri Jun 19 11:31:16 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.broker.wildcard;
import java.util.ArrayList;
import java.util.Collection;
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationNode.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationNode.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationNode.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationNode.java Fri Jun 19 11:31:16 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.broker.wildcard;
import java.util.Collection;
import java.util.Set;
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationPath.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationPath.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationPath.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/DestinationPath.java Fri Jun 19 11:31:16 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.broker.wildcard;
import java.util.ArrayList;
import java.util.List;
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/PrefixDestinationFilter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/PrefixDestinationFilter.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/PrefixDestinationFilter.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/PrefixDestinationFilter.java Fri Jun 19 11:31:16 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.broker.wildcard;
import org.apache.activemq.apollo.broker.Destination;
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/SimpleDestinationFilter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/SimpleDestinationFilter.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/SimpleDestinationFilter.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/SimpleDestinationFilter.java Fri Jun 19 11:31:16 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.broker.wildcard;
import org.apache.activemq.apollo.broker.Destination;
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/WildcardDestinationFilter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/WildcardDestinationFilter.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/WildcardDestinationFilter.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/wildcard/WildcardDestinationFilter.java Fri Jun 19 11:31:16 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.broker.wildcard;
import org.apache.activemq.apollo.broker.Destination;
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapMemoryTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapMemoryTest.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapMemoryTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapMemoryTest.java Fri Jun 19 11:31:16 2009
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.broker.wildcard;
import junit.framework.TestCase;
import org.apache.activemq.apollo.broker.Destination;
import org.apache.activemq.apollo.broker.Router;
+import org.apache.activemq.apollo.broker.wildcard.DestinationMap;
import org.apache.activemq.protobuf.AsciiBuffer;
public class DestinationMapMemoryTest extends TestCase {
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapTempDestinationTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapTempDestinationTest.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapTempDestinationTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapTempDestinationTest.java Fri Jun 19 11:31:16 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.broker.wildcard;
import java.util.Set;
@@ -22,6 +22,7 @@
import org.apache.activemq.apollo.broker.Destination;
import org.apache.activemq.apollo.broker.Router;
+import org.apache.activemq.apollo.broker.wildcard.DestinationMap;
import org.apache.activemq.protobuf.AsciiBuffer;
public class DestinationMapTempDestinationTest extends TestCase {
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapTest.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/apollo/broker/wildcard/DestinationMapTest.java Fri Jun 19 11:31:16 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.activemq.filter;
+package org.apache.activemq.apollo.broker.wildcard;
import java.util.ArrayList;
import java.util.Arrays;
@@ -27,6 +27,7 @@
import org.apache.activemq.apollo.broker.Destination;
import org.apache.activemq.apollo.broker.Router;
+import org.apache.activemq.apollo.broker.wildcard.DestinationMap;
import org.apache.activemq.protobuf.AsciiBuffer;
public class DestinationMapTest extends TestCase {
Modified: activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/filter/DestinationFilter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/filter/DestinationFilter.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/filter/DestinationFilter.java (original)
+++ activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/filter/DestinationFilter.java Fri Jun 19 11:31:16 2009
@@ -16,6 +16,7 @@
*/
package org.apache.activemq.filter;
+import org.apache.activemq.apollo.broker.wildcard.DestinationFilter;
import org.apache.activemq.command.ActiveMQDestination;
public class DestinationFilter {
Modified: activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/filter/SimpleDestinationFilter.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/filter/SimpleDestinationFilter.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/filter/SimpleDestinationFilter.java (original)
+++ activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/filter/SimpleDestinationFilter.java Fri Jun 19 11:31:16 2009
@@ -16,6 +16,8 @@
*/
package org.apache.activemq.filter;
+import org.apache.activemq.apollo.broker.wildcard.DestinationFilter;
+
public class SimpleDestinationFilter extends DestinationFilter {
}
Modified: activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/ConduitBridge.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/ConduitBridge.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/ConduitBridge.java (original)
+++ activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/ConduitBridge.java Fri Jun 19 11:31:16 2009
@@ -21,9 +21,9 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.activemq.apollo.broker.wildcard.DestinationFilter;
import org.apache.activemq.command.ConsumerId;
import org.apache.activemq.command.ConsumerInfo;
-import org.apache.activemq.filter.DestinationFilter;
import org.apache.activemq.transport.Transport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java Fri Jun 19 11:31:16 2009
@@ -32,6 +32,7 @@
import org.apache.activemq.Service;
import org.apache.activemq.advisory.AdvisorySupport;
+import org.apache.activemq.apollo.broker.wildcard.DestinationFilter;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQMessage;
import org.apache.activemq.command.ActiveMQTempDestination;
@@ -58,7 +59,6 @@
import org.apache.activemq.command.SessionInfo;
import org.apache.activemq.command.ShutdownInfo;
import org.apache.activemq.command.WireFormatInfo;
-import org.apache.activemq.filter.DestinationFilter;
import org.apache.activemq.legacy.broker.BrokerService;
import org.apache.activemq.legacy.broker.BrokerServiceAware;
import org.apache.activemq.legacy.broker.TransportConnection;
@@ -896,9 +896,9 @@
for (int i = 0; i < dests.length; i++) {
DestinationFilter exclusionFilter = filter;
ActiveMQDestination match = dests[i];
- if (exclusionFilter instanceof org.apache.activemq.filter.SimpleDestinationFilter) {
+ if (exclusionFilter instanceof org.apache.activemq.apollo.broker.wildcard.SimpleDestinationFilter) {
DestinationFilter newFilter = DestinationFilter.parseFilter(match);
- if (!(newFilter instanceof org.apache.activemq.filter.SimpleDestinationFilter)) {
+ if (!(newFilter instanceof org.apache.activemq.apollo.broker.wildcard.SimpleDestinationFilter)) {
exclusionFilter = newFilter;
match = destination;
}
@@ -913,9 +913,9 @@
for (int i = 0; i < dests.length; i++) {
DestinationFilter inclusionFilter = filter;
ActiveMQDestination match = dests[i];
- if (inclusionFilter instanceof org.apache.activemq.filter.SimpleDestinationFilter) {
+ if (inclusionFilter instanceof org.apache.activemq.apollo.broker.wildcard.SimpleDestinationFilter) {
DestinationFilter newFilter = DestinationFilter.parseFilter(match);
- if (!(newFilter instanceof org.apache.activemq.filter.SimpleDestinationFilter)) {
+ if (!(newFilter instanceof org.apache.activemq.apollo.broker.wildcard.SimpleDestinationFilter)) {
inclusionFilter = newFilter;
match = destination;
}
Modified: activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DurableConduitBridge.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DurableConduitBridge.java?rev=786460&r1=786459&r2=786460&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DurableConduitBridge.java (original)
+++ activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DurableConduitBridge.java Fri Jun 19 11:31:16 2009
@@ -19,10 +19,10 @@
import java.io.IOException;
import java.util.Iterator;
+import org.apache.activemq.apollo.broker.wildcard.DestinationFilter;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ConsumerId;
import org.apache.activemq.command.ConsumerInfo;
-import org.apache.activemq.filter.DestinationFilter;
import org.apache.activemq.transport.Transport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;