Author: gaohoward Date: 2010-10-10 21:08:38 -0400 (Sun, 10 Oct 2010) New Revision: 9766 Modified: trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/integration/HornetqBootstrapListener.java trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/integration/RestMessagingBootstrapListener.java trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/integration/ServletContextBindingRegistry.java trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumersResource.java trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/FilePushStore.java trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumer.java trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/UriStrategy.java trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/topic/FileTopicPushStore.java trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/topic/SubscriptionsResource.java trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/util/CustomHeaderLinkStrategy.java trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/util/TimeoutTask.java trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/JMSTest.java trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/RawRestartTest.java trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/TransformTest.java Log: HORNETQ-515 -- adapt to new api, also remove @override annotations on interface method implementations Modified: trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/integration/HornetqBootstrapListener.java =================================================================== --- trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/integration/HornetqBootstrapListener.java 2010-10-11 01:04:43 UTC (rev 9765) +++ trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/integration/HornetqBootstrapListener.java 2010-10-11 01:08:38 UTC (rev 9766) @@ -14,7 +14,6 @@ { private EmbeddedJMS jms; - @Override public void contextInitialized(ServletContextEvent contextEvent) { ServletContext context = contextEvent.getServletContext(); @@ -30,7 +29,6 @@ } } - @Override public void contextDestroyed(ServletContextEvent servletContextEvent) { try Modified: trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/integration/RestMessagingBootstrapListener.java =================================================================== --- trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/integration/RestMessagingBootstrapListener.java 2010-10-11 01:04:43 UTC (rev 9765) +++ trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/integration/RestMessagingBootstrapListener.java 2010-10-11 01:08:38 UTC (rev 9766) @@ -16,7 +16,6 @@ { MessageServiceManager manager; - @Override public void contextInitialized(ServletContextEvent contextEvent) { ServletContext context = contextEvent.getServletContext(); @@ -44,7 +43,6 @@ } } - @Override public void contextDestroyed(ServletContextEvent servletContextEvent) { if (manager != null) Modified: trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/integration/ServletContextBindingRegistry.java =================================================================== --- trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/integration/ServletContextBindingRegistry.java 2010-10-11 01:04:43 UTC (rev 9765) +++ trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/integration/ServletContextBindingRegistry.java 2010-10-11 01:08:38 UTC (rev 9766) @@ -17,37 +17,31 @@ this.servletContext = servletContext; } - @Override public Object lookup(String name) { return servletContext.getAttribute(name); } - @Override public boolean bind(String name, Object obj) { servletContext.setAttribute(name, obj); return true; } - @Override public void unbind(String name) { servletContext.removeAttribute(name); } - @Override public void close() { } - @Override public Object getContext() { return servletContext; } - @Override public void setContext(Object o) { servletContext = (ServletContext)o; Modified: trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumersResource.java =================================================================== --- trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumersResource.java 2010-10-11 01:04:43 UTC (rev 9765) +++ trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/ConsumersResource.java 2010-10-11 01:08:38 UTC (rev 9766) @@ -78,7 +78,6 @@ private Object timeoutLock = new Object(); - @Override public void testTimeout(String target) { synchronized (timeoutLock) Modified: trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/FilePushStore.java =================================================================== --- trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/FilePushStore.java 2010-10-11 01:04:43 UTC (rev 9765) +++ trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/FilePushStore.java 2010-10-11 01:08:38 UTC (rev 9766) @@ -57,7 +57,6 @@ return list; } - @Override public synchronized List<PushRegistration> getByDestination(String destination) { List<PushRegistration> list = new ArrayList<PushRegistration>(); @@ -71,7 +70,6 @@ return list; } - @Override public synchronized void update(PushRegistration reg) throws Exception { if (reg.getLoadedFrom() == null) return; @@ -86,7 +84,6 @@ marshaller.marshal(reg, (File) reg.getLoadedFrom()); } - @Override public synchronized void add(PushRegistration reg) throws Exception { map.put(reg.getId(), reg); @@ -97,7 +94,6 @@ save(reg); } - @Override public synchronized void remove(PushRegistration reg) throws Exception { map.remove(reg.getId()); @@ -106,7 +102,6 @@ fp.delete(); } - @Override public synchronized void removeAll() throws Exception { ArrayList<PushRegistration> copy = new ArrayList<PushRegistration>(); Modified: trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumer.java =================================================================== --- trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumer.java 2010-10-11 01:04:43 UTC (rev 9765) +++ trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumer.java 2010-10-11 01:08:38 UTC (rev 9766) @@ -100,7 +100,6 @@ } } - @Override public void onMessage(ClientMessage clientMessage) { if (strategy.push(clientMessage) == false) Modified: trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/UriStrategy.java =================================================================== --- trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/UriStrategy.java 2010-10-11 01:04:43 UTC (rev 9765) +++ trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/UriStrategy.java 2010-10-11 01:08:38 UTC (rev 9766) @@ -30,7 +30,6 @@ protected String method; protected String contentType; - @Override public void setRegistration(PushRegistration reg) { this.registration = reg; @@ -63,12 +62,10 @@ } } - @Override public void stop() { } - @Override public boolean push(ClientMessage message) { String uri = createUri(message); Modified: trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/topic/FileTopicPushStore.java =================================================================== --- trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/topic/FileTopicPushStore.java 2010-10-11 01:04:43 UTC (rev 9765) +++ trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/topic/FileTopicPushStore.java 2010-10-11 01:08:38 UTC (rev 9766) @@ -18,7 +18,6 @@ super(dirname); } - @Override public synchronized List<PushTopicRegistration> getByTopic(String topic) { List<PushTopicRegistration> list = new ArrayList<PushTopicRegistration>(); Modified: trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/topic/SubscriptionsResource.java =================================================================== --- trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/topic/SubscriptionsResource.java 2010-10-11 01:04:43 UTC (rev 9765) +++ trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/topic/SubscriptionsResource.java 2010-10-11 01:08:38 UTC (rev 9766) @@ -84,7 +84,6 @@ private Object timeoutLock = new Object(); - @Override public void testTimeout(String target) { synchronized (timeoutLock) Modified: trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/util/CustomHeaderLinkStrategy.java =================================================================== --- trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/util/CustomHeaderLinkStrategy.java 2010-10-11 01:04:43 UTC (rev 9765) +++ trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/util/CustomHeaderLinkStrategy.java 2010-10-11 01:08:38 UTC (rev 9766) @@ -8,7 +8,6 @@ */ public class CustomHeaderLinkStrategy implements LinkStrategy { - @Override public void setLinkHeader(Response.ResponseBuilder builder, String title, String rel, String href, String type) { String headerName = null; Modified: trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/util/TimeoutTask.java =================================================================== --- trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/util/TimeoutTask.java 2010-10-11 01:04:43 UTC (rev 9765) +++ trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/util/TimeoutTask.java 2010-10-11 01:08:38 UTC (rev 9766) @@ -58,7 +58,6 @@ thread.start(); } - @Override public void run() { while (running) Modified: trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/JMSTest.java =================================================================== --- trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/JMSTest.java 2010-10-11 01:04:43 UTC (rev 9765) +++ trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/JMSTest.java 2010-10-11 01:08:38 UTC (rev 9766) @@ -2,6 +2,7 @@ import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQDestination; +import org.hornetq.jms.client.HornetQJMSConnectionFactory; import org.hornetq.rest.HttpHeaderProperty; import org.hornetq.rest.Jms; import org.hornetq.rest.queue.QueueDeployment; @@ -39,7 +40,7 @@ @BeforeClass public static void setup() throws Exception { - connectionFactory = new HornetQConnectionFactory(manager.getQueueManager().getSessionFactory()); + connectionFactory = new HornetQJMSConnectionFactory(manager.getQueueManager().getSessionFactory()); } @XmlRootElement @@ -128,7 +129,6 @@ public static Order order; public static CountDownLatch latch = new CountDownLatch(1); - @Override public void onMessage(Message message) { try Modified: trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/RawRestartTest.java =================================================================== --- trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/RawRestartTest.java 2010-10-11 01:04:43 UTC (rev 9765) +++ trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/RawRestartTest.java 2010-10-11 01:08:38 UTC (rev 9766) @@ -80,7 +80,6 @@ private static class MyListener implements MessageHandler { - @Override public void onMessage(ClientMessage message) { int size = message.getBodyBuffer().readInt(); Modified: trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/TransformTest.java =================================================================== --- trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/TransformTest.java 2010-10-11 01:04:43 UTC (rev 9765) +++ trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/TransformTest.java 2010-10-11 01:08:38 UTC (rev 9766) @@ -180,7 +180,6 @@ public static Order order; public static CountDownLatch latch = new CountDownLatch(1); - @Override public void onMessage(ClientMessage clientMessage) { System.out.println("onMessage!");