You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/04/28 18:02:38 UTC
[33/57] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-1 Artemis
rename
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RoundtripTimeTest.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RoundtripTimeTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RoundtripTimeTest.java
index 87075d6..648a0d4 100644
--- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RoundtripTimeTest.java
+++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RoundtripTimeTest.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.rest.test;
+package org.apache.activemq.artemis.rest.test;
-import org.apache.activemq.rest.queue.QueueDeployment;
+import org.apache.activemq.artemis.rest.queue.QueueDeployment;
import org.jboss.resteasy.client.ClientRequest;
import org.jboss.resteasy.client.ClientResponse;
import org.jboss.resteasy.spi.Link;
@@ -41,12 +41,12 @@ public class RoundtripTimeTest extends MessageTestBase
ClientResponse<?> response = request.head();
response.releaseConnection();
Assert.assertEquals(200, response.getStatus());
- Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create");
+ Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create");
System.out.println("create: " + sender);
- Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers");
+ Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers");
System.out.println("pull: " + consumers);
response = Util.setAutoAck(consumers, true);
- Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
+ Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
System.out.println("consume-next: " + consumeNext);
@@ -63,7 +63,7 @@ public class RoundtripTimeTest extends MessageTestBase
for (int i = 0; i < num; i++)
{
response = consumeNext.request().post(String.class);
- consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
+ consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
Assert.assertEquals(200, response.getStatus());
Assert.assertEquals(Integer.toString(i + 1), response.getEntity(String.class));
response.releaseConnection();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SelectorTest.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SelectorTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SelectorTest.java
index 1c74feb..6b9ade7 100644
--- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SelectorTest.java
+++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SelectorTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.rest.test;
+package org.apache.activemq.artemis.rest.test;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
@@ -27,12 +27,12 @@ import javax.ws.rs.Path;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
-import org.apache.activemq.jms.client.ActiveMQDestination;
-import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory;
-import org.apache.activemq.rest.HttpHeaderProperty;
-import org.apache.activemq.rest.queue.push.xml.XmlLink;
-import org.apache.activemq.rest.topic.PushTopicRegistration;
-import org.apache.activemq.rest.topic.TopicDeployment;
+import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
+import org.apache.activemq.artemis.rest.HttpHeaderProperty;
+import org.apache.activemq.artemis.rest.queue.push.xml.XmlLink;
+import org.apache.activemq.artemis.rest.topic.PushTopicRegistration;
+import org.apache.activemq.artemis.rest.topic.TopicDeployment;
import org.jboss.resteasy.client.ClientRequest;
import org.jboss.resteasy.client.ClientResponse;
import org.jboss.resteasy.spi.Link;
@@ -196,7 +196,7 @@ public class SelectorTest extends MessageTestBase
ClientResponse<?> response = request.head();
response.releaseConnection();
Assert.assertEquals(200, response.getStatus());
- Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions");
+ Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "push-subscriptions");
System.out.println("push: " + consumers);
PushTopicRegistration oneReg = new PushTopicRegistration();
@@ -270,18 +270,18 @@ public class SelectorTest extends MessageTestBase
ClientResponse<?> response = request.head();
response.releaseConnection();
Assert.assertEquals(200, response.getStatus());
- Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions");
+ Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions");
System.out.println("pull: " + consumers);
response = consumers.request().formParameter("autoAck", "true")
.formParameter("selector", "MyTag = '1'").post();
response.releaseConnection();
- Link consumeOne = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
+ Link consumeOne = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
System.out.println("consumeOne: " + consumeOne);
response = consumers.request().formParameter("autoAck", "true")
.formParameter("selector", "MyTag = '2'").post();
response.releaseConnection();
- Link consumeTwo = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
+ Link consumeTwo = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
System.out.println("consumeTwo: " + consumeTwo);
@@ -326,7 +326,7 @@ public class SelectorTest extends MessageTestBase
Assert.assertEquals("application/xml", response.getHeaders().getFirst("Content-Type").toString().toLowerCase());
Order order2 = response.getEntity(Order.class);
Assert.assertEquals(order, order2);
- consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
+ consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
Assert.assertNotNull(consumeNext);
response.releaseConnection();
return consumeNext;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SessionTest.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SessionTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SessionTest.java
index 9890c26..f5b7a5b 100644
--- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SessionTest.java
+++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SessionTest.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.rest.test;
+package org.apache.activemq.artemis.rest.test;
-import org.apache.activemq.rest.queue.QueueDeployment;
-import org.apache.activemq.rest.topic.TopicDeployment;
-import org.apache.activemq.rest.util.Constants;
+import org.apache.activemq.artemis.rest.topic.TopicDeployment;
+import org.apache.activemq.artemis.rest.util.Constants;
+import org.apache.activemq.artemis.rest.queue.QueueDeployment;
import org.jboss.resteasy.client.ClientRequest;
import org.jboss.resteasy.client.ClientResponse;
import org.jboss.resteasy.spi.Link;
@@ -51,15 +51,15 @@ public class SessionTest extends MessageTestBase
ClientResponse<?> response = request.head();
response.releaseConnection();
Assert.assertEquals(200, response.getStatus());
- Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create");
+ Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create");
System.out.println("create: " + sender);
- Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers");
+ Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers");
System.out.println("pull: " + consumers);
response = Util.setAutoAck(consumers, true);
Link session = response.getLocationLink();
response = session.request().head();
response.releaseConnection();
- Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
+ Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
System.out.println("consume-next: " + consumeNext);
response = sender.request().body("text/plain", Integer.toString(1)).post();
@@ -71,7 +71,7 @@ public class SessionTest extends MessageTestBase
Assert.assertEquals("1", response.getEntity(String.class));
response.releaseConnection();
response = session.request().get();
- consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
+ consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
response = sender.request().body("text/plain", Integer.toString(2)).post();
response.releaseConnection();
@@ -82,7 +82,7 @@ public class SessionTest extends MessageTestBase
Assert.assertEquals("2", response.getEntity(String.class));
response.releaseConnection();
response = session.request().head();
- consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
+ consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
response = sender.request().body("text/plain", Integer.toString(3)).post();
response.releaseConnection();
@@ -107,15 +107,15 @@ public class SessionTest extends MessageTestBase
ClientResponse<?> response = request.head();
response.releaseConnection();
Assert.assertEquals(200, response.getStatus());
- Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create");
+ Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create");
System.out.println("create: " + sender);
- Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions");
+ Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions");
System.out.println("pull: " + consumers);
response = Util.setAutoAck(consumers, true);
Link session = response.getLocationLink();
response = session.request().head();
response.releaseConnection();
- Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
+ Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
System.out.println("consume-next: " + consumeNext);
response = sender.request().body("text/plain", Integer.toString(1)).post();
@@ -128,7 +128,7 @@ public class SessionTest extends MessageTestBase
response.releaseConnection();
response = session.request().get();
response.releaseConnection();
- consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
+ consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
response = sender.request().body("text/plain", Integer.toString(2)).post();
response.releaseConnection();
@@ -140,7 +140,7 @@ public class SessionTest extends MessageTestBase
response.releaseConnection();
response = session.request().head();
response.releaseConnection();
- consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
+ consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
response = sender.request().body("text/plain", Integer.toString(3)).post();
response.releaseConnection();
@@ -165,15 +165,15 @@ public class SessionTest extends MessageTestBase
ClientResponse<?> response = request.head();
response.releaseConnection();
Assert.assertEquals(200, response.getStatus());
- Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create");
+ Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create");
System.out.println("create: " + sender);
- Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers");
+ Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers");
System.out.println("pull: " + consumers);
response = Util.setAutoAck(consumers, false);
Link session = response.getLocationLink();
response = session.request().head();
response.releaseConnection();
- Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
+ Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
System.out.println("consume-next: " + consumeNext);
Link ack = null;
@@ -188,9 +188,9 @@ public class SessionTest extends MessageTestBase
response.releaseConnection();
response = session.request().get();
response.releaseConnection();
- consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
+ consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
Assert.assertNull(consumeNext);
- ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement");
+ ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement");
Assert.assertNotNull(ack);
// acknowledge
@@ -198,9 +198,9 @@ public class SessionTest extends MessageTestBase
response.releaseConnection();
response = session.request().head();
response.releaseConnection();
- consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
+ consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
Assert.assertNotNull(consumeNext);
- ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement");
+ ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement");
Assert.assertNull(ack);
response = sender.request().body("text/plain", Integer.toString(2)).post();
@@ -214,9 +214,9 @@ public class SessionTest extends MessageTestBase
response.releaseConnection();
response = session.request().get();
response.releaseConnection();
- consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
+ consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
Assert.assertNull(consumeNext);
- ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement");
+ ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement");
Assert.assertNotNull(ack);
// acknowledge
@@ -224,9 +224,9 @@ public class SessionTest extends MessageTestBase
response.releaseConnection();
response = session.request().head();
response.releaseConnection();
- consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
+ consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
Assert.assertNotNull(consumeNext);
- ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement");
+ ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement");
Assert.assertNull(ack);
response = session.request().delete();
@@ -242,15 +242,15 @@ public class SessionTest extends MessageTestBase
ClientResponse<?> response = request.head();
response.releaseConnection();
Assert.assertEquals(200, response.getStatus());
- Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create");
+ Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create");
System.out.println("create: " + sender);
- Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions");
+ Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-subscriptions");
System.out.println("pull: " + consumers);
response = Util.setAutoAck(consumers, false);
Link session = response.getLocationLink();
response = session.request().head();
response.releaseConnection();
- Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
+ Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
System.out.println("consume-next: " + consumeNext);
Link ack = null;
@@ -265,9 +265,9 @@ public class SessionTest extends MessageTestBase
response.releaseConnection();
response = session.request().get();
response.releaseConnection();
- consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
+ consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
Assert.assertNull(consumeNext);
- ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement");
+ ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement");
Assert.assertNotNull(ack);
// acknowledge
@@ -275,9 +275,9 @@ public class SessionTest extends MessageTestBase
response.releaseConnection();
response = session.request().head();
response.releaseConnection();
- consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
+ consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
Assert.assertNotNull(consumeNext);
- ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement");
+ ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement");
Assert.assertNull(ack);
response = sender.request().body("text/plain", Integer.toString(2)).post();
@@ -291,9 +291,9 @@ public class SessionTest extends MessageTestBase
response.releaseConnection();
response = session.request().get();
response.releaseConnection();
- consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
+ consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
Assert.assertNull(consumeNext);
- ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement");
+ ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement");
Assert.assertNotNull(ack);
// acknowledge
@@ -301,9 +301,9 @@ public class SessionTest extends MessageTestBase
response.releaseConnection();
response = session.request().head();
response.releaseConnection();
- consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
+ consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledge-next");
Assert.assertNotNull(consumeNext);
- ack = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement");
+ ack = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "acknowledgement");
Assert.assertNull(ack);
response = session.request().delete();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/TransformTest.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/TransformTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/TransformTest.java
index 93b8818..1667933 100644
--- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/TransformTest.java
+++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/TransformTest.java
@@ -14,20 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.rest.test;
+package org.apache.activemq.artemis.rest.test;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.activemq.api.core.Message;
-import org.apache.activemq.api.core.client.ClientMessage;
-import org.apache.activemq.api.core.client.ClientProducer;
-import org.apache.activemq.api.core.client.ClientSession;
-import org.apache.activemq.api.core.client.MessageHandler;
-import org.apache.activemq.rest.ActiveMQ;
-import org.apache.activemq.rest.queue.QueueDeployment;
+import org.apache.activemq.artemis.api.core.Message;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.MessageHandler;
+import org.apache.activemq.artemis.rest.ActiveMQ;
+import org.apache.activemq.artemis.rest.queue.QueueDeployment;
import org.jboss.resteasy.client.ClientRequest;
import org.jboss.resteasy.client.ClientResponse;
import org.jboss.resteasy.spi.Link;
@@ -132,12 +132,12 @@ public class TransformTest extends MessageTestBase
ClientResponse<?> response = request.head();
response.releaseConnection();
Assert.assertEquals(200, response.getStatus());
- Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create");
+ Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create");
System.out.println("create: " + sender);
- Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers");
+ Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers");
System.out.println("pull: " + consumers);
response = Util.setAutoAck(consumers, true);
- Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
+ Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
System.out.println("consume-next: " + consumeNext);
// test that Accept header is used to set content-type
@@ -154,7 +154,7 @@ public class TransformTest extends MessageTestBase
Order order2 = response.getEntity(Order.class);
response.releaseConnection();
Assert.assertEquals(order, order2);
- consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
+ consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
Assert.assertNotNull(consumeNext);
}
@@ -171,7 +171,7 @@ public class TransformTest extends MessageTestBase
Order order2 = response.getEntity(Order.class);
response.releaseConnection();
Assert.assertEquals(order, order2);
- consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
+ consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
Assert.assertNotNull(consumeNext);
}
@@ -188,7 +188,7 @@ public class TransformTest extends MessageTestBase
Order order2 = response.getEntity(Order.class);
response.releaseConnection();
Assert.assertEquals(order, order2);
- consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
+ consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
Assert.assertNotNull(consumeNext);
}
}
@@ -233,12 +233,12 @@ public class TransformTest extends MessageTestBase
ClientResponse<?> response = request.head();
response.releaseConnection();
Assert.assertEquals(200, response.getStatus());
- Link sender = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create");
+ Link sender = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "create");
System.out.println("create: " + sender);
- Link consumers = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers");
+ Link consumers = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "pull-consumers");
System.out.println("pull: " + consumers);
response = Util.setAutoAck(consumers, true);
- Link consumeNext = MessageTestBase.getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
+ Link consumeNext = getLinkByTitle(manager.getQueueManager().getLinkStrategy(), response, "consume-next");
System.out.println("consume-next: " + consumeNext);
// test that Accept header is used to set content-type
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/Util.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/Util.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/Util.java
index c592e2f..88bfe63 100644
--- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/Util.java
+++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/Util.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.rest.test;
+package org.apache.activemq.artemis.rest.test;
-import org.apache.activemq.rest.util.Constants;
+import org.apache.activemq.artemis.rest.util.Constants;
import org.jboss.resteasy.client.ClientRequest;
import org.jboss.resteasy.client.ClientResponse;
import org.jboss.resteasy.spi.Link;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/XmlTest.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/XmlTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/XmlTest.java
index cbb06b7..b700f85 100644
--- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/XmlTest.java
+++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/XmlTest.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.rest.test;
+package org.apache.activemq.artemis.rest.test;
-import org.apache.activemq.rest.queue.push.xml.PushRegistration;
+import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration;
import org.junit.Test;
import javax.xml.bind.JAXBContext;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-selector/pom.xml b/artemis-selector/pom.xml
index 43a868d..209da20 100644
--- a/artemis-selector/pom.xml
+++ b/artemis-selector/pom.xml
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-pom</artifactId>
- <version>10.0.0-SNAPSHOT</version>
+ <artifactId>artemis-pom</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>activemq-selector</artifactId>
+ <artifactId>artemis-selector</artifactId>
<packaging>jar</packaging>
<name>ActiveMQ Artemis Selector Implementation</name>
@@ -32,14 +32,14 @@
</properties>
<dependencies>
-
+
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.6.0</version>
<optional>true</optional>
</dependency>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -67,7 +67,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ArithmeticExpression.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ArithmeticExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ArithmeticExpression.java
index 9ccb7f7..4e5cdab 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ArithmeticExpression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ArithmeticExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector.filter;
+package org.apache.activemq.artemis.selector.filter;
/**
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/BinaryExpression.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/BinaryExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/BinaryExpression.java
index 0754271..593794b 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/BinaryExpression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/BinaryExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector.filter;
+package org.apache.activemq.artemis.selector.filter;
/**
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/BooleanExpression.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/BooleanExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/BooleanExpression.java
index 43bff45..dbbdd5b 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/BooleanExpression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/BooleanExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector.filter;
+package org.apache.activemq.artemis.selector.filter;
/**
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java
index cbda36f..a2e3e54 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector.filter;
+package org.apache.activemq.artemis.selector.filter;
import java.util.HashSet;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ConstantExpression.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ConstantExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ConstantExpression.java
index ac847b0..51eebd9 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ConstantExpression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ConstantExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector.filter;
+package org.apache.activemq.artemis.selector.filter;
import java.math.BigDecimal;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/Expression.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/Expression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/Expression.java
index f03e4cd..720fd6f 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/Expression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/Expression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector.filter;
+package org.apache.activemq.artemis.selector.filter;
/**
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/FilterException.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/FilterException.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/FilterException.java
index 4b40624..b6073f7 100644
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/FilterException.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/FilterException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector.filter;
+package org.apache.activemq.artemis.selector.filter;
public class FilterException extends Exception
{
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/Filterable.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/Filterable.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/Filterable.java
index 320b4f7..6b3d7d2 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/Filterable.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/Filterable.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector.filter;
+package org.apache.activemq.artemis.selector.filter;
/**
* A Filterable is the object being evaluated by the filters. It provides
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/LogicExpression.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/LogicExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/LogicExpression.java
index 2d70c85..c62b46d 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/LogicExpression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/LogicExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector.filter;
+package org.apache.activemq.artemis.selector.filter;
/**
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/PropertyExpression.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/PropertyExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/PropertyExpression.java
index f9860c3..7dcae01 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/PropertyExpression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/PropertyExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector.filter;
+package org.apache.activemq.artemis.selector.filter;
/**
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java
index 9a4eb73..8d1644c 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector.filter;
+package org.apache.activemq.artemis.selector.filter;
import java.math.BigDecimal;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java
index 10cd661..c20c1a5 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector.filter;
+package org.apache.activemq.artemis.selector.filter;
/**
* Used to evaluate an XPath Expression in a JMS selector.
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XQueryExpression.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XQueryExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XQueryExpression.java
index d47184e..49df141 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XQueryExpression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XQueryExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector.filter;
+package org.apache.activemq.artemis.selector.filter;
/**
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java
index fb63115..315773e 100644
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector.filter;
+package org.apache.activemq.artemis.selector.filter;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java
index 4c535d8..2a33880 100644
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/LRUCache.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector.impl;
+package org.apache.activemq.artemis.selector.impl;
import java.util.LinkedHashMap;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/SelectorParser.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/SelectorParser.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/SelectorParser.java
index 27c9081..5c200fe 100644
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/SelectorParser.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/SelectorParser.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector.impl;
+package org.apache.activemq.artemis.selector.impl;
import java.io.StringReader;
-import org.apache.activemq.selector.filter.BooleanExpression;
-import org.apache.activemq.selector.filter.ComparisonExpression;
-import org.apache.activemq.selector.filter.FilterException;
-import org.apache.activemq.selector.hyphenated.HyphenatedParser;
-import org.apache.activemq.selector.strict.StrictParser;
+import org.apache.activemq.artemis.selector.filter.BooleanExpression;
+import org.apache.activemq.artemis.selector.filter.ComparisonExpression;
+import org.apache.activemq.artemis.selector.filter.FilterException;
+import org.apache.activemq.artemis.selector.hyphenated.HyphenatedParser;
+import org.apache.activemq.artemis.selector.strict.StrictParser;
/**
*/
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/javacc/HyphenatedParser.jj
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/javacc/HyphenatedParser.jj b/artemis-selector/src/main/javacc/HyphenatedParser.jj
index c58dd4d..6e78c67 100755
--- a/artemis-selector/src/main/javacc/HyphenatedParser.jj
+++ b/artemis-selector/src/main/javacc/HyphenatedParser.jj
@@ -47,16 +47,16 @@ PARSER_BEGIN(HyphenatedParser)
* limitations under the License.
*/
-package org.apache.activemq.selector.hyphenated;
+package org.apache.activemq.artemis.selector.hyphenated;
import java.io.*;
import java.util.*;
-import org.apache.activemq.selector.filter.*;
+import org.apache.activemq.artemis.selector.filter.*;
-/**
+/**
* JMS Selector Parser generated by JavaCC
- *
+ *
* Do not edit this .java file directly - it is autogenerated from HyphenatedParser.jj
*/
public class HyphenatedParser {
@@ -118,8 +118,8 @@ TOKEN [IGNORE_CASE] :
< DECIMAL_LITERAL: ["1"-"9"] (["0"-"9"])* (["l","L"])? >
| < HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])+ >
- | < OCTAL_LITERAL: "0" (["0"-"7"])* >
- | < FLOATING_POINT_LITERAL:
+ | < OCTAL_LITERAL: "0" (["0"-"7"])* >
+ | < FLOATING_POINT_LITERAL:
(["0"-"9"])+ "." (["0"-"9"])* (<EXPONENT>)? // matches: 5.5 or 5. or 5.5E10 or 5.E10
| "." (["0"-"9"])+ (<EXPONENT>)? // matches: .5 or .5E10
| (["0"-"9"])+ <EXPONENT> // matches: 5E10
@@ -143,7 +143,7 @@ BooleanExpression JmsSelector() :
{
(
left = orExpression()
- )
+ )
{
return asBooleanExpression(left);
}
@@ -157,14 +157,14 @@ Expression orExpression() :
}
{
(
- left = andExpression()
- (
- <OR> right = andExpression()
+ left = andExpression()
+ (
+ <OR> right = andExpression()
{
left = LogicExpression.createOR(asBooleanExpression(left), asBooleanExpression(right));
}
)*
- )
+ )
{
return left;
}
@@ -179,14 +179,14 @@ Expression andExpression() :
}
{
(
- left = equalityExpression()
- (
- <AND> right = equalityExpression()
+ left = equalityExpression()
+ (
+ <AND> right = equalityExpression()
{
left = LogicExpression.createAND(asBooleanExpression(left), asBooleanExpression(right));
}
)*
- )
+ )
{
return left;
}
@@ -199,31 +199,31 @@ Expression equalityExpression() :
}
{
(
- left = comparisonExpression()
- (
-
- "=" right = comparisonExpression()
+ left = comparisonExpression()
+ (
+
+ "=" right = comparisonExpression()
{
left = ComparisonExpression.createEqual(left, right);
}
- |
- "<>" right = comparisonExpression()
+ |
+ "<>" right = comparisonExpression()
{
left = ComparisonExpression.createNotEqual(left, right);
}
- |
+ |
LOOKAHEAD(2)
<IS> <NULL>
{
left = ComparisonExpression.createIsNull(left);
}
- |
+ |
<IS> <NOT> <NULL>
{
left = ComparisonExpression.createIsNotNull(left);
}
)*
- )
+ )
{
return left;
}
@@ -241,33 +241,33 @@ Expression comparisonExpression() :
}
{
(
- left = addExpression()
- (
-
- ">" right = addExpression()
+ left = addExpression()
+ (
+
+ ">" right = addExpression()
{
left = ComparisonExpression.createGreaterThan(left, right);
}
- |
- ">=" right = addExpression()
+ |
+ ">=" right = addExpression()
{
left = ComparisonExpression.createGreaterThanEqual(left, right);
}
- |
- "<" right = addExpression()
+ |
+ "<" right = addExpression()
{
left = ComparisonExpression.createLessThan(left, right);
}
- |
- "<=" right = addExpression()
+ |
+ "<=" right = addExpression()
{
left = ComparisonExpression.createLessThanEqual(left, right);
}
|
{
u=null;
- }
- <LIKE> t = stringLitteral()
+ }
+ <LIKE> t = stringLitteral()
[ <ESCAPE> u = stringLitteral() ]
{
left = ComparisonExpression.createLike(left, t, u);
@@ -276,7 +276,7 @@ Expression comparisonExpression() :
LOOKAHEAD(2)
{
u=null;
- }
+ }
<NOT> <LIKE> t = stringLitteral() [ <ESCAPE> u = stringLitteral() ]
{
left = ComparisonExpression.createNotLike(left, t, u);
@@ -293,20 +293,20 @@ Expression comparisonExpression() :
left = ComparisonExpression.createNotBetween(left, low, high);
}
|
- <IN>
- "("
+ <IN>
+ "("
t = stringLitteral()
{
list = new ArrayList();
list.add( t );
}
- (
+ (
","
- t = stringLitteral()
+ t = stringLitteral()
{
list.add( t );
}
-
+
)*
")"
{
@@ -314,28 +314,28 @@ Expression comparisonExpression() :
}
|
LOOKAHEAD(2)
- <NOT> <IN>
- "("
+ <NOT> <IN>
+ "("
t = stringLitteral()
{
list = new ArrayList();
list.add( t );
}
- (
+ (
","
- t = stringLitteral()
+ t = stringLitteral()
{
list.add( t );
}
-
+
)*
")"
{
left = ComparisonExpression.createNotInFilter(left, list);
}
-
+
)*
- )
+ )
{
return left;
}
@@ -347,21 +347,21 @@ Expression addExpression() :
Expression right;
}
{
- left = multExpr()
- (
+ left = multExpr()
+ (
LOOKAHEAD( ("+"|"-") multExpr())
(
- "+" right = multExpr()
+ "+" right = multExpr()
{
left = ArithmeticExpression.createPlus(left, right);
}
- |
- "-" right = multExpr()
+ |
+ "-" right = multExpr()
{
left = ArithmeticExpression.createMinus(left, right);
}
)
-
+
)*
{
return left;
@@ -374,23 +374,23 @@ Expression multExpr() :
Expression right;
}
{
- left = unaryExpr()
- (
- "*" right = unaryExpr()
+ left = unaryExpr()
+ (
+ "*" right = unaryExpr()
{
left = ArithmeticExpression.createMultiply(left, right);
}
- |
- "/" right = unaryExpr()
+ |
+ "/" right = unaryExpr()
{
left = ArithmeticExpression.createDivide(left, right);
}
- |
- "%" right = unaryExpr()
+ |
+ "%" right = unaryExpr()
{
left = ArithmeticExpression.createMod(left, right);
}
-
+
)*
{
return left;
@@ -447,7 +447,7 @@ Expression primaryExpr() :
left = variable()
|
"(" left = orExpression() ")"
- )
+ )
{
return left;
}
@@ -468,55 +468,55 @@ ConstantExpression literal() :
{
left = new ConstantExpression(s);
}
- )
- |
+ )
+ |
(
t = <DECIMAL_LITERAL>
{
left = ConstantExpression.createFromDecimal(t.image);
- }
- )
- |
+ }
+ )
+ |
(
t = <HEX_LITERAL>
{
left = ConstantExpression.createFromHex(t.image);
- }
- )
- |
+ }
+ )
+ |
(
t = <OCTAL_LITERAL>
{
left = ConstantExpression.createFromOctal(t.image);
- }
- )
- |
+ }
+ )
+ |
(
t = <FLOATING_POINT_LITERAL>
{
left = ConstantExpression.createFloat(t.image);
- }
- )
- |
+ }
+ )
+ |
(
<TRUE>
{
left = ConstantExpression.TRUE;
- }
- )
- |
+ }
+ )
+ |
(
<FALSE>
{
left = ConstantExpression.FALSE;
- }
- )
- |
+ }
+ )
+ |
(
<NULL>
{
left = ConstantExpression.NULL;
- }
+ }
)
)
{
@@ -531,18 +531,18 @@ String stringLitteral() :
boolean first=true;
}
{
- t = <STRING_LITERAL>
+ t = <STRING_LITERAL>
{
// Decode the sting value.
String image = t.image;
for( int i=1; i < image.length()-1; i++ ) {
char c = image.charAt(i);
if( c == '\'' )
- i++;
+ i++;
rc.append(c);
}
return rc.toString();
- }
+ }
}
PropertyExpression variable() :
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/main/javacc/StrictParser.jj
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/javacc/StrictParser.jj b/artemis-selector/src/main/javacc/StrictParser.jj
index bac0075..fff6933 100755
--- a/artemis-selector/src/main/javacc/StrictParser.jj
+++ b/artemis-selector/src/main/javacc/StrictParser.jj
@@ -47,16 +47,16 @@ PARSER_BEGIN(StrictParser)
* limitations under the License.
*/
-package org.apache.activemq.selector.strict;
+package org.apache.activemq.artemis.selector.strict;
import java.io.*;
import java.util.*;
-import org.apache.activemq.selector.filter.*;
+import org.apache.activemq.artemis.selector.filter.*;
-/**
+/**
* JMS Selector Parser generated by JavaCC
- *
+ *
* Do not edit this .java file directly - it is autogenerated from StrictParser.jj
*/
public class StrictParser {
@@ -118,8 +118,8 @@ TOKEN [IGNORE_CASE] :
< DECIMAL_LITERAL: ["1"-"9"] (["0"-"9"])* (["l","L"])? >
| < HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])+ >
- | < OCTAL_LITERAL: "0" (["0"-"7"])* >
- | < FLOATING_POINT_LITERAL:
+ | < OCTAL_LITERAL: "0" (["0"-"7"])* >
+ | < FLOATING_POINT_LITERAL:
(["0"-"9"])+ "." (["0"-"9"])* (<EXPONENT>)? // matches: 5.5 or 5. or 5.5E10 or 5.E10
| "." (["0"-"9"])+ (<EXPONENT>)? // matches: .5 or .5E10
| (["0"-"9"])+ <EXPONENT> // matches: 5E10
@@ -143,7 +143,7 @@ BooleanExpression JmsSelector() :
{
(
left = orExpression()
- )
+ )
{
return asBooleanExpression(left);
}
@@ -157,14 +157,14 @@ Expression orExpression() :
}
{
(
- left = andExpression()
- (
- <OR> right = andExpression()
+ left = andExpression()
+ (
+ <OR> right = andExpression()
{
left = LogicExpression.createOR(asBooleanExpression(left), asBooleanExpression(right));
}
)*
- )
+ )
{
return left;
}
@@ -179,14 +179,14 @@ Expression andExpression() :
}
{
(
- left = equalityExpression()
- (
- <AND> right = equalityExpression()
+ left = equalityExpression()
+ (
+ <AND> right = equalityExpression()
{
left = LogicExpression.createAND(asBooleanExpression(left), asBooleanExpression(right));
}
)*
- )
+ )
{
return left;
}
@@ -199,31 +199,31 @@ Expression equalityExpression() :
}
{
(
- left = comparisonExpression()
- (
-
- "=" right = comparisonExpression()
+ left = comparisonExpression()
+ (
+
+ "=" right = comparisonExpression()
{
left = ComparisonExpression.createEqual(left, right);
}
- |
- "<>" right = comparisonExpression()
+ |
+ "<>" right = comparisonExpression()
{
left = ComparisonExpression.createNotEqual(left, right);
}
- |
+ |
LOOKAHEAD(2)
<IS> <NULL>
{
left = ComparisonExpression.createIsNull(left);
}
- |
+ |
<IS> <NOT> <NULL>
{
left = ComparisonExpression.createIsNotNull(left);
}
)*
- )
+ )
{
return left;
}
@@ -241,33 +241,33 @@ Expression comparisonExpression() :
}
{
(
- left = addExpression()
- (
-
- ">" right = addExpression()
+ left = addExpression()
+ (
+
+ ">" right = addExpression()
{
left = ComparisonExpression.createGreaterThan(left, right);
}
- |
- ">=" right = addExpression()
+ |
+ ">=" right = addExpression()
{
left = ComparisonExpression.createGreaterThanEqual(left, right);
}
- |
- "<" right = addExpression()
+ |
+ "<" right = addExpression()
{
left = ComparisonExpression.createLessThan(left, right);
}
- |
- "<=" right = addExpression()
+ |
+ "<=" right = addExpression()
{
left = ComparisonExpression.createLessThanEqual(left, right);
}
|
{
u=null;
- }
- <LIKE> t = stringLitteral()
+ }
+ <LIKE> t = stringLitteral()
[ <ESCAPE> u = stringLitteral() ]
{
left = ComparisonExpression.createLike(left, t, u);
@@ -276,7 +276,7 @@ Expression comparisonExpression() :
LOOKAHEAD(2)
{
u=null;
- }
+ }
<NOT> <LIKE> t = stringLitteral() [ <ESCAPE> u = stringLitteral() ]
{
left = ComparisonExpression.createNotLike(left, t, u);
@@ -293,20 +293,20 @@ Expression comparisonExpression() :
left = ComparisonExpression.createNotBetween(left, low, high);
}
|
- <IN>
- "("
+ <IN>
+ "("
t = stringLitteral()
{
list = new ArrayList();
list.add( t );
}
- (
+ (
","
- t = stringLitteral()
+ t = stringLitteral()
{
list.add( t );
}
-
+
)*
")"
{
@@ -314,28 +314,28 @@ Expression comparisonExpression() :
}
|
LOOKAHEAD(2)
- <NOT> <IN>
- "("
+ <NOT> <IN>
+ "("
t = stringLitteral()
{
list = new ArrayList();
list.add( t );
}
- (
+ (
","
- t = stringLitteral()
+ t = stringLitteral()
{
list.add( t );
}
-
+
)*
")"
{
left = ComparisonExpression.createNotInFilter(left, list);
}
-
+
)*
- )
+ )
{
return left;
}
@@ -347,21 +347,21 @@ Expression addExpression() :
Expression right;
}
{
- left = multExpr()
- (
+ left = multExpr()
+ (
LOOKAHEAD( ("+"|"-") multExpr())
(
- "+" right = multExpr()
+ "+" right = multExpr()
{
left = ArithmeticExpression.createPlus(left, right);
}
- |
- "-" right = multExpr()
+ |
+ "-" right = multExpr()
{
left = ArithmeticExpression.createMinus(left, right);
}
)
-
+
)*
{
return left;
@@ -374,23 +374,23 @@ Expression multExpr() :
Expression right;
}
{
- left = unaryExpr()
- (
- "*" right = unaryExpr()
+ left = unaryExpr()
+ (
+ "*" right = unaryExpr()
{
left = ArithmeticExpression.createMultiply(left, right);
}
- |
- "/" right = unaryExpr()
+ |
+ "/" right = unaryExpr()
{
left = ArithmeticExpression.createDivide(left, right);
}
- |
- "%" right = unaryExpr()
+ |
+ "%" right = unaryExpr()
{
left = ArithmeticExpression.createMod(left, right);
}
-
+
)*
{
return left;
@@ -447,7 +447,7 @@ Expression primaryExpr() :
left = variable()
|
"(" left = orExpression() ")"
- )
+ )
{
return left;
}
@@ -468,55 +468,55 @@ ConstantExpression literal() :
{
left = new ConstantExpression(s);
}
- )
- |
+ )
+ |
(
t = <DECIMAL_LITERAL>
{
left = ConstantExpression.createFromDecimal(t.image);
- }
- )
- |
+ }
+ )
+ |
(
t = <HEX_LITERAL>
{
left = ConstantExpression.createFromHex(t.image);
- }
- )
- |
+ }
+ )
+ |
(
t = <OCTAL_LITERAL>
{
left = ConstantExpression.createFromOctal(t.image);
- }
- )
- |
+ }
+ )
+ |
(
t = <FLOATING_POINT_LITERAL>
{
left = ConstantExpression.createFloat(t.image);
- }
- )
- |
+ }
+ )
+ |
(
<TRUE>
{
left = ConstantExpression.TRUE;
- }
- )
- |
+ }
+ )
+ |
(
<FALSE>
{
left = ConstantExpression.FALSE;
- }
- )
- |
+ }
+ )
+ |
(
<NULL>
{
left = ConstantExpression.NULL;
- }
+ }
)
)
{
@@ -531,18 +531,18 @@ String stringLitteral() :
boolean first=true;
}
{
- t = <STRING_LITERAL>
+ t = <STRING_LITERAL>
{
// Decode the sting value.
String image = t.image;
for( int i=1; i < image.length()-1; i++ ) {
char c = image.charAt(i);
if( c == '\'' )
- i++;
+ i++;
rc.append(c);
}
return rc.toString();
- }
+ }
}
PropertyExpression variable() :
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorParserTest.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorParserTest.java b/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorParserTest.java
index e48b112..d08c414 100755
--- a/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorParserTest.java
+++ b/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorParserTest.java
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector;
+package org.apache.activemq.artemis.selector;
-import org.apache.activemq.selector.filter.BooleanExpression;
-import org.apache.activemq.selector.filter.ComparisonExpression;
-import org.apache.activemq.selector.filter.Expression;
-import org.apache.activemq.selector.filter.LogicExpression;
-import org.apache.activemq.selector.filter.PropertyExpression;
-import org.apache.activemq.selector.filter.XPathExpression;
-import org.apache.activemq.selector.impl.SelectorParser;
+import org.apache.activemq.artemis.selector.filter.BooleanExpression;
+import org.apache.activemq.artemis.selector.filter.ComparisonExpression;
+import org.apache.activemq.artemis.selector.filter.Expression;
+import org.apache.activemq.artemis.selector.filter.LogicExpression;
+import org.apache.activemq.artemis.selector.filter.PropertyExpression;
+import org.apache.activemq.artemis.selector.filter.XPathExpression;
+import org.apache.activemq.artemis.selector.impl.SelectorParser;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java b/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java
index 0e629de..bc68f81 100755
--- a/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java
+++ b/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.selector;
+package org.apache.activemq.artemis.selector;
import java.util.HashMap;
-import org.apache.activemq.selector.filter.BooleanExpression;
-import org.apache.activemq.selector.filter.FilterException;
-import org.apache.activemq.selector.filter.Filterable;
-import org.apache.activemq.selector.impl.SelectorParser;
+import org.apache.activemq.artemis.selector.filter.BooleanExpression;
+import org.apache.activemq.artemis.selector.filter.FilterException;
+import org.apache.activemq.artemis.selector.filter.Filterable;
+import org.apache.activemq.artemis.selector.impl.SelectorParser;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-server/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml
index a0bc3a4..1ff6856 100644
--- a/artemis-server/pom.xml
+++ b/artemis-server/pom.xml
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-pom</artifactId>
- <version>10.0.0-SNAPSHOT</version>
+ <artifactId>artemis-pom</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>activemq-server</artifactId>
+ <artifactId>artemis-server</artifactId>
<packaging>jar</packaging>
<name>ActiveMQ Artemis Server</name>
@@ -53,22 +53,22 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-commons</artifactId>
+ <artifactId>artemis-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-journal</artifactId>
+ <artifactId>artemis-journal</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core-client</artifactId>
+ <artifactId>artemis-core-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core-client</artifactId>
+ <artifactId>artemis-core-client</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
<scope>test</scope>
@@ -99,7 +99,7 @@
<maxmemory>512m</maxmemory>
<quiet>false</quiet>
<aggregate>true</aggregate>
- <excludePackageNames>org.apache.activemq.core:org.apache.activemq.utils</excludePackageNames>
+ <excludePackageNames>org.apache.activemq.artemis.core:org.apache.activemq.artemis.utils</excludePackageNames>
</configuration>
<executions>
<execution>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-server/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java
index a0dffaa..955f3a2 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.api.core.management;
+package org.apache.activemq.artemis.api.core.management;
import java.text.DateFormat;
import java.util.Date;
-import org.apache.activemq.core.messagecounter.MessageCounter;
-import org.apache.activemq.utils.json.JSONObject;
+import org.apache.activemq.artemis.core.messagecounter.MessageCounter;
+import org.apache.activemq.artemis.utils.json.JSONObject;
/**
* Helper class to create Java Objects from the
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BackupStrategy.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BackupStrategy.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BackupStrategy.java
index 194b22b..1a3740e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BackupStrategy.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BackupStrategy.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.core.config;
+package org.apache.activemq.artemis.core.config;
public enum BackupStrategy
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BridgeConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BridgeConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BridgeConfiguration.java
index 65cb2a4..c4686ac 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BridgeConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BridgeConfiguration.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.core.config;
+package org.apache.activemq.artemis.core.config;
import java.io.Serializable;
import java.util.List;
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
public final class BridgeConfiguration implements Serializable
{
@@ -56,8 +56,6 @@ public final class BridgeConfiguration implements Serializable
private int confirmationWindowSize = ActiveMQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE;
- private int producerWindowSize = ActiveMQDefaultConfiguration.getDefaultBridgeProducerWindowSize();
-
private long clientFailureCheckPeriod = ActiveMQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD;
private String user = ActiveMQDefaultConfiguration.getDefaultClusterUser();
@@ -304,19 +302,6 @@ public final class BridgeConfiguration implements Serializable
return this;
}
- /** The producer flow control on the birdge */
- public BridgeConfiguration setProducerWindowSize(final int producerWindowSize)
- {
- this.producerWindowSize = producerWindowSize;
- return this;
- }
-
- public int getProducerWindowSize()
- {
- return producerWindowSize;
-
- }
-
public long getClientFailureCheckPeriod()
{
return clientFailureCheckPeriod;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/8f52a622/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java
index ea95dd8..bbc3fe7 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.core.config;
+package org.apache.activemq.artemis.core.config;
import java.io.Serializable;
import java.util.Collections;
import java.util.List;
-import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
public final class ClusterConnectionConfiguration implements Serializable
{
@@ -63,8 +63,6 @@ public final class ClusterConnectionConfiguration implements Serializable
private int confirmationWindowSize = ActiveMQDefaultConfiguration.getDefaultClusterConfirmationWindowSize();
- private int producerWindowSize = ActiveMQDefaultConfiguration.getDefaultBridgeProducerWindowSize();
-
private boolean allowDirectConnectionsOnly = false;
private int minLargeMessageSize = ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE;
@@ -200,18 +198,6 @@ public final class ClusterConnectionConfiguration implements Serializable
return this;
}
-
- public int getProducerWindowSize()
- {
- return producerWindowSize;
- }
-
- public ClusterConnectionConfiguration setProducerindowSize(int producerWindowSize)
- {
- this.producerWindowSize = producerWindowSize;
- return this;
- }
-
public List<String> getStaticConnectors()
{
return staticConnectors;