Author: davsclaus
Date: Thu Jun 24 15:52:50 2010
New Revision: 957588
URL: http://svn.apache.org/viewvc?rev=957588&view=rev
Log:
CAMEL-2850: Adding support for using Jetty continuations in camel-jetty
component.
Added:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTest.java
(with props)
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncComponent.java
(with props)
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncEndpoint.java
(with props)
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncProducer.java
(with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoEndpointTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsyncTimeoutTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConnectionFailureTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamAsExchangeHeaderTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleAsynchronousTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendWhileInProgressTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHandle404Test.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHttpsRouteTest.java
camel/trunk/components/camel-jetty/src/test/resources/log4j.properties
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultConsumer.java
Thu Jun 24 15:52:50 2010
@@ -16,9 +16,11 @@
*/
package org.apache.camel.impl;
+import org.apache.camel.AsyncProcessor;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
import org.apache.camel.Processor;
+import org.apache.camel.impl.converter.AsyncProcessorTypeConverter;
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.util.ServiceHelper;
import org.apache.commons.logging.Log;
@@ -33,6 +35,7 @@ public class DefaultConsumer extends Ser
protected final transient Log log = LogFactory.getLog(getClass());
private final Endpoint endpoint;
private final Processor processor;
+ private AsyncProcessor asyncProcessor;
private ExceptionHandler exceptionHandler;
public DefaultConsumer(Endpoint endpoint, Processor processor) {
@@ -53,6 +56,18 @@ public class DefaultConsumer extends Ser
return processor;
}
+ /**
+ * Provides an {...@link org.apache.camel.AsyncProcessor} interface to the
configured
+ * processor on the consumer. If the processor does not implement the
interface,
+ * it will be adapted so that it does.
+ */
+ public AsyncProcessor getAsyncProcessor() {
+ if (asyncProcessor == null) {
+ asyncProcessor = AsyncProcessorTypeConverter.convert(processor);
+ }
+ return asyncProcessor;
+ }
+
public ExceptionHandler getExceptionHandler() {
if (exceptionHandler == null) {
exceptionHandler = new LoggingExceptionHandler(getClass());
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java
(original)
+++
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CamelServlet.java
Thu Jun 24 15:52:50 2010
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
public class CamelServlet extends HttpServlet {
private static final long serialVersionUID = -7061982839117697829L;
- private static final transient Log LOG =
LogFactory.getLog(CamelServlet.class);
+ protected final transient Log log = LogFactory.getLog(getClass());
private ConcurrentHashMap<String, HttpConsumer> consumers = new
ConcurrentHashMap<String, HttpConsumer>();
@@ -74,7 +74,7 @@ public class CamelServlet extends HttpSe
consumer.getBinding().writeResponse(exchange, response);
} catch (Exception e) {
- LOG.error("Error processing request", e);
+ log.error("Error processing request", e);
throw new ServletException(e);
}
}
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
(original)
+++
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
Thu Jun 24 15:52:50 2010
@@ -17,14 +17,17 @@
package org.apache.camel.component.jetty;
import java.io.IOException;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.component.http.CamelServlet;
import org.apache.camel.component.http.HttpConsumer;
+import org.apache.camel.component.http.HttpMessage;
+import org.apache.camel.impl.DefaultExchange;
import org.eclipse.jetty.continuation.Continuation;
import org.eclipse.jetty.continuation.ContinuationSupport;
@@ -35,12 +38,8 @@ import org.eclipse.jetty.continuation.Co
*/
public class CamelContinuationServlet extends CamelServlet {
- // TODO: We should look into what we can do to introduce back Jetty
Continuations
- // and it should be documented how it works and to be used
- // and end users should be able to decide if they want to leverage it or
not
-
private static final long serialVersionUID = 1L;
-
+
@Override
protected void service(HttpServletRequest request, HttpServletResponse
response) throws ServletException, IOException {
try {
@@ -51,47 +50,78 @@ public class CamelContinuationServlet ex
return;
}
+ // are we suspended?
+ if (consumer.isSuspended()) {
+ response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
+ return;
+ }
+
final Continuation continuation =
ContinuationSupport.getContinuation(request);
if (continuation.isInitial()) {
- // Have the camel process the HTTP exchange.
- // final DefaultExchange exchange = new
DefaultExchange(consumer.getEndpoint(), ExchangePattern.InOut);
- // exchange.setProperty(HttpConstants.SERVLET_REQUEST,
request);
- // exchange.setProperty(HttpConstants.SERVLET_RESPONSE,
response);
- // exchange.setIn(new HttpMessage(exchange, request));
- // boolean sync =
consumer.getAsyncProcessor().process(exchange, new AsyncCallback() {
- // public void done(boolean sync) {
- // if (sync) {
- // return;
- // }
- // continuation.setObject(exchange);
- // continuation.resume();
- // }
- //});
-
- //if (!sync) {
- // Wait for the exchange to get processed.
- // This might block until it completes or it might return
via an exception and
- // then this method is re-invoked once the the exchange
has finished processing
- // continuation.suspend(0);
- //}
- // HC: The getBinding() is interesting because it illustrates
the
- // impedance miss-match between HTTP's stream oriented
protocol, and
- // Camels more message oriented protocol exchanges.
+ // a new request so create an exchange
+ final Exchange exchange = new
DefaultExchange(consumer.getEndpoint(), ExchangePattern.InOut);
+ if (consumer.getEndpoint().isBridgeEndpoint()) {
+ exchange.setProperty(Exchange.SKIP_GZIP_ENCODING,
Boolean.TRUE);
+ }
+ if (consumer.getEndpoint().isDisableStreamCache()) {
+ exchange.setProperty(Exchange.DISABLE_HTTP_STREAM_CACHE,
Boolean.TRUE);
+ }
+ exchange.setIn(new HttpMessage(exchange, request, response));
+
+ // use the asynchronous API to process the exchange
+ boolean sync = consumer.getAsyncProcessor().process(exchange,
new AsyncCallback() {
+ public void done(boolean doneSync) {
+ // we only have to handle async completion
+ if (doneSync) {
+ return;
+ }
+
+ // we should resume the continuation now that we are
done asynchronously
+ if (log.isTraceEnabled()) {
+ log.trace("Resuming continuation of exchangeId: "
+ exchange.getExchangeId());
+ }
+ continuation.setAttribute("CamelExchange", exchange);
+ continuation.resume();
+ }
+ });
+
+ if (!sync) {
+ // wait for the exchange to get processed.
+ // this might block until it completes or it might return
via an exception and
+ // then this method is re-invoked once the the exchange
has finished processing
+ if (log.isTraceEnabled()) {
+ log.trace("Suspending continuation of exchangeId: " +
exchange.getExchangeId());
+ }
+ continuation.suspend(response);
+ return;
+ }
// now lets output to the response
- //consumer.getBinding().writeResponse(exchange, response);
+ if (log.isTraceEnabled()) {
+ log.trace("Writing response of exchangeId: " +
exchange.getExchangeId());
+ }
+ consumer.getBinding().writeResponse(exchange, response);
return;
}
if (continuation.isResumed()) {
- Exchange exchange =
(Exchange)continuation.getAttribute("result");
+ Exchange exchange = (Exchange)
continuation.getAttribute("CamelExchange");
+ if (log.isTraceEnabled()) {
+ log.trace("Resuming continuation of exchangeId: " +
exchange.getExchangeId());
+ }
+
// now lets output to the response
+ if (log.isTraceEnabled()) {
+ log.trace("Writing response of exchangeId: " +
exchange.getExchangeId());
+ }
consumer.getBinding().writeResponse(exchange, response);
return;
}
} catch (Exception e) {
+ log.error("Error processing request", e);
throw new ServletException(e);
}
}
+
}
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
(original)
+++
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
Thu Jun 24 15:52:50 2010
@@ -470,7 +470,8 @@ public class JettyHttpComponent extends
}
}
- CamelServlet camelServlet = new CamelServlet();
+ // use Jetty continuations
+ CamelServlet camelServlet = new CamelContinuationServlet();
ServletHolder holder = new ServletHolder();
holder.setServlet(camelServlet);
CamelContext camelContext = this.getCamelContext();
Modified:
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
(original)
+++
camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpProducer.java
Thu Jun 24 15:52:50 2010
@@ -224,8 +224,8 @@ public class JettyHttpProducer extends D
@Override
protected void doStart() throws Exception {
- super.doStart();
client.start();
+ super.doStart();
}
@Override
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
Thu Jun 24 15:52:50 2010
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.security.Principal;
import javax.servlet.http.HttpServletRequest;
+import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.FailedToCreateProducerException;
import org.apache.camel.Processor;
@@ -84,8 +85,9 @@ public class HttpAuthMethodPriorityTest
try {
template.requestBody("http://localhost:9080/test?authMethod=Basic&authMethodPriority=Basic,foo&authUsername=donald&authPassword=duck";,
"Hello World", String.class);
fail("Should have thrown an exception");
- } catch (FailedToCreateProducerException e) {
- IllegalArgumentException cause =
assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
+ } catch (CamelExecutionException e) {
+ FailedToCreateProducerException failed =
assertIsInstanceOf(FailedToCreateProducerException.class, e.getCause());
+ IllegalArgumentException cause =
assertIsInstanceOf(IllegalArgumentException.class, failed.getCause());
assertEquals("Unknown authMethod: foo in authMethodPriority:
Basic,foo", cause.getMessage());
}
}
Added:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTest.java?rev=957588&view=auto
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTest.java
(added)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTest.java
Thu Jun 24 15:52:50 2010
@@ -0,0 +1,51 @@
+/**
+ * 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.jetty.async;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+/**
+ * @version $Revision$
+ */
+public class JettyAsyncTest extends CamelTestSupport {
+
+ @Test
+ public void testJettyAsync() throws Exception {
+ getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
+
+ String reply = template.requestBody("http://localhost:8877/myservice";,
null, String.class);
+ assertEquals("Bye World", reply);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ context.addComponent("async", new MyAsyncComponent());
+
+ from("jetty:http://localhost:8877/myservice";)
+ .to("async:Bye World")
+ .to("mock:result");
+ }
+ };
+ }
+}
Propchange:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncComponent.java?rev=957588&view=auto
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncComponent.java
(added)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncComponent.java
Thu Jun 24 15:52:50 2010
@@ -0,0 +1,37 @@
+/**
+ * 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.jetty.async;
+
+import java.util.Map;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.impl.DefaultComponent;
+
+/**
+ * @version $Revision$
+ */
+public class MyAsyncComponent extends DefaultComponent {
+
+ @Override
+ protected Endpoint createEndpoint(String uri, String remaining,
Map<String, Object> parameters) throws Exception {
+ MyAsyncEndpoint answer = new MyAsyncEndpoint(uri, this);
+ answer.setReply(remaining);
+ setProperties(answer, parameters);
+ return answer;
+ }
+
+}
Propchange:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncComponent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncEndpoint.java?rev=957588&view=auto
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncEndpoint.java
(added)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncEndpoint.java
Thu Jun 24 15:52:50 2010
@@ -0,0 +1,74 @@
+/**
+ * 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.jetty.async;
+
+import org.apache.camel.Component;
+import org.apache.camel.Consumer;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.impl.DefaultEndpoint;
+
+/**
+ * @version $Revision$
+ */
+public class MyAsyncEndpoint extends DefaultEndpoint {
+
+ private String reply;
+ private long delay = 1000;
+ private int failFirstAttempts;
+
+ public MyAsyncEndpoint(String endpointUri, Component component) {
+ super(endpointUri, component);
+ }
+
+ public Producer createProducer() throws Exception {
+ return new MyAsyncProducer(this);
+ }
+
+ public Consumer createConsumer(Processor processor) throws Exception {
+ throw new UnsupportedOperationException("Consumer not supported");
+ }
+
+ public boolean isSingleton() {
+ return false;
+ }
+
+ public String getReply() {
+ return reply;
+ }
+
+ public void setReply(String reply) {
+ this.reply = reply;
+ }
+
+ public long getDelay() {
+ return delay;
+ }
+
+ public void setDelay(long delay) {
+ this.delay = delay;
+ }
+
+ public int getFailFirstAttempts() {
+ return failFirstAttempts;
+ }
+
+ public void setFailFirstAttempts(int failFirstAttempts) {
+ this.failFirstAttempts = failFirstAttempts;
+ }
+
+}
Propchange:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncEndpoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncEndpoint.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncProducer.java?rev=957588&view=auto
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncProducer.java
(added)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncProducer.java
Thu Jun 24 15:52:50 2010
@@ -0,0 +1,75 @@
+/**
+ * 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.jetty.async;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.CamelExchangeException;
+import org.apache.camel.Exchange;
+import org.apache.camel.impl.DefaultAsyncProducer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @version $Revision$
+ */
+public class MyAsyncProducer extends DefaultAsyncProducer {
+
+ private static final Log LOG = LogFactory.getLog(MyAsyncProducer.class);
+ private final ExecutorService executor = Executors.newCachedThreadPool();
+ private final AtomicInteger counter = new AtomicInteger();
+
+ public MyAsyncProducer(MyAsyncEndpoint endpoint) {
+ super(endpoint);
+ }
+
+ public MyAsyncEndpoint getEndpoint() {
+ return (MyAsyncEndpoint) super.getEndpoint();
+ }
+
+ public boolean process(final Exchange exchange, final AsyncCallback
callback) {
+ executor.submit(new Callable<Object>() {
+ public Object call() throws Exception {
+ LOG.info("Simulating a task which takes " +
getEndpoint().getDelay() + " millis to reply");
+ Thread.sleep(getEndpoint().getDelay());
+
+ int count = counter.incrementAndGet();
+ if (getEndpoint().getFailFirstAttempts() >= count) {
+ LOG.info("Simulating a failure at attempt " + count);
+ exchange.setException(new
CamelExchangeException("Simulated error at attempt " + count, exchange));
+ } else {
+ String reply = getEndpoint().getReply();
+ exchange.getOut().setBody(reply);
+ LOG.info("Setting reply " + reply);
+ }
+
+ LOG.info("Callback done(false)");
+ callback.done(false);
+ return null;
+ }
+ });
+
+ // indicate from this point forward its being routed asynchronously
+ LOG.info("Task submitted, now tell Camel routing engine to that this
Exchange is being continued asynchronously");
+ return false;
+ }
+
+}
Propchange:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncProducer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/MyAsyncProducer.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoEndpointTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoEndpointTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoEndpointTest.java
Thu Jun 24 15:52:50 2010
@@ -26,7 +26,6 @@ import org.junit.Test;
/**
* @version $Revision$
*/
-...@ignore
public class HttpJettyProducerTwoEndpointTest extends CamelTestSupport {
@Test
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java
Thu Jun 24 15:52:50 2010
@@ -26,7 +26,6 @@ import org.junit.Test;
/**
* @version $Revision$
*/
-...@ignore
public class JettyHttpProderReturnFaultTest extends CamelTestSupport {
@Test
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsyncTimeoutTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsyncTimeoutTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsyncTimeoutTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsyncTimeoutTest.java
Thu Jun 24 15:52:50 2010
@@ -25,7 +25,6 @@ import org.junit.Test;
/**
* @version $Revision$
*/
-...@ignore
public class JettyHttpProducerAsyncTimeoutTest extends CamelTestSupport {
private String url =
"jetty://http://0.0.0.0:9123/timeout?httpClient.timeout=2000";;
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java
Thu Jun 24 15:52:50 2010
@@ -29,7 +29,6 @@ import org.junit.Test;
/**
* @version $Revision$
*/
-...@ignore
public class JettyHttpProducerAsynchronousTest extends CamelTestSupport {
private static String thread1;
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java
Thu Jun 24 15:52:50 2010
@@ -35,7 +35,6 @@ import org.junit.Test;
*
* @version $Revision$
*/
-...@ignore
public class JettyHttpProducerConcurrentTest extends CamelTestSupport {
@Test
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConnectionFailureTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConnectionFailureTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConnectionFailureTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConnectionFailureTest.java
Thu Jun 24 15:52:50 2010
@@ -29,7 +29,6 @@ import org.junit.Test;
/**
* Unit test to verify that we can have URI options for external system
(endpoint is lenient)
*/
-...@ignore
public class JettyHttpProducerConnectionFailureTest extends CamelTestSupport {
private String serverUri = "jetty://http://localhost:9080/myservice";;
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java
Thu Jun 24 15:52:50 2010
@@ -25,7 +25,6 @@ import org.junit.Test;
/**
* Unit test with a simple route test.
*/
-...@ignore
public class JettyHttpProducerContentBasedRouteTest extends CamelTestSupport {
private String serverUri = "jetty://http://localhost:9087/myservice";;
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamAsExchangeHeaderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamAsExchangeHeaderTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamAsExchangeHeaderTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamAsExchangeHeaderTest.java
Thu Jun 24 15:52:50 2010
@@ -26,7 +26,6 @@ import org.junit.Test;
/**
* Unit test to verify that we can have URI options for external system
(endpoint is lenient)
*/
-...@ignore
public class JettyHttpProducerGetWithParamAsExchangeHeaderTest extends
CamelTestSupport {
private String serverUri = "jetty://http://localhost:9088/myservice";;
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java
Thu Jun 24 15:52:50 2010
@@ -29,7 +29,6 @@ import org.junit.Test;
/**
* Unit test to verify that we can have URI options for external system
(endpoint is lenient)
*/
-...@ignore
public class JettyHttpProducerGetWithParamTest extends CamelTestSupport {
private String serverUri = "jetty://http://localhost:9086/myservice";;
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleAsynchronousTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleAsynchronousTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleAsynchronousTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleAsynchronousTest.java
Thu Jun 24 15:52:50 2010
@@ -25,7 +25,6 @@ import org.junit.Test;
/**
* @version $Revision$
*/
-...@ignore
public class JettyHttpProducerGoogleAsynchronousTest extends CamelTestSupport {
@Test
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleTest.java
Thu Jun 24 15:52:50 2010
@@ -24,7 +24,6 @@ import org.junit.Test;
/**
* @version $Revision$
*/
-...@ignore
public class JettyHttpProducerGoogleTest extends CamelTestSupport {
@Test
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java
Thu Jun 24 15:52:50 2010
@@ -27,7 +27,6 @@ import org.junit.Test;
/**
* @version $Revision$
*/
-...@ignore
public class JettyHttpProducerQueryParamTest extends CamelTestSupport {
private String url = "jetty://http://0.0.0.0:9123/cheese";;
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java
Thu Jun 24 15:52:50 2010
@@ -30,7 +30,6 @@ import org.junit.Test;
/**
* @version $Revision$
*/
-...@ignore
public class JettyHttpProducerSendFileTest extends CamelTestSupport {
@Test
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java
Thu Jun 24 15:52:50 2010
@@ -27,7 +27,6 @@ import org.junit.Test;
/**
* @version $Revision$
*/
-...@ignore
public class JettyHttpProducerSimulate404ErrorTest extends CamelTestSupport {
private String url = "jetty://http://0.0.0.0:9123/bar";;
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java
Thu Jun 24 15:52:50 2010
@@ -29,7 +29,6 @@ import org.junit.Test;
/**
* @version $Revision$
*/
-...@ignore
public class JettyHttpProducerSlowResponseTest extends CamelTestSupport {
private String url = "jetty://http://0.0.0.0:9321/foo";;
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java
Thu Jun 24 15:52:50 2010
@@ -26,7 +26,6 @@ import org.junit.Test;
/**
* @version $Revision$
*/
-...@ignore
public class JettyHttpProducerSuspendResumeTest extends CamelTestSupport {
private String serverUri = "jetty://http://localhost:9286/cool";;
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendTest.java
Thu Jun 24 15:52:50 2010
@@ -26,7 +26,6 @@ import org.junit.Test;
/**
* @version $Revision$
*/
-...@ignore
public class JettyHttpProducerSuspendTest extends CamelTestSupport {
private String serverUri = "jetty://http://localhost:9287/cool";;
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendWhileInProgressTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendWhileInProgressTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendWhileInProgressTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendWhileInProgressTest.java
Thu Jun 24 15:52:50 2010
@@ -32,7 +32,6 @@ import static org.apache.camel.language.
/**
* @version $Revision$
*/
-...@ignore
public class JettyHttpProducerSuspendWhileInProgressTest extends
CamelTestSupport {
private String serverUri = "jetty://http://localhost:9285/cool";;
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java
Thu Jun 24 15:52:50 2010
@@ -26,7 +26,6 @@ import org.junit.Test;
/**
* @version $Revision$
*/
-...@ignore
public class JettyHttpProducerTimeoutTest extends CamelTestSupport {
private String url =
"jetty://http://0.0.0.0:9123/timeout?httpClient.timeout=2000";;
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java
Thu Jun 24 15:52:50 2010
@@ -24,7 +24,6 @@ import org.apache.camel.builder.RouteBui
import org.junit.Before;
import org.junit.Ignore;
-...@ignore
public class JettyHttpsProducerRouteSetupWithSystemPropsTest extends
JettyProducerHttpsRouteTest {
@Override
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHandle404Test.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHandle404Test.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHandle404Test.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHandle404Test.java
Thu Jun 24 15:52:50 2010
@@ -24,7 +24,6 @@ import org.junit.Ignore;
*
* @version $Revision$
*/
-...@ignore
public class JettyProducerHandle404Test extends JettyHandle404Test {
public String getProducerUrl() {
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHttpsRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHttpsRouteTest.java?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHttpsRouteTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHttpsRouteTest.java
Thu Jun 24 15:52:50 2010
@@ -22,7 +22,6 @@ import org.apache.camel.component.mock.M
import org.junit.Ignore;
import org.junit.Test;
-...@ignore
public class JettyProducerHttpsRouteTest extends HttpsRouteTest {
public String getHttpProducerScheme() {
Modified: camel/trunk/components/camel-jetty/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/resources/log4j.properties?rev=957588&r1=957587&r2=957588&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/resources/log4j.properties
(original)
+++ camel/trunk/components/camel-jetty/src/test/resources/log4j.properties Thu
Jun 24 15:52:50 2010
@@ -25,6 +25,7 @@ log4j.rootLogger=INFO, file
# uncomment the following to enable camel debugging
#log4j.logger.org.apache.camel.component.jetty=TRACE
+#log4j.logger.org.apache.camel.component.jetty.CamelContinuationServlet=TRACE
#log4j.logger.org.apache.camel.component.http=TRACE
#log4j.logger.org.apache.camel=DEBUG
