http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationServiceManager.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationServiceManager.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationServiceManager.java index da58b80..6f6b3fb 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationServiceManager.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/DestinationServiceManager.java @@ -14,7 +14,7 @@ package org.apache.activemq.rest.queue; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ActiveMQClient; import org.apache.activemq.api.core.client.ServerLocator; import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; import org.apache.activemq.rest.util.LinkStrategy; @@ -160,7 +160,7 @@ public abstract class DestinationServiceManager { if (locator == null) { - locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(InVMConnectorFactory.class.getName())); + locator = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(InVMConnectorFactory.class.getName())); } if (sessionFactory == null) {
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java index 45e8eff..7894424 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessage.java @@ -34,7 +34,7 @@ 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.ClientSessionFactory; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; import org.apache.activemq.rest.util.HttpMessageHelper; import org.apache.activemq.utils.UUID; import org.apache.activemq.utils.UUIDGenerator; @@ -82,10 +82,10 @@ public class PostMessage try { ClientProducer producer = pooled.producer; - ClientMessage message = createHornetQMessage(headers, body, durable, ttl, expiration, priority, pooled.session); + ClientMessage message = createActiveMQMessage(headers, body, durable, ttl, expiration, priority, pooled.session); message.putStringProperty(ClientMessage.HDR_DUPLICATE_DETECTION_ID.toString(), dup); producer.send(message); - HornetQRestLogger.LOGGER.debug("Sent message: " + message); + ActiveMQRestLogger.LOGGER.debug("Sent message: " + message); pool.add(pooled); } catch (Exception ex) @@ -110,7 +110,7 @@ public class PostMessage @QueryParam("priority") Integer priority, @Context HttpHeaders headers, @Context UriInfo uriInfo, byte[] body) { - HornetQRestLogger.LOGGER.debug("Handling PUT request for \"" + uriInfo.getRequestUri() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling PUT request for \"" + uriInfo.getRequestUri() + "\""); return internalPostWithId(dupId, durable, ttl, expiration, priority, headers, uriInfo, body); } @@ -123,7 +123,7 @@ public class PostMessage @QueryParam("priority") Integer priority, @Context HttpHeaders headers, @Context UriInfo uriInfo, byte[] body) { - HornetQRestLogger.LOGGER.debug("Handling POST request for \"" + uriInfo.getRequestUri() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling POST request for \"" + uriInfo.getRequestUri() + "\""); return internalPostWithId(dupId, durable, ttl, expiration, priority, headers, uriInfo, body); } @@ -261,12 +261,12 @@ public class PostMessage } - protected ClientMessage createHornetQMessage(HttpHeaders headers, byte[] body, - boolean durable, - Long ttl, - Long expiration, - Integer priority, - ClientSession session) throws Exception + protected ClientMessage createActiveMQMessage(HttpHeaders headers, byte[] body, + boolean durable, + Long ttl, + Long expiration, + Integer priority, + ClientSession session) throws Exception { ClientMessage message = session.createMessage(Message.BYTES_TYPE, durable); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java index 60fa2b7..b9b9d9a 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageDupsOk.java @@ -15,7 +15,7 @@ package org.apache.activemq.rest.queue; import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.client.ClientMessage; import org.apache.activemq.api.core.client.ClientProducer; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; import javax.ws.rs.POST; import javax.ws.rs.QueryParam; @@ -45,9 +45,9 @@ public class PostMessageDupsOk extends PostMessage try { ClientProducer producer = pooled.producer; - ClientMessage message = createHornetQMessage(headers, body, durable, ttl, expiration, priority, pooled.session); + ClientMessage message = createActiveMQMessage(headers, body, durable, ttl, expiration, priority, pooled.session); producer.send(message); - HornetQRestLogger.LOGGER.debug("Sent message: " + message); + ActiveMQRestLogger.LOGGER.debug("Sent message: " + message); pool.add(pooled); } catch (Exception ex) @@ -73,7 +73,7 @@ public class PostMessageDupsOk extends PostMessage @Context UriInfo uriInfo, byte[] body) { - HornetQRestLogger.LOGGER.debug("Handling POST request for \"" + uriInfo.getRequestUri() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling POST request for \"" + uriInfo.getRequestUri() + "\""); try { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageNoDups.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageNoDups.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageNoDups.java index 609df82..6f5d17d 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageNoDups.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/PostMessageNoDups.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.rest.queue; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; import javax.ws.rs.POST; import javax.ws.rs.core.Context; @@ -31,7 +31,7 @@ public class PostMessageNoDups extends PostMessage @POST public Response redirectCreation(@Context UriInfo uriInfo) { - HornetQRestLogger.LOGGER.debug("Handling POST request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling POST request for \"" + uriInfo.getPath() + "\""); String id = generateDupId(); Response.ResponseBuilder res = Response.status(Response.Status.TEMPORARY_REDIRECT.getStatusCode()); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java index 618c574..7669727 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueConsumer.java @@ -30,7 +30,7 @@ import org.apache.activemq.api.core.client.ClientMessage; import org.apache.activemq.api.core.client.ClientSession; import org.apache.activemq.api.core.client.ClientSessionFactory; import org.apache.activemq.jms.client.SelectorTranslator; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; import org.apache.activemq.rest.util.Constants; import org.apache.activemq.rest.util.LinkStrategy; @@ -114,7 +114,7 @@ public class QueueConsumer try { consumer.close(); - HornetQRestLogger.LOGGER.debug("Closed consumer: " + consumer); + ActiveMQRestLogger.LOGGER.debug("Closed consumer: " + consumer); } catch (Exception e) { @@ -123,7 +123,7 @@ public class QueueConsumer try { session.close(); - HornetQRestLogger.LOGGER.debug("Closed session: " + session); + ActiveMQRestLogger.LOGGER.debug("Closed session: " + session); } catch (Exception e) { @@ -139,7 +139,7 @@ public class QueueConsumer @PathParam("index") long index, @Context UriInfo info) { - HornetQRestLogger.LOGGER.debug("Handling POST request for \"" + info.getRequestUri() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling POST request for \"" + info.getRequestUri() + "\""); if (closed) { @@ -213,16 +213,16 @@ public class QueueConsumer protected void createSession() throws ActiveMQException { session = factory.createSession(true, true, 0); - HornetQRestLogger.LOGGER.debug("Created session: " + session); + ActiveMQRestLogger.LOGGER.debug("Created session: " + session); if (selector == null) { consumer = session.createConsumer(destination); } else { - consumer = session.createConsumer(destination, SelectorTranslator.convertToHornetQFilterString(selector)); + consumer = session.createConsumer(destination, SelectorTranslator.convertToActiveMQFilterString(selector)); } - HornetQRestLogger.LOGGER.debug("Created consumer: " + consumer); + ActiveMQRestLogger.LOGGER.debug("Created consumer: " + consumer); session.start(); } @@ -238,7 +238,7 @@ public class QueueConsumer m = consumer.receive(timeoutSecs * 1000); } - HornetQRestLogger.LOGGER.debug("Returning message " + m + " from consumer: " + consumer); + ActiveMQRestLogger.LOGGER.debug("Returning message " + m + " from consumer: " + consumer); return m; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java index 7de0945..f47067e 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueDestinationsResource.java @@ -28,11 +28,11 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.jms.client.HornetQDestination; -import org.apache.activemq.jms.client.HornetQQueue; +import org.apache.activemq.jms.client.ActiveMQDestination; +import org.apache.activemq.jms.client.ActiveMQQueue; import org.apache.activemq.jms.server.config.JMSQueueConfiguration; import org.apache.activemq.jms.server.impl.JMSServerConfigParserImpl; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; import org.apache.activemq.rest.queue.push.PushConsumerResource; import org.apache.activemq.rest.queue.push.xml.PushRegistration; import org.apache.activemq.rest.util.Constants; @@ -54,17 +54,17 @@ public class QueueDestinationsResource } @POST - @Consumes("application/hornetq.jms.queue+xml") + @Consumes("application/activemq.jms.queue+xml") public Response createJmsQueue(@Context UriInfo uriInfo, Document document) { - HornetQRestLogger.LOGGER.debug("Handling POST request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling POST request for \"" + uriInfo.getPath() + "\""); try { JMSServerConfigParserImpl parser = new JMSServerConfigParserImpl(); JMSQueueConfiguration queue = parser.parseQueueConfiguration(document.getDocumentElement()); - HornetQQueue hqQueue = HornetQDestination.createQueue(queue.getName()); - String queueName = hqQueue.getAddress(); + ActiveMQQueue activeMQQueue = ActiveMQDestination.createQueue(queue.getName()); + String queueName = activeMQQueue.getAddress(); ClientSession session = manager.getSessionFactory().createSession(false, false, false); try { @@ -101,7 +101,7 @@ public class QueueDestinationsResource { for (String binding : queue.getBindings()) { - manager.getRegistry().bind(binding, hqQueue); + manager.getRegistry().bind(binding, activeMQQueue); } } URI uri = uriInfo.getRequestUriBuilder().path(queueName).build(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueResource.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueResource.java index c46ebaa..1ad264d 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueResource.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/QueueResource.java @@ -25,7 +25,7 @@ import javax.ws.rs.core.UriInfo; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; import org.apache.activemq.rest.queue.push.PushConsumerResource; /** @@ -53,7 +53,7 @@ public class QueueResource extends DestinationResource @Produces("application/xml") public Response get(@Context UriInfo uriInfo, @Context HttpServletRequest requestContext) { - HornetQRestLogger.LOGGER.debug("Handling GET request for \"" + destination + "\" from " + requestContext.getRemoteAddr() + ":" + requestContext.getRemotePort()); + ActiveMQRestLogger.LOGGER.debug("Handling GET request for \"" + destination + "\" from " + requestContext.getRemoteAddr() + ":" + requestContext.getRemotePort()); StringBuilder msg = new StringBuilder(); msg.append("<queue>") @@ -77,7 +77,7 @@ public class QueueResource extends DestinationResource @Produces("application/xml") public Response head(@Context UriInfo uriInfo) { - HornetQRestLogger.LOGGER.debug("Handling HEAD request for \"" + uriInfo.getRequestUri() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling HEAD request for \"" + uriInfo.getRequestUri() + "\""); Response.ResponseBuilder builder = Response.ok(); setSenderLink(builder, uriInfo); @@ -183,7 +183,7 @@ public class QueueResource extends DestinationResource @DELETE public void deleteQueue(@Context UriInfo uriInfo) throws Exception { - HornetQRestLogger.LOGGER.debug("Handling DELETE request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling DELETE request for \"" + uriInfo.getPath() + "\""); queueDestinationsResource.getQueues().remove(destination); stop(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/ActiveMQPushStrategy.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/ActiveMQPushStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/ActiveMQPushStrategy.java new file mode 100644 index 0000000..adccf87 --- /dev/null +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/ActiveMQPushStrategy.java @@ -0,0 +1,87 @@ +/* + * Copyright 2005-2014 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.apache.activemq.rest.queue.push; + +import org.apache.activemq.api.core.client.ClientMessage; +import org.apache.activemq.rest.queue.push.xml.XmlHttpHeader; +import org.jboss.resteasy.client.ClientRequest; +import org.jboss.resteasy.client.ClientResponse; +import org.jboss.resteasy.specimpl.ResteasyUriBuilder; +import org.jboss.resteasy.spi.Link; + +/** + * Forwarding to a ActiveMQ/REST-* endpoing + * + * @author <a href="mailto:[email protected]";>Bill Burke</a> + * @version $Revision: 1 $ + */ +public class ActiveMQPushStrategy extends UriTemplateStrategy +{ + protected boolean initialized = false; + + public void start() throws Exception + { + // initialize(); + } + + protected void initialize() throws Exception + { + super.start(); + initialized = true; + initAuthentication(); + ClientRequest request = executor.createRequest(registration.getTarget().getHref()); + for (XmlHttpHeader header : registration.getHeaders()) + { + request.header(header.getName(), header.getValue()); + } + ClientResponse<?> res = request.head(); + if (res.getStatus() != 200) + { + throw new RuntimeException("Failed to query ActiveMQ REST destination for init information. Status: " + res.getStatus()); + } + String url = (String)res.getHeaders().getFirst("msg-create-with-id"); + if (url == null) + { + if (res.getLinkHeader() == null) + { + throw new RuntimeException("Could not find create-with-id URL"); + } + Link link = res.getLinkHeader().getLinkByTitle("create-with-id"); + if (link == null) + { + throw new RuntimeException("Could not find create-with-id URL"); + } + url = link.getHref(); + } + targetUri = ResteasyUriBuilder.fromTemplate(url); + } + + @Override + public boolean push(ClientMessage message) + { + // we initialize lazily just in case target is in same VM + if (!initialized) + { + try + { + initialize(); + initialized = true; + } + catch (Exception e) + { + throw new RuntimeException("Failed to initialize.", e); + } + } + return super.push(message); + } +} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/FilePushStore.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/FilePushStore.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/FilePushStore.java index 707ef19..d230e2b 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/FilePushStore.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/FilePushStore.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; import org.apache.activemq.rest.queue.push.xml.PushRegistration; import org.apache.activemq.rest.topic.PushTopicRegistration; @@ -41,7 +41,7 @@ public class FilePushStore implements PushStore this.ctx = JAXBContext.newInstance(PushRegistration.class, PushTopicRegistration.class); if (this.dir.exists()) { - HornetQRestLogger.LOGGER.loadingRestStore(dir.getAbsolutePath()); + ActiveMQRestLogger.LOGGER.loadingRestStore(dir.getAbsolutePath()); for (File file : this.dir.listFiles()) { if (!file.isFile()) continue; @@ -50,12 +50,12 @@ public class FilePushStore implements PushStore { reg = (PushRegistration)ctx.createUnmarshaller().unmarshal(file); reg.setLoadedFrom(file); - HornetQRestLogger.LOGGER.addingPushRegistration(reg.getId()); + ActiveMQRestLogger.LOGGER.addingPushRegistration(reg.getId()); map.put(reg.getId(), reg); } catch (Exception e) { - HornetQRestLogger.LOGGER.errorLoadingStore(e, file.getName()); + ActiveMQRestLogger.LOGGER.errorLoadingStore(e, file.getName()); } } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/HornetQPushStrategy.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/HornetQPushStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/HornetQPushStrategy.java deleted file mode 100644 index f93a499..0000000 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/HornetQPushStrategy.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq.rest.queue.push; - -import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.rest.queue.push.xml.XmlHttpHeader; -import org.jboss.resteasy.client.ClientRequest; -import org.jboss.resteasy.client.ClientResponse; -import org.jboss.resteasy.specimpl.ResteasyUriBuilder; -import org.jboss.resteasy.spi.Link; - -/** - * Forwarding to a HornetQ/REST-* endpoing - * - * @author <a href="mailto:[email protected]";>Bill Burke</a> - * @version $Revision: 1 $ - */ -public class HornetQPushStrategy extends UriTemplateStrategy -{ - protected boolean initialized = false; - - public void start() throws Exception - { - // initialize(); - } - - protected void initialize() throws Exception - { - super.start(); - initialized = true; - initAuthentication(); - ClientRequest request = executor.createRequest(registration.getTarget().getHref()); - for (XmlHttpHeader header : registration.getHeaders()) - { - request.header(header.getName(), header.getValue()); - } - ClientResponse<?> res = request.head(); - if (res.getStatus() != 200) - { - throw new RuntimeException("Failed to query HornetQ REST destination for init information. Status: " + res.getStatus()); - } - String url = (String)res.getHeaders().getFirst("msg-create-with-id"); - if (url == null) - { - if (res.getLinkHeader() == null) - { - throw new RuntimeException("Could not find create-with-id URL"); - } - Link link = res.getLinkHeader().getLinkByTitle("create-with-id"); - if (link == null) - { - throw new RuntimeException("Could not find create-with-id URL"); - } - url = link.getHref(); - } - targetUri = ResteasyUriBuilder.fromTemplate(url); - } - - @Override - public boolean push(ClientMessage message) - { - // we initialize lazily just in case target is in same VM - if (!initialized) - { - try - { - initialize(); - initialized = true; - } - catch (Exception e) - { - throw new RuntimeException("Failed to initialize.", e); - } - } - return super.push(message); - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java index b8671a4..432e737 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumer.java @@ -17,7 +17,7 @@ import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientSession; import org.apache.activemq.api.core.client.ClientSessionFactory; import org.apache.activemq.jms.client.SelectorTranslator; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; import org.apache.activemq.rest.queue.push.xml.PushRegistration; import java.util.ArrayList; @@ -73,7 +73,7 @@ public class PushConsumer { if (registration.getTarget().getRelationship().equals("destination")) { - strategy = new HornetQPushStrategy(); + strategy = new ActiveMQPushStrategy(); } else if (registration.getTarget().getRelationship().equals("template")) { @@ -98,7 +98,7 @@ public class PushConsumer if (registration.getSelector() != null) { - consumer = session.createConsumer(destination, SelectorTranslator.convertToHornetQFilterString(registration.getSelector())); + consumer = session.createConsumer(destination, SelectorTranslator.convertToActiveMQFilterString(registration.getSelector())); } else { @@ -106,7 +106,7 @@ public class PushConsumer } consumer.setMessageHandler(new PushConsumerMessageHandler(this, session)); session.start(); - HornetQRestLogger.LOGGER.startingPushConsumer(registration.getTarget()); + ActiveMQRestLogger.LOGGER.startingPushConsumer(registration.getTarget()); consumers.add(consumer); sessions.add(session); @@ -154,7 +154,7 @@ public class PushConsumer } catch (Exception e) { - HornetQRestLogger.LOGGER.errorUpdatingStore(e); + ActiveMQRestLogger.LOGGER.errorUpdatingStore(e); } stop(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java index 04961ec..421e554 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerMessageHandler.java @@ -16,7 +16,7 @@ import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.client.ClientMessage; import org.apache.activemq.api.core.client.ClientSession; import org.apache.activemq.api.core.client.MessageHandler; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; public class PushConsumerMessageHandler implements MessageHandler { @@ -32,26 +32,26 @@ public class PushConsumerMessageHandler implements MessageHandler @Override public void onMessage(ClientMessage clientMessage) { - HornetQRestLogger.LOGGER.debug(this + ": receiving " + clientMessage); + ActiveMQRestLogger.LOGGER.debug(this + ": receiving " + clientMessage); try { clientMessage.acknowledge(); - HornetQRestLogger.LOGGER.debug(this + ": acknowledged " + clientMessage); + ActiveMQRestLogger.LOGGER.debug(this + ": acknowledged " + clientMessage); } catch (ActiveMQException e) { throw new RuntimeException(e.getMessage(), e); } - HornetQRestLogger.LOGGER.debug(this + ": pushing " + clientMessage + " via " + pushConsumer.getStrategy()); + ActiveMQRestLogger.LOGGER.debug(this + ": pushing " + clientMessage + " via " + pushConsumer.getStrategy()); boolean acknowledge = pushConsumer.getStrategy().push(clientMessage); if (acknowledge) { try { - HornetQRestLogger.LOGGER.debug("Acknowledging: " + clientMessage.getMessageID()); + ActiveMQRestLogger.LOGGER.debug("Acknowledging: " + clientMessage.getMessageID()); session.commit(); return; } @@ -72,7 +72,7 @@ public class PushConsumerMessageHandler implements MessageHandler } if (pushConsumer.getRegistration().isDisableOnFailure()) { - HornetQRestLogger.LOGGER.errorPushingMessage(pushConsumer.getRegistration().getTarget()); + ActiveMQRestLogger.LOGGER.errorPushingMessage(pushConsumer.getRegistration().getTarget()); pushConsumer.disableFromFailure(); return; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerResource.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerResource.java index aa13dd1..6669a53 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerResource.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushConsumerResource.java @@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; import org.apache.activemq.rest.queue.push.xml.PushRegistration; /** @@ -80,7 +80,7 @@ public class PushConsumerResource @Consumes("application/xml") public Response create(@Context UriInfo uriInfo, PushRegistration registration) { - HornetQRestLogger.LOGGER.debug("Handling POST request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling POST request for \"" + uriInfo.getPath() + "\""); // todo put some logic here to check for duplicates String genId = sessionCounter.getAndIncrement() + "-" + startup; @@ -112,7 +112,7 @@ public class PushConsumerResource @Produces("application/xml") public PushRegistration getConsumer(@Context UriInfo uriInfo, @PathParam("consumer-id") String consumerId) { - HornetQRestLogger.LOGGER.debug("Handling GET request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling GET request for \"" + uriInfo.getPath() + "\""); PushConsumer consumer = consumers.get(consumerId); if (consumer == null) @@ -126,7 +126,7 @@ public class PushConsumerResource @Path("{consumer-id}") public void deleteConsumer(@Context UriInfo uriInfo, @PathParam("consumer-id") String consumerId) { - HornetQRestLogger.LOGGER.debug("Handling DELETE request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling DELETE request for \"" + uriInfo.getPath() + "\""); PushConsumer consumer = consumers.remove(consumerId); if (consumer == null) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStrategy.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStrategy.java index 1437655..e58a4f6 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStrategy.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/PushStrategy.java @@ -24,7 +24,7 @@ public interface PushStrategy /** * Return false if unable to connect. Push consumer may be disabled if configured to do so when * unable to connect. Throw an exception if the message sent was unaccepted by the receiver. - * Hornetq's retry and dead letter logic will take over from there. + * ActiveMQ's retry and dead letter logic will take over from there. * * @param message * @return {@code false} if unable to connect http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriStrategy.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriStrategy.java b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriStrategy.java index 3137c19..82fe8e1 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriStrategy.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/queue/push/UriStrategy.java @@ -34,7 +34,7 @@ import org.apache.http.protocol.BasicHttpContext; import org.apache.http.protocol.ExecutionContext; import org.apache.http.protocol.HttpContext; import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; import org.apache.activemq.rest.queue.push.xml.BasicAuth; import org.apache.activemq.rest.queue.push.xml.PushRegistration; import org.apache.activemq.rest.queue.push.xml.XmlHttpHeader; @@ -110,7 +110,7 @@ public class UriStrategy implements PushStrategy public boolean push(ClientMessage message) { - HornetQRestLogger.LOGGER.debug("Pushing " + message); + ActiveMQRestLogger.LOGGER.debug("Pushing " + message); String uri = createUri(message); for (int i = 0; i < registration.getMaxRetries(); i++) { @@ -118,21 +118,21 @@ public class UriStrategy implements PushStrategy System.out.println("Creating request from " + uri); ClientRequest request = executor.createRequest(uri); request.followRedirects(false); - HornetQRestLogger.LOGGER.debug("Created request " + request); + ActiveMQRestLogger.LOGGER.debug("Created request " + request); for (XmlHttpHeader header : registration.getHeaders()) { - HornetQRestLogger.LOGGER.debug("Setting XmlHttpHeader: " + header.getName() + "=" + header.getValue()); + ActiveMQRestLogger.LOGGER.debug("Setting XmlHttpHeader: " + header.getName() + "=" + header.getValue()); request.header(header.getName(), header.getValue()); } HttpMessageHelper.buildMessage(message, request, contentType); ClientResponse<?> res = null; try { - HornetQRestLogger.LOGGER.debug(method + " " + uri); + ActiveMQRestLogger.LOGGER.debug(method + " " + uri); res = request.httpMethod(method); int status = res.getStatus(); - HornetQRestLogger.LOGGER.debug("Status of push: " + status); + ActiveMQRestLogger.LOGGER.debug("Status of push: " + status); if (status == 503) { String retryAfter = res.getStringHeaders().getFirst("Retry-After"); @@ -148,7 +148,7 @@ public class UriStrategy implements PushStrategy } else if ((status >= 200 && status < 299) || status == 303 || status == 304) { - HornetQRestLogger.LOGGER.debug("Success"); + ActiveMQRestLogger.LOGGER.debug("Success"); return true; } else if (status >= 400) @@ -184,7 +184,7 @@ public class UriStrategy implements PushStrategy } catch (Exception e) { - HornetQRestLogger.LOGGER.debug("failed to push message to " + uri, e); + ActiveMQRestLogger.LOGGER.debug("failed to push message to " + uri, e); e.printStackTrace(); return false; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java index 82c17e2..cf4d672 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscription.java @@ -15,7 +15,7 @@ package org.apache.activemq.rest.topic; import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.client.ClientSession; import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; import org.apache.activemq.rest.queue.push.PushConsumer; import org.apache.activemq.rest.queue.push.PushStore; import org.apache.activemq.rest.queue.push.xml.PushRegistration; @@ -50,7 +50,7 @@ public class PushSubscription extends PushConsumer } catch (ActiveMQException e) { - HornetQRestLogger.LOGGER.errorDeletingSubscriberQueue(e); + ActiveMQRestLogger.LOGGER.errorDeletingSubscriberQueue(e); } finally { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java index d97e010..a376100 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/PushSubscriptionsResource.java @@ -16,7 +16,7 @@ import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientSession; import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; import org.apache.activemq.rest.queue.push.PushConsumer; import javax.ws.rs.DELETE; @@ -141,7 +141,7 @@ public class PushSubscriptionsResource @POST public Response create(@Context UriInfo uriInfo, PushTopicRegistration registration) { - HornetQRestLogger.LOGGER.debug("Handling POST request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling POST request for \"" + uriInfo.getPath() + "\""); //System.out.println("PushRegistration: " + registration); // todo put some logic here to check for duplicates @@ -186,7 +186,7 @@ public class PushSubscriptionsResource @Produces("application/xml") public PushTopicRegistration getConsumer(@Context UriInfo uriInfo, @PathParam("consumer-id") String consumerId) { - HornetQRestLogger.LOGGER.debug("Handling GET request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling GET request for \"" + uriInfo.getPath() + "\""); PushConsumer consumer = consumers.get(consumerId); if (consumer == null) @@ -200,7 +200,7 @@ public class PushSubscriptionsResource @Path("{consumer-id}") public void deleteConsumer(@Context UriInfo uriInfo, @PathParam("consumer-id") String consumerId) { - HornetQRestLogger.LOGGER.debug("Handling DELETE request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling DELETE request for \"" + uriInfo.getPath() + "\""); PushConsumer consumer = consumers.remove(consumerId); if (consumer == null) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java index a501e29..53a2eee 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/SubscriptionsResource.java @@ -32,7 +32,7 @@ import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientSession; import org.apache.activemq.api.core.client.ClientSessionFactory; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; import org.apache.activemq.rest.queue.AcknowledgedQueueConsumer; import org.apache.activemq.rest.queue.Acknowledgement; import org.apache.activemq.rest.queue.DestinationServiceManager; @@ -100,7 +100,7 @@ public class SubscriptionsResource implements TimeoutTask.Callback if (consumer == null) return false; if (System.currentTimeMillis() - consumer.getLastPingTime() > subscription.getTimeout()) { - HornetQRestLogger.LOGGER.shutdownRestSubscription(consumer.getId()); + ActiveMQRestLogger.LOGGER.shutdownRestSubscription(consumer.getId()); if (autoShutdown) { shutdown(consumer); @@ -160,7 +160,7 @@ public class SubscriptionsResource implements TimeoutTask.Callback @FormParam("idle-timeout") Long timeout, @Context UriInfo uriInfo) { - HornetQRestLogger.LOGGER.debug("Handling POST request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling POST request for \"" + uriInfo.getPath() + "\""); if (timeout == null) timeout = Long.valueOf(consumerTimeoutSeconds * 1000); @@ -289,7 +289,7 @@ public class SubscriptionsResource implements TimeoutTask.Callback public Response getAutoAckSubscription(@PathParam("consumer-id") String consumerId, @Context UriInfo uriInfo) throws Exception { - HornetQRestLogger.LOGGER.debug("Handling GET request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling GET request for \"" + uriInfo.getPath() + "\""); return internalHeadAutoAckSubscription(uriInfo, consumerId); } @@ -299,7 +299,7 @@ public class SubscriptionsResource implements TimeoutTask.Callback public Response headAutoAckSubscription(@PathParam("consumer-id") String consumerId, @Context UriInfo uriInfo) throws Exception { - HornetQRestLogger.LOGGER.debug("Handling HEAD request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling HEAD request for \"" + uriInfo.getPath() + "\""); return internalHeadAutoAckSubscription(uriInfo, consumerId); } @@ -340,7 +340,7 @@ public class SubscriptionsResource implements TimeoutTask.Callback public Response getAcknowledgedConsumer(@PathParam("consumer-id") String consumerId, @Context UriInfo uriInfo) throws Exception { - HornetQRestLogger.LOGGER.debug("Handling GET request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling GET request for \"" + uriInfo.getPath() + "\""); return internalHeadAcknowledgedConsumer(uriInfo, consumerId); } @@ -350,7 +350,7 @@ public class SubscriptionsResource implements TimeoutTask.Callback public Response headAcknowledgedConsumer(@PathParam("consumer-id") String consumerId, @Context UriInfo uriInfo) throws Exception { - HornetQRestLogger.LOGGER.debug("Handling HEAD request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling HEAD request for \"" + uriInfo.getPath() + "\""); return internalHeadAcknowledgedConsumer(uriInfo, consumerId); } @@ -461,7 +461,7 @@ public class SubscriptionsResource implements TimeoutTask.Callback @DELETE public void deleteAckSubscription(@Context UriInfo uriInfo, @PathParam("subscription-id") String consumerId) { - HornetQRestLogger.LOGGER.debug("Handling DELETE request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling DELETE request for \"" + uriInfo.getPath() + "\""); internalDeleteSubscription(consumerId); } @@ -470,7 +470,7 @@ public class SubscriptionsResource implements TimeoutTask.Callback @DELETE public void deleteSubscription(@Context UriInfo uriInfo, @PathParam("subscription-id") String consumerId) { - HornetQRestLogger.LOGGER.debug("Handling DELETE request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling DELETE request for \"" + uriInfo.getPath() + "\""); internalDeleteSubscription(consumerId); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java index 8a0168a..80499fd 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicDestinationsResource.java @@ -28,11 +28,11 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.jms.client.HornetQDestination; -import org.apache.activemq.jms.client.HornetQTopic; +import org.apache.activemq.jms.client.ActiveMQDestination; +import org.apache.activemq.jms.client.ActiveMQTopic; import org.apache.activemq.jms.server.config.TopicConfiguration; import org.apache.activemq.jms.server.impl.JMSServerConfigParserImpl; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; import org.apache.activemq.rest.queue.DestinationSettings; import org.apache.activemq.rest.queue.PostMessage; import org.apache.activemq.rest.queue.PostMessageDupsOk; @@ -55,17 +55,17 @@ public class TopicDestinationsResource } @POST - @Consumes("application/hornetq.jms.topic+xml") + @Consumes("application/activemq.jms.topic+xml") public Response createJmsQueue(@Context UriInfo uriInfo, Document document) { - HornetQRestLogger.LOGGER.debug("Handling POST request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling POST request for \"" + uriInfo.getPath() + "\""); try { JMSServerConfigParserImpl parser = new JMSServerConfigParserImpl(); TopicConfiguration topic = parser.parseTopicConfiguration(document.getDocumentElement()); - HornetQTopic hqTopic = HornetQDestination.createTopic(topic.getName()); - String topicName = hqTopic.getAddress(); + ActiveMQTopic activeMQTopic = ActiveMQDestination.createTopic(topic.getName()); + String topicName = activeMQTopic.getAddress(); ClientSession session = manager.getSessionFactory().createSession(false, false, false); try { @@ -95,7 +95,7 @@ public class TopicDestinationsResource { for (String binding : topic.getBindings()) { - manager.getRegistry().bind(binding, hqTopic); + manager.getRegistry().bind(binding, activeMQTopic); } } URI uri = uriInfo.getRequestUriBuilder().path(topicName).build(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicResource.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicResource.java b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicResource.java index 61c2481..c5ef33f 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicResource.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/topic/TopicResource.java @@ -24,7 +24,7 @@ import javax.ws.rs.core.UriInfo; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientSession; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; import org.apache.activemq.rest.queue.DestinationResource; import org.apache.activemq.rest.queue.PostMessage; @@ -53,7 +53,7 @@ public class TopicResource extends DestinationResource @Produces("application/xml") public Response get(@Context UriInfo uriInfo) { - HornetQRestLogger.LOGGER.debug("Handling GET request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling GET request for \"" + uriInfo.getPath() + "\""); StringBuilder msg = new StringBuilder(); msg.append("<topic>") @@ -77,7 +77,7 @@ public class TopicResource extends DestinationResource @Produces("application/xml") public Response head(@Context UriInfo uriInfo) { - HornetQRestLogger.LOGGER.debug("Handling HEAD request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling HEAD request for \"" + uriInfo.getPath() + "\""); Response.ResponseBuilder builder = Response.ok(); setSenderLink(builder, uriInfo); @@ -176,7 +176,7 @@ public class TopicResource extends DestinationResource @DELETE public void deleteTopic(@Context UriInfo uriInfo) throws Exception { - HornetQRestLogger.LOGGER.debug("Handling DELETE request for \"" + uriInfo.getPath() + "\""); + ActiveMQRestLogger.LOGGER.debug("Handling DELETE request for \"" + uriInfo.getPath() + "\""); topicDestinationsResource.getTopics().remove(destination); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/util/HttpMessageHelper.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/util/HttpMessageHelper.java b/activemq-rest/src/main/java/org/apache/activemq/rest/util/HttpMessageHelper.java index 920df23..0d12f3c 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/util/HttpMessageHelper.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/util/HttpMessageHelper.java @@ -14,7 +14,7 @@ package org.apache.activemq.rest.util; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientMessage; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; import org.apache.activemq.rest.HttpHeaderProperty; import org.jboss.resteasy.client.ClientRequest; @@ -93,12 +93,12 @@ public class HttpMessageHelper String value = message.getStringProperty(k); request.header(headerName, value); - HornetQRestLogger.LOGGER.debug("Examining " + headerName + ": " + value); + ActiveMQRestLogger.LOGGER.debug("Examining " + headerName + ": " + value); // override default content type if it is set as a message property if (headerName.equalsIgnoreCase("content-type")) { contentType = value; - HornetQRestLogger.LOGGER.debug("Using contentType: " + contentType); + ActiveMQRestLogger.LOGGER.debug("Using contentType: " + contentType); } } int size = message.getBodySize(); @@ -109,12 +109,12 @@ public class HttpMessageHelper { byte[] body = new byte[size]; message.getBodyBuffer().readBytes(body); - HornetQRestLogger.LOGGER.debug("Building Message from HTTP message"); + ActiveMQRestLogger.LOGGER.debug("Building Message from HTTP message"); request.body(contentType, body); } else { - // assume posted as a JMS or HornetQ object message + // assume posted as a JMS or ActiveMQ object message size = message.getBodyBuffer().readInt(); byte[] body = new byte[size]; message.getBodyBuffer().readBytes(body); @@ -124,7 +124,7 @@ public class HttpMessageHelper { ObjectInputStream ois = new ObjectInputStream(bais); obj = ois.readObject(); - HornetQRestLogger.LOGGER.debug("**** Building Message from object: " + obj.toString()); + ActiveMQRestLogger.LOGGER.debug("**** Building Message from object: " + obj.toString()); request.body(contentType, obj); } catch (Exception e) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/main/java/org/apache/activemq/rest/util/TimeoutTask.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/main/java/org/apache/activemq/rest/util/TimeoutTask.java b/activemq-rest/src/main/java/org/apache/activemq/rest/util/TimeoutTask.java index d371aa2..363a9cf 100644 --- a/activemq-rest/src/main/java/org/apache/activemq/rest/util/TimeoutTask.java +++ b/activemq-rest/src/main/java/org/apache/activemq/rest/util/TimeoutTask.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.activemq.rest.HornetQRestLogger; +import org.apache.activemq.rest.ActiveMQRestLogger; /** * @author <a href="mailto:[email protected]";>Bill Burke</a> @@ -153,7 +153,7 @@ public class TimeoutTask implements Runnable liveConsumers += 1; } } - HornetQRestLogger.LOGGER.debug("Finished testing callbacks for timeouts in " + + ActiveMQRestLogger.LOGGER.debug("Finished testing callbacks for timeouts in " + (System.currentTimeMillis() - startTime) + "ms. " + "(Live: " + liveConsumers + ", Expired: " + deadConsumers + ")"); @@ -163,7 +163,7 @@ public class TimeoutTask implements Runnable { if (pendingCallbacks.size() > 0) { - HornetQRestLogger.LOGGER.debug("Found " + pendingCallbacks.size() + " callbacks to add."); + ActiveMQRestLogger.LOGGER.debug("Found " + pendingCallbacks.size() + " callbacks to add."); callbacks.putAll(pendingCallbacks); pendingCallbacks.clear(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/test/java/org/apache/activemq/rest/test/CreateDestinationTest.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/CreateDestinationTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/CreateDestinationTest.java index d0d0e60..5692f9c 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/CreateDestinationTest.java +++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/CreateDestinationTest.java @@ -38,7 +38,7 @@ public class CreateDestinationTest extends MessageTestBase { String queueConfig = "<queue name=\"testQueue\"><durable>true</durable></queue>"; ClientRequest create = new ClientRequest(TestPortProvider.generateURL("/queues")); - ClientResponse cRes = create.body("application/hornetq.jms.queue+xml", queueConfig).post(); + ClientResponse cRes = create.body("application/activemq.jms.queue+xml", queueConfig).post(); cRes.releaseConnection(); Assert.assertEquals(201, cRes.getStatus()); System.out.println("Location: " + cRes.getLocationLink()); @@ -93,7 +93,7 @@ public class CreateDestinationTest extends MessageTestBase { String queueConfig = "<topic name=\"testTopic\"></topic>"; ClientRequest create = new ClientRequest(TestPortProvider.generateURL("/topics")); - ClientResponse cRes = create.body("application/hornetq.jms.topic+xml", queueConfig).post(); + ClientResponse cRes = create.body("application/activemq.jms.topic+xml", queueConfig).post(); cRes.releaseConnection(); Assert.assertEquals(201, cRes.getStatus()); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/test/java/org/apache/activemq/rest/test/Embedded.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/Embedded.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/Embedded.java index e31c090..f3fdcb4 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/Embedded.java +++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/Embedded.java @@ -16,8 +16,8 @@ import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.core.config.Configuration; import org.apache.activemq.core.config.impl.ConfigurationImpl; import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq.core.server.HornetQServer; -import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.core.server.ActiveMQServer; +import org.apache.activemq.core.server.ActiveMQServers; import org.jboss.resteasy.plugins.server.tjws.TJWSEmbeddedJaxrsServer; import org.apache.activemq.rest.MessageServiceConfiguration; import org.apache.activemq.rest.MessageServiceManager; @@ -31,7 +31,7 @@ public class Embedded { protected MessageServiceManager manager = new MessageServiceManager(); protected MessageServiceConfiguration config = new MessageServiceConfiguration(); - protected HornetQServer hornetqServer; + protected ActiveMQServer activeMQServer; protected TJWSEmbeddedJaxrsServer tjws = new TJWSEmbeddedJaxrsServer(); public Embedded() @@ -53,14 +53,14 @@ public class Embedded this.config = config; } - public HornetQServer getHornetqServer() + public ActiveMQServer getActiveMQServer() { - return hornetqServer; + return activeMQServer; } - public void setHornetqServer(HornetQServer hornetqServer) + public void setActiveMQServer(ActiveMQServer activeMQServer) { - this.hornetqServer = hornetqServer; + this.activeMQServer = activeMQServer; } public TJWSEmbeddedJaxrsServer getJaxrsServer() @@ -76,15 +76,15 @@ public class Embedded public void start() throws Exception { System.out.println("\nStarting Embedded"); - if (hornetqServer == null) + if (activeMQServer == null) { Configuration configuration = new ConfigurationImpl() .setPersistenceEnabled(false) .setSecurityEnabled(false) .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - hornetqServer = HornetQServers.newHornetQServer(configuration); - hornetqServer.start(); + activeMQServer = ActiveMQServers.newActiveMQServer(configuration); + activeMQServer.start(); } tjws.start(); manager.setConfiguration(config); @@ -99,6 +99,6 @@ public class Embedded System.out.println("\nStopping Embedded"); manager.stop(); tjws.stop(); - hornetqServer.stop(); + activeMQServer.stop(); } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/test/java/org/apache/activemq/rest/test/EmbeddedTest.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/EmbeddedTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/EmbeddedTest.java index b2421f7..5b210f3 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/EmbeddedTest.java +++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/EmbeddedTest.java @@ -21,7 +21,7 @@ import javax.jms.Session; import java.io.Serializable; import org.apache.activemq.rest.HttpHeaderProperty; -import org.apache.activemq.rest.integration.EmbeddedRestHornetQJMS; +import org.apache.activemq.rest.integration.EmbeddedRestActiveMQJMS; import org.apache.activemq.spi.core.naming.BindingRegistry; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; @@ -37,13 +37,13 @@ import org.junit.Test; */ public class EmbeddedTest { - public static EmbeddedRestHornetQJMS server; + public static EmbeddedRestActiveMQJMS server; @BeforeClass public static void startEmbedded() throws Exception { - server = new EmbeddedRestHornetQJMS(); - server.getManager().setConfigResourcePath("hornetq-rest.xml"); + server = new EmbeddedRestActiveMQJMS(); + server.getManager().setConfigResourcePath("activemq-rest.xml"); server.start(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/test/java/org/apache/activemq/rest/test/FindDestinationTest.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/FindDestinationTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/FindDestinationTest.java index d4b300b..7582daf 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/FindDestinationTest.java +++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/FindDestinationTest.java @@ -29,7 +29,7 @@ public class FindDestinationTest extends MessageTestBase public void testFindQueue() throws Exception { String testName = "testFindQueue"; - server.getHornetqServer().createQueue(new SimpleString(testName), new SimpleString(testName), null, false, false); + server.getActiveMQServer().createQueue(new SimpleString(testName), new SimpleString(testName), null, false, false); ClientRequest request = new ClientRequest(TestPortProvider.generateURL("/queues/" + testName)); @@ -60,7 +60,7 @@ public class FindDestinationTest extends MessageTestBase @Test public void testFindTopic() throws Exception { - server.getHornetqServer().createQueue(new SimpleString("testTopic"), new SimpleString("testTopic"), null, false, false); + server.getActiveMQServer().createQueue(new SimpleString("testTopic"), new SimpleString("testTopic"), null, false, false); ClientRequest request = new ClientRequest(TestPortProvider.generateURL("/topics/testTopic")); ClientResponse<?> response = request.head(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/test/java/org/apache/activemq/rest/test/JMSTest.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/JMSTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/JMSTest.java index 972078d..635365b 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/JMSTest.java +++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/JMSTest.java @@ -26,8 +26,8 @@ import java.io.Serializable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq.jms.client.HornetQDestination; -import org.apache.activemq.jms.client.HornetQJMSConnectionFactory; +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.Jms; import org.apache.activemq.rest.queue.QueueDeployment; @@ -51,7 +51,7 @@ public class JMSTest extends MessageTestBase @BeforeClass public static void setup() throws Exception { - connectionFactory = new HornetQJMSConnectionFactory(manager.getQueueManager().getServerLocator()); + connectionFactory = new ActiveMQJMSConnectionFactory(manager.getQueueManager().getServerLocator()); } @XmlRootElement @@ -118,7 +118,7 @@ public class JMSTest extends MessageTestBase public static Destination createDestination(String dest) { - HornetQDestination destination = (HornetQDestination) HornetQDestination.fromAddress(dest); + ActiveMQDestination destination = (ActiveMQDestination) ActiveMQDestination.fromAddress(dest); System.out.println("SimpleAddress: " + destination.getSimpleAddress()); return destination; } @@ -172,7 +172,7 @@ public class JMSTest extends MessageTestBase @Test public void testJmsConsumer() throws Exception { - String queueName = HornetQDestination.createQueueAddressFromName("testQueue2").toString(); + String queueName = ActiveMQDestination.createQueueAddressFromName("testQueue2").toString(); System.out.println("Queue name: " + queueName); QueueDeployment deployment = new QueueDeployment(); deployment.setDuplicatesAllowed(true); @@ -223,7 +223,7 @@ public class JMSTest extends MessageTestBase @Test public void testJmsProducer() throws Exception { - String queueName = HornetQDestination.createQueueAddressFromName("testQueue").toString(); + String queueName = ActiveMQDestination.createQueueAddressFromName("testQueue").toString(); System.out.println("Queue name: " + queueName); QueueDeployment deployment = new QueueDeployment(); deployment.setDuplicatesAllowed(true); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/test/java/org/apache/activemq/rest/test/MessageTestBase.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/MessageTestBase.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/MessageTestBase.java index 942fae7..74cb6a8 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/MessageTestBase.java +++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/MessageTestBase.java @@ -46,7 +46,7 @@ public class MessageTestBase } @BeforeClass - public static void setupHornetQServerAndManager() throws Exception + public static void setupActiveMQServerAndManager() throws Exception { server = new Embedded(); server.start(); @@ -54,7 +54,7 @@ public class MessageTestBase } @AfterClass - public static void shutdownHornetqServerAndManager() throws Exception + public static void shutdownActiveMQServerAndManager() throws Exception { manager = null; server.stop(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java index 3ab1acc..ec47d3b 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java +++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java @@ -16,8 +16,8 @@ import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.core.config.Configuration; import org.apache.activemq.core.config.impl.ConfigurationImpl; import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq.core.server.HornetQServer; -import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.core.server.ActiveMQServer; +import org.apache.activemq.core.server.ActiveMQServers; import org.apache.activemq.rest.MessageServiceManager; import org.apache.activemq.rest.queue.QueueDeployment; import org.apache.activemq.rest.queue.push.xml.PushRegistration; @@ -42,7 +42,7 @@ public class PersistentPushQueueConsumerTest { public static MessageServiceManager manager; protected static ResteasyDeployment deployment; - public static HornetQServer hornetqServer; + public static ActiveMQServer activeMQServer; public static void startup() throws Exception { @@ -51,8 +51,8 @@ public class PersistentPushQueueConsumerTest .setSecurityEnabled(false) .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - hornetqServer = HornetQServers.newHornetQServer(configuration); - hornetqServer.start(); + activeMQServer = ActiveMQServers.newActiveMQServer(configuration); + activeMQServer.start(); deployment = EmbeddedContainer.start(); manager = new MessageServiceManager(); @@ -67,8 +67,8 @@ public class PersistentPushQueueConsumerTest manager = null; EmbeddedContainer.stop(); deployment = null; - hornetqServer.stop(); - hornetqServer = null; + activeMQServer.stop(); + activeMQServer = null; } @Test http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushTopicConsumerTest.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushTopicConsumerTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushTopicConsumerTest.java index 091c0a3..cae94e6 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushTopicConsumerTest.java +++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushTopicConsumerTest.java @@ -24,8 +24,8 @@ import org.apache.activemq.api.core.client.ClientSession; import org.apache.activemq.core.config.Configuration; import org.apache.activemq.core.config.impl.ConfigurationImpl; import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.apache.activemq.core.server.HornetQServer; -import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.core.server.ActiveMQServer; +import org.apache.activemq.core.server.ActiveMQServers; import org.apache.activemq.rest.MessageServiceManager; import org.apache.activemq.rest.queue.push.xml.XmlLink; import org.apache.activemq.rest.topic.PushTopicRegistration; @@ -50,7 +50,7 @@ import static org.jboss.resteasy.test.TestPortProvider.generateURL; */ public class PersistentPushTopicConsumerTest { - public static HornetQServer server; + public static ActiveMQServer server; public static MessageServiceManager manager; protected static ResteasyDeployment deployment; @@ -62,7 +62,7 @@ public class PersistentPushTopicConsumerTest .setSecurityEnabled(false) .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - server = HornetQServers.newHornetQServer(configuration); + server = ActiveMQServers.newActiveMQServer(configuration); server.start(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushQueueConsumerTest.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushQueueConsumerTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushQueueConsumerTest.java index 05ad32e..23d03ff 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushQueueConsumerTest.java +++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushQueueConsumerTest.java @@ -13,7 +13,7 @@ package org.apache.activemq.rest.test; import org.apache.activemq.rest.queue.QueueDeployment; -import org.apache.activemq.rest.queue.push.HornetQPushStrategy; +import org.apache.activemq.rest.queue.push.ActiveMQPushStrategy; import org.apache.activemq.rest.queue.push.xml.PushRegistration; import org.apache.activemq.rest.queue.push.xml.XmlLink; import org.apache.activemq.rest.util.Constants; @@ -347,7 +347,7 @@ public class PushQueueConsumerTest extends MessageTestBase if (pushRegistrationType == PushRegistrationType.CLASS) { target.setHref(generateURL(Util.getUrlPath(queueToPushTo))); - target.setClassName(HornetQPushStrategy.class.getName()); + target.setClassName(ActiveMQPushStrategy.class.getName()); } else if (pushRegistrationType == PushRegistrationType.BRIDGE) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushTopicConsumerTest.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushTopicConsumerTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushTopicConsumerTest.java index b8c483b..ff9251d 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushTopicConsumerTest.java +++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PushTopicConsumerTest.java @@ -17,7 +17,7 @@ import javax.ws.rs.Path; import java.util.concurrent.atomic.AtomicInteger; import org.apache.activemq.rest.queue.QueueDeployment; -import org.apache.activemq.rest.queue.push.HornetQPushStrategy; +import org.apache.activemq.rest.queue.push.ActiveMQPushStrategy; import org.apache.activemq.rest.queue.push.xml.XmlLink; import org.apache.activemq.rest.topic.PushTopicRegistration; import org.apache.activemq.rest.topic.TopicDeployment; @@ -146,7 +146,7 @@ public class PushTopicConsumerTest extends MessageTestBase reg.setDurable(false); XmlLink target = new XmlLink(); target.setHref(generateURL("/queues/testClassForwardQueue")); - target.setClassName(HornetQPushStrategy.class.getName()); + target.setClassName(ActiveMQPushStrategy.class.getName()); reg.setTarget(target); response = pushSubscriptions.request().body("application/xml", reg).post(); Assert.assertEquals(201, response.getStatus()); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/test/java/org/apache/activemq/rest/test/RawAckTest.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RawAckTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/RawAckTest.java index 901f1c6..9560f47 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/RawAckTest.java +++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/RawAckTest.java @@ -28,22 +28,22 @@ import org.apache.activemq.core.config.Configuration; import org.apache.activemq.core.config.impl.ConfigurationImpl; import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory; -import org.apache.activemq.core.server.HornetQServer; -import org.apache.activemq.core.server.HornetQServers; +import org.apache.activemq.core.server.ActiveMQServer; +import org.apache.activemq.core.server.ActiveMQServers; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; /** - * Play with HornetQ + * Play with ActiveMQ * * @author <a href="mailto:[email protected]";>Bill Burke</a> * @version $Revision: 1 $ */ public class RawAckTest { - protected static HornetQServer hornetqServer; + protected static ActiveMQServer activeMQServer; static ServerLocator serverLocator; static ClientSessionFactory sessionFactory; static ClientSessionFactory consumerSessionFactory; @@ -58,8 +58,8 @@ public class RawAckTest .setSecurityEnabled(false) .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - hornetqServer = HornetQServers.newHornetQServer(configuration); - hornetqServer.start(); + activeMQServer = ActiveMQServers.newActiveMQServer(configuration); + activeMQServer.start(); HashMap<String, Object> transportConfig = new HashMap<String, Object>(); @@ -67,7 +67,7 @@ public class RawAckTest sessionFactory = serverLocator.createSessionFactory(); consumerSessionFactory = serverLocator.createSessionFactory(); - hornetqServer.createQueue(new SimpleString("testQueue"), new SimpleString("testQueue"), null, false, false); + activeMQServer.createQueue(new SimpleString("testQueue"), new SimpleString("testQueue"), null, false, false); session = sessionFactory.createSession(true, true); producer = session.createProducer("testQueue"); session.start(); @@ -77,7 +77,7 @@ public class RawAckTest public static void shutdown() throws Exception { serverLocator.close(); - hornetqServer.stop(); + activeMQServer.stop(); } static boolean passed = false; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/test/java/org/apache/activemq/rest/test/SelectorTest.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/SelectorTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/SelectorTest.java index 82dc664..ebe49dc 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/SelectorTest.java +++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/SelectorTest.java @@ -23,8 +23,8 @@ import javax.ws.rs.Path; import javax.xml.bind.annotation.XmlRootElement; import java.io.Serializable; -import org.apache.activemq.jms.client.HornetQDestination; -import org.apache.activemq.jms.client.HornetQJMSConnectionFactory; +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; @@ -45,12 +45,12 @@ import static org.jboss.resteasy.test.TestPortProvider.generateURL; public class SelectorTest extends MessageTestBase { public static ConnectionFactory connectionFactory; - public static String topicName = HornetQDestination.createQueueAddressFromName("testTopic").toString(); + public static String topicName = ActiveMQDestination.createQueueAddressFromName("testTopic").toString(); @BeforeClass public static void setup() throws Exception { - connectionFactory = new HornetQJMSConnectionFactory(manager.getQueueManager().getServerLocator()); + connectionFactory = new ActiveMQJMSConnectionFactory(manager.getQueueManager().getServerLocator()); System.out.println("Queue name: " + topicName); TopicDeployment deployment = new TopicDeployment(); deployment.setDuplicatesAllowed(true); @@ -131,7 +131,7 @@ public class SelectorTest extends MessageTestBase public static Destination createDestination(String dest) { - HornetQDestination destination = (HornetQDestination) HornetQDestination.fromAddress(dest); + ActiveMQDestination destination = (ActiveMQDestination) ActiveMQDestination.fromAddress(dest); System.out.println("SimpleAddress: " + destination.getSimpleAddress()); return destination; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-rest/src/test/java/org/apache/activemq/rest/test/TransformTest.java ---------------------------------------------------------------------- diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/TransformTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/TransformTest.java index 465ba30..737403e 100644 --- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/TransformTest.java +++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/TransformTest.java @@ -22,7 +22,7 @@ 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.Hornetq; +import org.apache.activemq.rest.ActiveMQ; import org.apache.activemq.rest.queue.QueueDeployment; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; @@ -109,9 +109,9 @@ public class TransformTest extends MessageTestBase ClientMessage message = session.createMessage(Message.OBJECT_TYPE, false); if (contentType == null) { - Hornetq.setEntity(message, object); + ActiveMQ.setEntity(message, object); } - else Hornetq.setEntity(message, object, contentType); + else ActiveMQ.setEntity(message, object, contentType); producer.send(message); session.start(); } @@ -203,7 +203,7 @@ public class TransformTest extends MessageTestBase System.out.println("onMessage!"); try { - order = Hornetq.getEntity(clientMessage, Order.class); + order = ActiveMQ.getEntity(clientMessage, Order.class); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java index 6b60332..d3d7ca8 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java @@ -16,7 +16,7 @@ import java.io.Serializable; import java.util.List; import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ActiveMQClient; /** * A BridgeConfiguration @@ -42,9 +42,9 @@ public final class BridgeConfiguration implements Serializable private String transformerClassName = null; - private long retryInterval = HornetQClient.DEFAULT_RETRY_INTERVAL; + private long retryInterval = ActiveMQClient.DEFAULT_RETRY_INTERVAL; - private double retryIntervalMultiplier = HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER; + private double retryIntervalMultiplier = ActiveMQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER; private int initialConnectAttempts = ActiveMQDefaultConfiguration.getDefaultBridgeInitialConnectAttempts(); @@ -54,23 +54,23 @@ public final class BridgeConfiguration implements Serializable private boolean useDuplicateDetection = ActiveMQDefaultConfiguration.isDefaultBridgeDuplicateDetection(); - private int confirmationWindowSize = HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE; + private int confirmationWindowSize = ActiveMQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE; - private long clientFailureCheckPeriod = HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD; + private long clientFailureCheckPeriod = ActiveMQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD; private String user = ActiveMQDefaultConfiguration.getDefaultClusterUser(); private String password = ActiveMQDefaultConfiguration.getDefaultClusterPassword(); - private long connectionTTL = HornetQClient.DEFAULT_CONNECTION_TTL; + private long connectionTTL = ActiveMQClient.DEFAULT_CONNECTION_TTL; - private long maxRetryInterval = HornetQClient.DEFAULT_MAX_RETRY_INTERVAL; + private long maxRetryInterval = ActiveMQClient.DEFAULT_MAX_RETRY_INTERVAL; - private int minLargeMessageSize = HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; + private int minLargeMessageSize = ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; // At this point this is only changed on testcases // The bridge shouldn't be sending blocking anyways - private long callTimeout = HornetQClient.DEFAULT_CALL_TIMEOUT; + private long callTimeout = ActiveMQClient.DEFAULT_CALL_TIMEOUT; public BridgeConfiguration() http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java index 7cfd8a2..16a5e84 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java @@ -17,7 +17,7 @@ import java.util.Collections; import java.util.List; import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; -import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ActiveMQClient; /** * A ClusterConnectionConfiguration @@ -66,7 +66,7 @@ public final class ClusterConnectionConfiguration implements Serializable private boolean allowDirectConnectionsOnly = false; - private int minLargeMessageSize = HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; + private int minLargeMessageSize = ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; private long clusterNotificationInterval = ActiveMQDefaultConfiguration.getDefaultClusterNotificationInterval();
