You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/02/26 12:54:13 UTC
svn commit: r748103 - in /camel/trunk/components/camel-cometd: ./
src/main/java/org/apache/camel/component/cometd/
src/test/java/org/apache/camel/component/cometd/
Author: davsclaus
Date: Thu Feb 26 11:54:13 2009
New Revision: 748103
URL: http://svn.apache.org/viewvc?rev=748103&view=rev
Log:
CAMEL-1373: CamelCase and fixed a NPE bug in this one. Polished code.
Added:
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java (contents, props changed)
- copied, changed from r748076, camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveTest.java
Removed:
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveTest.java
Modified:
camel/trunk/components/camel-cometd/ (props changed)
camel/trunk/components/camel-cometd/pom.xml
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConverters.java
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducerConsumer.java
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java
Propchange: camel/trunk/components/camel-cometd/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Feb 26 11:54:13 2009
@@ -5,3 +5,4 @@
target
.settings
eclipse-classes
+*.i??
Modified: camel/trunk/components/camel-cometd/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/pom.xml?rev=748103&r1=748102&r2=748103&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/pom.xml (original)
+++ camel/trunk/components/camel-cometd/pom.xml Thu Feb 26 11:54:13 2009
@@ -76,7 +76,7 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
- <mainClass>org.apache.camel.component.cometd.CometdProducerConsumerInteractiveTest</mainClass>
+ <mainClass>org.apache.camel.component.cometd.CometdProducerConsumerInteractiveMain</mainClass>
<includePluginDependencies>false</includePluginDependencies>
</configuration>
</plugin>
Modified: camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java?rev=748103&r1=748102&r2=748103&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java (original)
+++ camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java Thu Feb 26 11:54:13 2009
@@ -75,18 +75,14 @@
@SuppressWarnings("unchecked")
@Override
- protected Endpoint createEndpoint(String uri, String remaining,
- Map parameters) throws Exception {
+ protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception {
setProperties(this, parameters);
- CometdEndpoint endpoint = new CometdEndpoint(this, uri, remaining,
- parameters);
+ CometdEndpoint endpoint = new CometdEndpoint(this, uri, remaining, parameters);
return endpoint;
}
/**
* Connects the URL specified on the endpoint to the specified processor.
- *
- * @throws Exception
*/
public void connect(CometdProducerConsumer prodcon) throws Exception {
// Make sure that there is a connector for the requested endpoint.
@@ -129,7 +125,7 @@
* processor.
*/
public void disconnect(CometdProducerConsumer prodcon) throws Exception {
- CometdEndpoint endpoint = (CometdEndpoint) prodcon.getEndpoint();
+ CometdEndpoint endpoint = prodcon.getEndpoint();
String connectorKey = endpoint.getProtocol() + ":" + endpoint.getUri().getHost() + ":" + endpoint.getPort();
@@ -145,8 +141,7 @@
}
}
- protected ContinuationCometdServlet createServletForConnector(
- Connector connector, CometdEndpoint endpoint) throws Exception {
+ protected ContinuationCometdServlet createServletForConnector(Connector connector, CometdEndpoint endpoint) throws Exception {
ContinuationCometdServlet servlet = new ContinuationCometdServlet();
Context context = new Context(server, "/", Context.NO_SECURITY | Context.NO_SESSIONS);
@@ -157,20 +152,17 @@
context.setResourceBase(endpoint.getResourceBase());
context.addServlet(holder, "/cometd/*");
context.addServlet("org.mortbay.jetty.servlet.DefaultServlet", "/");
+
connector.start();
context.start();
- holder.setInitParameter("timeout", Integer.toString(endpoint
- .getTimeout()));
- holder.setInitParameter("interval", Integer.toString(endpoint
- .getInterval()));
- holder.setInitParameter("maxInterval", Integer.toString(endpoint
- .getMaxInterval()));
- holder.setInitParameter("multiFrameInterval", Integer.toString(endpoint
- .getMultiFrameInterval()));
- holder.setInitParameter("JSONCommented", Boolean.toString(endpoint
- .isJsonCommented()));
- holder.setInitParameter("logLevel", Integer.toString(endpoint
- .getLogLevel()));
+
+ holder.setInitParameter("timeout", Integer.toString(endpoint.getTimeout()));
+ holder.setInitParameter("interval", Integer.toString(endpoint.getInterval()));
+ holder.setInitParameter("maxInterval", Integer.toString(endpoint.getMaxInterval()));
+ holder.setInitParameter("multiFrameInterval", Integer.toString(endpoint.getMultiFrameInterval()));
+ holder.setInitParameter("JSONCommented", Boolean.toString(endpoint.isJsonCommented()));
+ holder.setInitParameter("logLevel", Integer.toString(endpoint.getLogLevel()));
+
return servlet;
}
Modified: camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java?rev=748103&r1=748102&r2=748103&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java (original)
+++ camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java Thu Feb 26 11:54:13 2009
@@ -18,7 +18,6 @@
import dojox.cometd.Bayeux;
import dojox.cometd.Client;
-
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
Modified: camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConverters.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConverters.java?rev=748103&r1=748102&r2=748103&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConverters.java (original)
+++ camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConverters.java Thu Feb 26 11:54:13 2009
@@ -30,25 +30,4 @@
//Utility Class
}
- /**
- * Converts the given JavaMail message to a String body.
- * Can return null.
- */
-/*
- @Converter
- public static String toString(Message message) throws MessagingException, IOException {
- Object content = message.getContent();
- if (content instanceof MimeMultipart) {
- MimeMultipart multipart = (MimeMultipart) content;
- if (multipart.getCount() > 0) {
- BodyPart part = multipart.getBodyPart(0);
- content = part.getContent();
- }
- }
- if (content != null) {
- return content.toString();
- }
- return null;
- }
-*/
}
Modified: camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java?rev=748103&r1=748102&r2=748103&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java (original)
+++ camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java Thu Feb 26 11:54:13 2009
@@ -24,6 +24,7 @@
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.util.ObjectHelper;
/**
* Endpoint for Camel Cometd.
@@ -32,38 +33,38 @@
*/
public class CometdEndpoint extends DefaultEndpoint {
- private String resourceBase;
- private int timeout = 240000;
- private int interval;
- private int maxInterval = 30000;
- private int multiFrameInterval = 1500;
- private boolean jsonCommented = true;
- private int logLevel = 1;
- private URI uri;
+ private String resourceBase;
+ private int timeout = 240000;
+ private int interval;
+ private int maxInterval = 30000;
+ private int multiFrameInterval = 1500;
+ private boolean jsonCommented = true;
+ private int logLevel = 1;
+ private URI uri;
private CometdComponent component;
- @SuppressWarnings("unchecked")
public CometdEndpoint(CometdComponent component, String uri, String remaining, Map parameters) {
- super(uri);
+ super(uri, component);
this.component = component;
try {
this.uri = new URI(uri);
} catch (URISyntaxException e) {
- e.printStackTrace();
+ throw new IllegalArgumentException(e);
}
}
public Producer createProducer() throws Exception {
+ ObjectHelper.notNull(component, "component");
CometdProducer producer = new CometdProducer(this);
return producer;
}
public Consumer createConsumer(Processor processor) throws Exception {
+ ObjectHelper.notNull(component, "component");
CometdConsumer consumer = new CometdConsumer(this, processor);
return consumer;
}
-
public void connect(CometdProducerConsumer prodcons) throws Exception {
component.connect(prodcons);
}
@@ -102,8 +103,7 @@
public URI getUri() {
return uri;
}
-
-
+
public String getResourceBase() {
return resourceBase;
}
Modified: camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java?rev=748103&r1=748102&r2=748103&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java (original)
+++ camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java Thu Feb 26 11:54:13 2009
@@ -17,12 +17,11 @@
package org.apache.camel.component.cometd;
import java.util.Collection;
-import java.util.Iterator;
import dojox.cometd.Client;
-
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.mortbay.cometd.AbstractBayeux;
@@ -33,11 +32,9 @@
* @version $Revision$
*/
public class CometdProducer extends DefaultProducer implements CometdProducerConsumer {
-
- @SuppressWarnings("unused")
private static final transient Log LOG = LogFactory.getLog(CometdProducer.class);
- private AbstractBayeux bayeux;
+ private AbstractBayeux bayeux;
private final CometdEndpoint endpoint;
public CometdProducer(CometdEndpoint endpoint) {
@@ -58,9 +55,13 @@
}
public void process(final Exchange exchange) {
+ ObjectHelper.notNull(bayeux, "bayeux");
+
Collection<Client> clients = bayeux.getClients();
- for (Iterator<Client> iterator = clients.iterator(); iterator.hasNext();) {
- Client client = (Client) iterator.next();
+ for (Client client : clients) {
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("Delivering to client id: " + client.getId() + " path:" + endpoint.getPath() + " exchange: " + exchange);
+ }
client.deliver(client, endpoint.getPath(), exchange.getIn().getBody(), null);
}
}
Modified: camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducerConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducerConsumer.java?rev=748103&r1=748102&r2=748103&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducerConsumer.java (original)
+++ camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducerConsumer.java Thu Feb 26 11:54:13 2009
@@ -19,8 +19,16 @@
import org.mortbay.cometd.AbstractBayeux;
public interface CometdProducerConsumer {
-
+
+ /**
+ * Gets the endpoint
+ */
CometdEndpoint getEndpoint();
- void setBayeux(AbstractBayeux bayeux);
+
+
+ /**
+ * Sets the bayeux to use.
+ */
+ void setBayeux(AbstractBayeux bayeux);
}
Copied: camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java (from r748076, camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java?p2=camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java&p1=camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveTest.java&r1=748076&r2=748103&rev=748103&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveTest.java (original)
+++ camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java Thu Feb 26 11:54:13 2009
@@ -18,19 +18,17 @@
import java.io.File;
import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-public class CometdProducerConsumerInteractiveTest {
+public class CometdProducerConsumerInteractiveMain {
- private static final String URI = "cometd://localhost:8080/service/test?resourceBase=./src/test/resources/webapp&"
+ private static final String URI = "cometd://0.0.0.0:8080/service/test?resourceBase=./src/test/resources/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
- private static final String URIS = "cometds://localhost:8443/service/test?resourceBase=./src/test/resources/webapp&"
+ private static final String URIS = "cometds://0.0.0.0:8443/service/test?resourceBase=./src/test/resources/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
private CamelContext context;
@@ -38,7 +36,7 @@
private String pwd = "changeit";
public static void main(String[] args) throws Exception {
- CometdProducerConsumerInteractiveTest me = new CometdProducerConsumerInteractiveTest();
+ CometdProducerConsumerInteractiveMain me = new CometdProducerConsumerInteractiveMain();
me.testCometdProducerConsumerInteractive();
}
Propchange: camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveMain.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java?rev=748103&r1=748102&r2=748103&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java (original)
+++ camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerTest.java Thu Feb 26 11:54:13 2009
@@ -28,7 +28,7 @@
*/
public class CometdProducerConsumerTest extends ContextTestSupport {
- private static final String URI = "cometd://localhost:8080/service/test?resourceBase=./target/test-classes/webapp&"
+ private static final String URI = "cometd://0.0.0.0:8080/service/test?resourceBase=./target/test-classes/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
public void testProducer() throws Exception {
Modified: camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java?rev=748103&r1=748102&r2=748103&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java (original)
+++ camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslCometdProducerConsumerTest.java Thu Feb 26 11:54:13 2009
@@ -29,7 +29,7 @@
*/
public class SslCometdProducerConsumerTest extends ContextTestSupport {
- private static final String URI = "cometds://localhost:8080/service/test?resourceBase=./target/test-classes/webapp&"
+ private static final String URI = "cometds://0.0.0.0:8080/service/test?resourceBase=./target/test-classes/webapp&"
+ "timeout=240000&interval=0&maxInterval=30000&multiFrameInterval=1500&jsonCommented=true&logLevel=2";
protected String pwd = "changeit";