You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2012/05/25 16:06:57 UTC
svn commit: r1342628 - in /camel/trunk/components/camel-websocket/src:
main/java/org/apache/camel/component/websocket/
test/java/org/apache/camel/component/websocket/ test/resources/
Author: cmoulliard
Date: Fri May 25 14:06:56 2012
New Revision: 1342628
URL: http://svn.apache.org/viewvc?rev=1342628&view=rev
Log:
Add test where we only use WebSocket as a Producer
Added:
camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
Modified:
camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java
camel/trunk/components/camel-websocket/src/test/resources/log4j.properties
Modified: camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java?rev=1342628&r1=1342627&r2=1342628&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java (original)
+++ camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java Fri May 25 14:06:56 2012
@@ -357,7 +357,6 @@ public class WebsocketComponent extends
ServletContextHandler context = (ServletContextHandler)connectorRef.server.getHandler();
servlet = createServlet(sync, pathSpec, servlets, context);
connectorRef.servlet = servlet;
- servlets.put(pathSpec,servlet);
LOG.debug("WebSocket servlet added for the following path : " + pathSpec + ", to the Jetty Server : " + key);
}
Modified: camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java?rev=1342628&r1=1342627&r2=1342628&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java (original)
+++ camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java Fri May 25 14:06:56 2012
@@ -42,10 +42,6 @@ public class WebsocketProducer extends D
Message in = exchange.getIn();
String message = in.getMandatoryBody(String.class);
-/* if (!endpoint.isStarted()) {
- endpoint.connect(this);
- }*/
-
if (isSendToAllSet(in)) {
sendToAll(store, message, exchange);
} else {
Added: camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java?rev=1342628&view=auto
==============================================================================
--- camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java (added)
+++ camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketProducerRouteExampleTest.java Fri May 25 14:06:56 2012
@@ -0,0 +1,96 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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.camel.component.websocket;
+
+import com.ning.http.client.AsyncHttpClient;
+import com.ning.http.client.websocket.WebSocket;
+import com.ning.http.client.websocket.WebSocketTextListener;
+import com.ning.http.client.websocket.WebSocketUpgradeHandler;
+import org.apache.camel.Produce;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class WebsocketProducerRouteExampleTest extends CamelTestSupport {
+
+ private static List<String> received = new ArrayList<String>();
+ private static CountDownLatch latch = new CountDownLatch(1);
+
+ @Produce(uri = "direct:shop")
+ private ProducerTemplate producer;
+
+ @Test
+ public void testWSHttpCall() throws Exception {
+ AsyncHttpClient c = new AsyncHttpClient();
+
+ WebSocket websocket = c.prepareGet("ws://127.0.0.1:9292/shop").execute(
+ new WebSocketUpgradeHandler.Builder()
+ .addWebSocketListener(new WebSocketTextListener() {
+ @Override
+ public void onMessage(String message) {
+ received.add(message);
+ log.info("received --> " + message);
+ latch.countDown();
+ }
+
+ @Override
+ public void onFragment(String fragment, boolean last) {
+ }
+
+ @Override
+ public void onOpen(WebSocket websocket) {
+ }
+
+ @Override
+ public void onClose(WebSocket websocket) {
+ }
+
+ @Override
+ public void onError(Throwable t) {
+ t.printStackTrace();
+ }
+ }).build()).get();
+
+ // Send message to the direct endpoint
+ producer.sendBodyAndHeader("Beer on stock at Apache Mall",WebsocketConstants.SEND_TO_ALL,"true");
+
+ assertTrue(latch.await(10, TimeUnit.SECONDS));
+
+ assertEquals(1, received.size());
+ assertEquals("Beer on stock at Apache Mall", received.get(0));
+
+ websocket.close();
+ c.close();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() {
+ from("direct:shop")
+ .log(">>> Message received from Shopping center : ${body}")
+ .to("websocket://localhost:9292/shop");
+ }
+ };
+ }
+}
Modified: camel/trunk/components/camel-websocket/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/test/resources/log4j.properties?rev=1342628&r1=1342627&r2=1342628&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-websocket/src/test/resources/log4j.properties Fri May 25 14:06:56 2012
@@ -21,10 +21,10 @@
log4j.rootLogger=INFO, file
# uncomment the following line to turn on Camel debugging
-# log4j.logger.org.apache.camel.component.websocket=DEBUG
-# log4j.logger.org.eclipse.jetty.websocket=DEBUG
-# log4j.logger.org.eclipse.jetty=DEBUG
-# log4j.logger.com.ning.http.client=DEBUG
+log4j.logger.org.apache.camel.component.websocket=DEBUG
+log4j.logger.org.eclipse.jetty.websocket=DEBUG
+log4j.logger.org.eclipse.jetty=DEBUG
+log4j.logger.com.ning.http.client=DEBUG
# CONSOLE appender not used by default