You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2010/03/10 03:20:22 UTC
svn commit: r921210 - in /camel/trunk: ./ components/camel-cometd/
components/camel-cometd/src/main/java/org/apache/camel/component/cometd/
components/camel-cxf/ components/camel-jetty/
components/camel-jetty/src/main/java/org/apache/camel/component/je...
Author: hadrian
Date: Wed Mar 10 02:20:20 2010
New Revision: 921210
URL: http://svn.apache.org/viewvc?rev=921210&view=rev
Log:
CAMEL-2332. Patch applied with many thanks to Christian. Keep them coming
Modified:
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/CometdProducer.java
camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducerConsumer.java
camel/trunk/components/camel-cxf/pom.xml
camel/trunk/components/camel-jetty/pom.xml
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/JettyContentExchange.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/JettyHttpEndpoint.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/ExplicitHttpsRouteTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java
camel/trunk/components/camel-web-standalone/pom.xml
camel/trunk/components/camel-web-standalone/src/main/assembly/assembly.xml
camel/trunk/components/camel-web/pom.xml
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/Main.java
camel/trunk/examples/camel-example-axis/pom.xml
camel/trunk/examples/camel-example-axis/src/test/java/org/apache/camel/example/axis/AxisReportIncidentServiceTest.java
camel/trunk/examples/camel-example-cxf/build.xml
camel/trunk/examples/camel-example-reportincident/build.xml
camel/trunk/examples/camel-example-reportincident/pom.xml
camel/trunk/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml
camel/trunk/examples/camel-example-reportincident/src/main/resources/etc/report_incident.wsdl
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
camel/trunk/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml
Modified: camel/trunk/components/camel-cometd/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/pom.xml?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/pom.xml (original)
+++ camel/trunk/components/camel-cometd/pom.xml Wed Mar 10 02:20:20 2010
@@ -44,13 +44,17 @@
<artifactId>camel-stream</artifactId>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>cometd-server</artifactId>
- <version>${jetty-version}</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.cometd.java</groupId>
+ <artifactId>cometd-java-server</artifactId>
+ <version>1.0.1</version>
</dependency>
<!-- Test Dependencies -->
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=921210&r1=921209&r2=921210&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 Wed Mar 10 02:20:20 2010
@@ -16,10 +16,7 @@
*/
package org.apache.camel.component.cometd;
-import java.io.IOException;
import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLStreamHandler;
import java.util.HashMap;
import java.util.Map;
@@ -27,18 +24,16 @@ import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.mortbay.cometd.AbstractBayeux;
-import org.mortbay.cometd.continuation.ContinuationCometdServlet;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.ContextHandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.security.SslSocketConnector;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
-import org.mortbay.resource.FileResource;
-import org.mortbay.resource.Resource;
-import org.mortbay.resource.URLResource;
+import org.cometd.server.AbstractBayeux;
+import org.cometd.server.continuation.ContinuationCometdServlet;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.ContextHandlerCollection;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.ssl.SslSocketConnector;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.util.resource.Resource;
/**
* Component for Jetty Cometd
@@ -113,7 +108,7 @@ public class CometdComponent extends Def
ContinuationCometdServlet servlet = createServletForConnector(connector, endpoint);
connectorRef = new ConnectorRef(connector, servlet);
- connector.start();
+ getServer().start();
connectors.put(connectorKey, connectorRef);
} else {
@@ -149,7 +144,7 @@ public class CometdComponent extends Def
protected ContinuationCometdServlet createServletForConnector(Connector connector, CometdEndpoint endpoint) throws Exception {
ContinuationCometdServlet servlet = new ContinuationCometdServlet();
- Context context = new Context(server, "/", Context.NO_SECURITY | Context.NO_SESSIONS);
+ ServletContextHandler context = new ServletContextHandler(server, "/", ServletContextHandler.NO_SECURITY | ServletContextHandler.NO_SESSIONS);
context.setConnectorNames(new String[] {connector.getName()});
ServletHolder holder = new ServletHolder();
@@ -158,29 +153,20 @@ public class CometdComponent extends Def
// Use baseResource to pass as a parameter the url
// pointing to by example classpath:webapp
if (endpoint.getBaseResource() != null) {
-
String[] resources = endpoint.getBaseResource().split(":");
LOG.debug(">>> Protocol found :" + resources[0] + ", and resource : " + resources[1]);
if (resources[0].equals("file")) {
context.setBaseResource(Resource.newResource(resources[1]));
-
} else if (resources[0].equals("classpath")) {
-
// Create a URL handler using classpath protocol
URL url = this.getCamelContext().getClassResolver().loadResourceAsURL(resources[1]);
context.setBaseResource(Resource.newResource(url));
-
}
-
}
-
context.addServlet(holder, "/cometd/*");
- context.addServlet("org.mortbay.jetty.servlet.DefaultServlet", "/");
-
- connector.start();
- context.start();
+ context.addServlet("org.eclipse.jetty.servlet.DefaultServlet", "/");
holder.setInitParameter("timeout", Integer.toString(endpoint.getTimeout()));
holder.setInitParameter("interval", Integer.toString(endpoint.getInterval()));
@@ -244,10 +230,7 @@ public class CometdComponent extends Def
protected Server createServer() throws Exception {
Server server = new Server();
ContextHandlerCollection collection = new ContextHandlerCollection();
- collection.setServer(server);
- server.addHandler(collection);
- server.start();
-
+ server.setHandler(collection);
return server;
}
@@ -268,5 +251,4 @@ public class CometdComponent extends Def
protected void doStart() throws Exception {
super.doStart();
}
-
-}
+}
\ No newline at end of file
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=921210&r1=921209&r2=921210&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 Wed Mar 10 02:20:20 2010
@@ -23,8 +23,8 @@ import org.apache.camel.impl.DefaultCons
import org.apache.camel.impl.DefaultMessage;
import org.cometd.Bayeux;
import org.cometd.Client;
-import org.mortbay.cometd.AbstractBayeux;
-import org.mortbay.cometd.BayeuxService;
+import org.cometd.server.AbstractBayeux;
+import org.cometd.server.BayeuxService;
/**
* A Consumer for receiving messages using Cometd and Bayeux protocol.
@@ -85,5 +85,4 @@ public class CometdConsumer extends Defa
consumer.getProcessor().process(exchange);
}
}
-
-}
+}
\ No newline at end of file
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=921210&r1=921209&r2=921210&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 Wed Mar 10 02:20:20 2010
@@ -24,7 +24,7 @@ import org.apache.camel.util.ObjectHelpe
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.cometd.Client;
-import org.mortbay.cometd.AbstractBayeux;
+import org.cometd.server.AbstractBayeux;
/**
* A Producer to send messages using Cometd and Bayeux protocol.
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=921210&r1=921209&r2=921210&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 Wed Mar 10 02:20:20 2010
@@ -16,7 +16,8 @@
*/
package org.apache.camel.component.cometd;
-import org.mortbay.cometd.AbstractBayeux;
+import org.cometd.server.AbstractBayeux;
+
public interface CometdProducerConsumer {
@@ -29,5 +30,5 @@ public interface CometdProducerConsumer
* Sets the bayeux to use.
*/
void setBayeux(AbstractBayeux bayeux);
-
-}
+
+}
\ No newline at end of file
Modified: camel/trunk/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/pom.xml?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/pom.xml (original)
+++ camel/trunk/components/camel-cxf/pom.xml Wed Mar 10 02:20:20 2010
@@ -156,12 +156,6 @@
<version>${cxf-version}</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: camel/trunk/components/camel-jetty/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/pom.xml?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/pom.xml (original)
+++ camel/trunk/components/camel-jetty/pom.xml Wed Mar 10 02:20:20 2010
@@ -45,11 +45,19 @@
<artifactId>camel-http</artifactId>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
</dependency>
@@ -102,5 +110,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-</project>
+</project>
\ No newline at end of file
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=921210&r1=921209&r2=921210&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 Wed Mar 10 02:20:20 2010
@@ -25,8 +25,8 @@ import javax.servlet.http.HttpServletRes
import org.apache.camel.Exchange;
import org.apache.camel.component.http.CamelServlet;
import org.apache.camel.component.http.HttpConsumer;
-import org.mortbay.util.ajax.Continuation;
-import org.mortbay.util.ajax.ContinuationSupport;
+import org.eclipse.jetty.continuation.Continuation;
+import org.eclipse.jetty.continuation.ContinuationSupport;
/**
* @version $Revision$
@@ -47,8 +47,8 @@ public class CamelContinuationServlet ex
return;
}
- final Continuation continuation = ContinuationSupport.getContinuation(request, null);
- if (continuation.isNew()) {
+ 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);
@@ -81,7 +81,7 @@ public class CamelContinuationServlet ex
}
if (continuation.isResumed()) {
- Exchange exchange = (Exchange)continuation.getObject();
+ Exchange exchange = (Exchange)continuation.getAttribute("result");
// now lets output to the response
consumer.getBinding().writeResponse(exchange, response);
return;
Modified: camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java (original)
+++ camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyContentExchange.java Wed Mar 10 02:20:20 2010
@@ -31,11 +31,11 @@ import org.apache.camel.ExchangeTimedOut
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.mortbay.io.Buffer;
-import org.mortbay.jetty.HttpHeaders;
-import org.mortbay.jetty.client.ContentExchange;
-import org.mortbay.jetty.client.HttpClient;
-import org.mortbay.jetty.client.HttpExchange;
+import org.eclipse.jetty.client.ContentExchange;
+import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.client.HttpExchange;
+import org.eclipse.jetty.http.HttpHeaders;
+import org.eclipse.jetty.io.Buffer;
/**
* Jetty specific exchange which keeps track of the the request and response.
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=921210&r1=921209&r2=921210&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 Wed Mar 10 02:20:20 2010
@@ -33,20 +33,22 @@ import org.apache.camel.util.URISupport;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.mortbay.component.LifeCycle;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.client.Address;
-import org.mortbay.jetty.client.HttpClient;
-import org.mortbay.jetty.handler.ContextHandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.security.SslSocketConnector;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
-import org.mortbay.jetty.servlet.SessionHandler;
-import org.mortbay.thread.QueuedThreadPool;
-import org.mortbay.thread.ThreadPool;
+import org.eclipse.jetty.client.Address;
+import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.ContextHandlerCollection;
+import org.eclipse.jetty.server.handler.HandlerCollection;
+import org.eclipse.jetty.server.handler.HandlerWrapper;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.session.SessionHandler;
+import org.eclipse.jetty.server.ssl.SslSocketConnector;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.util.component.LifeCycle;
+import org.eclipse.jetty.util.thread.QueuedThreadPool;
+import org.eclipse.jetty.util.thread.ThreadPool;
/**
* An HttpComponent which starts an embedded Jetty for to handle consuming from
@@ -59,7 +61,7 @@ public class JettyHttpComponent extends
protected static final HashMap<String, ConnectorRef> CONNECTORS = new HashMap<String, ConnectorRef>();
private static final transient Log LOG = LogFactory.getLog(JettyHttpComponent.class);
- private static final String JETTY_SSL_KEYSTORE = "jetty.ssl.keystore";
+ private static final String JETTY_SSL_KEYSTORE = "org.eclipse.jetty.ssl.keystore";
protected String sslKeyPassword;
protected String sslPassword;
@@ -157,7 +159,7 @@ public class JettyHttpComponent extends
server.addConnector(connector);
connectorRef = new ConnectorRef(server, connector, createServletForConnector(server, connector, endpoint.getHandlers()));
- connector.start();
+ connectorRef.server.start();
CONNECTORS.put(connectorKey, connectorRef);
@@ -174,17 +176,18 @@ public class JettyHttpComponent extends
}
private void enableSessionSupport(Server server) throws Exception {
- Context context = (Context)server.getChildHandlerByClass(Context.class);
+ ServletContextHandler context = (ServletContextHandler)server.getChildHandlerByClass(ServletContextHandler.class);
if (context.getSessionHandler() == null) {
SessionHandler sessionHandler = new SessionHandler();
- context.setSessionHandler(sessionHandler);
if (context.isStarted()) {
// restart the context
context.stop();
+ context.setSessionHandler(sessionHandler);
context.start();
+ } else {
+ context.setSessionHandler(sessionHandler);
}
}
-
}
/**
@@ -351,22 +354,27 @@ public class JettyHttpComponent extends
// Implementation methods
// -------------------------------------------------------------------------
protected CamelServlet createServletForConnector(Server server, Connector connector, List<Handler> handlers) throws Exception {
- CamelServlet camelServlet = new CamelServlet();
-
- Context context = new Context(server, "/", Context.NO_SECURITY | Context.NO_SESSIONS);
+ ServletContextHandler context = new ServletContextHandler(server, "/", ServletContextHandler.NO_SECURITY | ServletContextHandler.NO_SESSIONS);
context.setConnectorNames(new String[] {connector.getName()});
- if (handlers != null) {
+ if (handlers != null && !handlers.isEmpty()) {
for (Handler handler : handlers) {
- context.addHandler(handler);
+ if (handler instanceof HandlerWrapper) {
+ ((HandlerWrapper) handler).setHandler(server.getHandler());
+ server.setHandler(handler);
+ } else {
+ HandlerCollection handlerCollection = new HandlerCollection();
+ handlerCollection.addHandler(server.getHandler());
+ handlerCollection.addHandler(handler);
+ server.setHandler(handlerCollection);
+ }
}
}
+ CamelServlet camelServlet = new CamelServlet();
ServletHolder holder = new ServletHolder();
holder.setServlet(camelServlet);
context.addServlet(holder, "/*");
- connector.start();
- context.start();
return camelServlet;
}
@@ -374,9 +382,7 @@ public class JettyHttpComponent extends
protected Server createServer() throws Exception {
Server server = new Server();
ContextHandlerCollection collection = new ContextHandlerCollection();
- collection.setServer(server);
- server.addHandler(collection);
- server.start();
+ server.setHandler(collection);
return server;
}
@@ -411,4 +417,4 @@ public class JettyHttpComponent extends
lc.stop();
}
}
-}
+}
\ No newline at end of file
Modified: camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java (original)
+++ camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java Wed Mar 10 02:20:20 2010
@@ -25,8 +25,8 @@ import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.component.http.HttpConsumer;
import org.apache.camel.component.http.HttpEndpoint;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.client.HttpClient;
+import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.server.Handler;
/**
* @version $Revision$
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=921210&r1=921209&r2=921210&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 Wed Mar 10 02:20:20 2010
@@ -38,9 +38,9 @@ import org.apache.camel.util.ObjectHelpe
import org.apache.camel.util.URISupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.mortbay.io.ByteArrayBuffer;
-import org.mortbay.jetty.client.HttpClient;
-import org.mortbay.jetty.client.HttpExchange;
+import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.client.HttpExchange;
+import org.eclipse.jetty.io.ByteArrayBuffer;
/**
* @version $Revision$
@@ -219,5 +219,4 @@ public class JettyHttpProducer extends D
super.doStop();
client.stop();
}
-
-}
+}
\ No newline at end of file
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java Wed Mar 10 02:20:20 2010
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.mortbay.jetty.security.SslSocketConnector;
+import org.eclipse.jetty.server.ssl.SslSocketConnector;
public class ExplicitHttpsRouteTest extends HttpsRouteTest {
@@ -63,5 +63,4 @@ public class ExplicitHttpsRouteTest exte
}
};
}
-}
-
+}
\ No newline at end of file
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HandlerTest.java Wed Mar 10 02:20:20 2010
@@ -25,8 +25,8 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.eclipse.jetty.server.handler.StatisticsHandler;
import org.junit.Test;
-import org.mortbay.jetty.handler.StatisticsHandler;
public class HandlerTest extends CamelTestSupport {
private StatisticsHandler statisticsHandler1 = new StatisticsHandler();
@@ -36,28 +36,35 @@ public class HandlerTest extends CamelTe
private String htmlResponse = "<html><body>Book 123 is Camel in Action</body></html>";
@Test
- public void testHandler() throws Exception {
+ public void testWithOneHandler() throws Exception {
// First test the situation where one should invoke the handler once
assertEquals(0, statisticsHandler1.getRequests());
assertEquals(0, statisticsHandler2.getRequests());
assertEquals(0, statisticsHandler3.getRequests());
+
ByteArrayInputStream html = (ByteArrayInputStream) template
.requestBody("http://localhost:9080/", "");
BufferedReader br = new BufferedReader(new InputStreamReader(html));
+
assertEquals(htmlResponse, br.readLine());
assertEquals(1, statisticsHandler1.getRequests());
assertEquals(0, statisticsHandler2.getRequests());
assertEquals(0, statisticsHandler3.getRequests());
-
- // Now test the situation where one should invoke the handler twice
- assertEquals(1, statisticsHandler1.getRequests());
+ }
+
+ @Test
+ public void testWithTwoHandlers() throws Exception {
+ // First test the situation where one should invoke the handler once
+ assertEquals(0, statisticsHandler1.getRequests());
assertEquals(0, statisticsHandler2.getRequests());
assertEquals(0, statisticsHandler3.getRequests());
- html = (ByteArrayInputStream) template.requestBody(
+
+ ByteArrayInputStream html = (ByteArrayInputStream) template.requestBody(
"http://localhost:9081/", "");
- br = new BufferedReader(new InputStreamReader(html));
+ BufferedReader br = new BufferedReader(new InputStreamReader(html));
+
assertEquals(htmlResponse, br.readLine());
- assertEquals(1, statisticsHandler1.getRequests());
+ assertEquals(0, statisticsHandler1.getRequests());
assertEquals(1, statisticsHandler2.getRequests());
assertEquals(1, statisticsHandler3.getRequests());
}
@@ -93,4 +100,4 @@ public class HandlerTest extends CamelTe
};
};
}
-}
+}
\ No newline at end of file
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java Wed Mar 10 02:20:20 2010
@@ -26,11 +26,13 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.eclipse.jetty.http.security.Constraint;
+import org.eclipse.jetty.security.ConstraintMapping;
+import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.security.SecurityHandler;
+import org.eclipse.jetty.security.authentication.BasicAuthenticator;
import org.junit.Test;
-import org.mortbay.jetty.security.Constraint;
-import org.mortbay.jetty.security.ConstraintMapping;
-import org.mortbay.jetty.security.HashUserRealm;
-import org.mortbay.jetty.security.SecurityHandler;
/**
* @version $Revision$
@@ -45,19 +47,19 @@ public class HttpBasicAuthTest extends C
}
private SecurityHandler getSecurityHandler() throws IOException {
- Constraint constraint = new Constraint();
- constraint.setName(Constraint.__BASIC_AUTH);
-
- constraint.setRoles(new String[]{"user"});
+ Constraint constraint = new Constraint(Constraint.__BASIC_AUTH, "user");
constraint.setAuthenticate(true);
ConstraintMapping cm = new ConstraintMapping();
- cm.setConstraint(constraint);
cm.setPathSpec("/*");
+ cm.setConstraint(constraint);
- SecurityHandler sh = new SecurityHandler();
- HashUserRealm realm = new HashUserRealm("MyRealm", "src/test/resources/myRealm.properties");
- sh.setUserRealm(realm);
+ ConstraintSecurityHandler sh = new ConstraintSecurityHandler();
+ sh.setAuthenticator(new BasicAuthenticator());
+ sh.setConstraintMappings(new ConstraintMapping[] {cm});
+
+ HashLoginService loginService = new HashLoginService("MyRealm", "src/test/resources/myRealm.properties");
+ sh.setLoginService(loginService);
sh.setConstraintMappings(new ConstraintMapping[]{cm});
return sh;
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSetupWithSystemPropsTest.java Wed Mar 10 02:20:20 2010
@@ -34,9 +34,9 @@ public class HttpsRouteSetupWithSystemPr
setSystemProp("javax.net.ssl.trustStore", trustStoreUrl.getPath());
// setup SSL using system properties
- setSystemProp("jetty.ssl.keystore", trustStoreUrl.getPath());
- setSystemProp("jetty.ssl.keypassword", pwd);
- setSystemProp("jetty.ssl.password", pwd);
+ setSystemProp("org.eclipse.jetty.ssl.keystore", trustStoreUrl.getPath());
+ setSystemProp("org.eclipse.jetty.ssl.keypassword", pwd);
+ setSystemProp("org.eclipse.jetty.ssl.password", pwd);
super.setUp();
}
@@ -58,5 +58,4 @@ public class HttpsRouteSetupWithSystemPr
}
};
}
-}
-
+}
\ No newline at end of file
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=921210&r1=921209&r2=921210&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 Wed Mar 10 02:20:20 2010
@@ -42,9 +42,9 @@ public class JettyHttpsProducerRouteSetu
setSystemProp("javax.net.ssl.trustStore", trustStoreUrl.getPath());
// setup SSL using system properties
- setSystemProp("jetty.ssl.keystore", trustStoreUrl.getPath());
- setSystemProp("jetty.ssl.keypassword", pwd);
- setSystemProp("jetty.ssl.password", pwd);
+ setSystemProp("org.eclipse.jetty.ssl.keystore", trustStoreUrl.getPath());
+ setSystemProp("org.eclipse.jetty.ssl.keypassword", pwd);
+ setSystemProp("org.eclipse.jetty.ssl.password", pwd);
super.setUp();
}
Modified: camel/trunk/components/camel-web-standalone/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web-standalone/pom.xml?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/components/camel-web-standalone/pom.xml (original)
+++ camel/trunk/components/camel-web-standalone/pom.xml Wed Mar 10 02:20:20 2010
@@ -39,9 +39,10 @@
</dependency>
<dependency>
+ <!-- not org.eclipse.jetty at present -->
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-runner</artifactId>
- <version>7.0.0.pre5</version>
+ <version>${jetty-version}</version>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-web-standalone/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web-standalone/src/main/assembly/assembly.xml?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/components/camel-web-standalone/src/main/assembly/assembly.xml (original)
+++ camel/trunk/components/camel-web-standalone/src/main/assembly/assembly.xml Wed Mar 10 02:20:20 2010
@@ -45,6 +45,7 @@
<outputDirectory></outputDirectory>
<outputFileNameMapping></outputFileNameMapping>
<includes>
+ <!-- not org.eclipse.jetty:jetty-runner at present -->
<include>org.mortbay.jetty:jetty-runner</include>
</includes>
</dependencySet>
Modified: camel/trunk/components/camel-web/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Wed Mar 10 02:20:20 2010
@@ -146,22 +146,20 @@
<!-- testing web container -->
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>${jetty-version}</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
<version>${jetty-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1</artifactId>
- <!-- a newer release of jsp-2.1 was not found in mvn repo -->
- <version>6.1.14</version>
+ <artifactId>jsp-2.1-glassfish</artifactId>
+ <version>2.1.v20100127</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -247,13 +245,11 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
+ <artifactId>jetty-maven-plugin</artifactId>
<version>${jetty-version}</version>
-
<configuration>
<!--
- <connectors> <connector
- implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <connectors> <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
<port>${jetty.port}</port> <maxIdleTime>60000</maxIdleTime>
</connector> </connectors>
-->
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/Main.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/Main.java?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/Main.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/Main.java Wed Mar 10 02:20:20 2010
@@ -16,11 +16,11 @@
*/
package org.apache.camel.web;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.webapp.WebAppContext;
+
/**
* A simple bootstrap class for starting Jetty in your IDE using the local web
@@ -65,7 +65,7 @@ public final class Main {
context.setContextPath(WEBAPP_CTX);
context.setServer(server);
- server.setHandlers(new Handler[]{context});
+ server.setHandler(context);
server.setConnectors(new Connector[]{connector});
server.start();
Modified: camel/trunk/examples/camel-example-axis/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-axis/pom.xml?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-axis/pom.xml (original)
+++ camel/trunk/examples/camel-example-axis/pom.xml Wed Mar 10 02:20:20 2010
@@ -93,19 +93,22 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>${jetty-version}</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
+ <artifactId>jetty-maven-plugin</artifactId>
<version>${jetty-version}</version>
</plugin>
@@ -136,9 +139,6 @@
<fileApplicationContextUri>src/main/resources/*.xml</fileApplicationContextUri>
</configuration>
</plugin>
-
</plugins>
-
</build>
-
-</project>
+</project>
\ No newline at end of file
Modified: camel/trunk/examples/camel-example-axis/src/test/java/org/apache/camel/example/axis/AxisReportIncidentServiceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-axis/src/test/java/org/apache/camel/example/axis/AxisReportIncidentServiceTest.java?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-axis/src/test/java/org/apache/camel/example/axis/AxisReportIncidentServiceTest.java (original)
+++ camel/trunk/examples/camel-example-axis/src/test/java/org/apache/camel/example/axis/AxisReportIncidentServiceTest.java Wed Mar 10 02:20:20 2010
@@ -24,10 +24,10 @@ import org.apache.camel.example.reportin
import org.apache.camel.example.reportincident.OutputReportIncident;
import org.apache.camel.example.reportincident.ReportIncidentService_PortType;
import org.apache.camel.example.reportincident.ReportIncidentService_ServiceLocator;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.webapp.WebAppContext;
/**
* Unit test with embedded Jetty to execute a webservice request using Axis
Modified: camel/trunk/examples/camel-example-cxf/build.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/build.xml?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/build.xml (original)
+++ camel/trunk/examples/camel-example-cxf/build.xml Wed Mar 10 02:20:20 2010
@@ -24,7 +24,7 @@
<fail unless="env.ACTIVEMQ_HOME" message="You must download ActiveMQ and set your ACTIVEMQ_HOME to run this demo."/>
<fail unless="env.CXF_HOME" message="You must download CXF and set your CXF_HOME to run this demo."/>
<fail unless="env.SPRING_HOME" message="You must download Spring2.5 and set your CXF_HOME to run this demo."/>
- <fail unless="env.JETTY_HOME" message="You must download Jetty6 and set your JETTY_HOME to run this demo."/>
+ <fail unless="env.JETTY_HOME" message="You must download Jetty7 and set your JETTY_HOME to run this demo."/>
<property name="project.name" value="camel-example-cxf"/>
Modified: camel/trunk/examples/camel-example-reportincident/build.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident/build.xml?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident/build.xml (original)
+++ camel/trunk/examples/camel-example-reportincident/build.xml Wed Mar 10 02:20:20 2010
@@ -23,7 +23,7 @@
<fail unless="env.CXF_HOME" message="You must download CXF and set your CXF_HOME to run this demo."/>
<fail unless="env.SPRING_HOME" message="You must download Spring2.5 and set your CXF_HOME to run this demo."/>
- <fail unless="env.JETTY_HOME" message="You must download Jetty6 and set your JETTY_HOME to run this demo."/>
+ <fail unless="env.JETTY_HOME" message="You must download Jetty7 and set your JETTY_HOME to run this demo."/>
<property name="project.name" value="camel-example-reportincident"/>
Modified: camel/trunk/examples/camel-example-reportincident/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident/pom.xml?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident/pom.xml (original)
+++ camel/trunk/examples/camel-example-reportincident/pom.xml Wed Mar 10 02:20:20 2010
@@ -148,11 +148,11 @@
<!-- so we can run mvn jetty:run -->
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
+ <artifactId>jetty-maven-plugin</artifactId>
<version>${jetty-version}</version>
<configuration>
<connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
<port>9080</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
@@ -162,5 +162,4 @@
</plugins>
</build>
-
-</project>
+</project>
\ No newline at end of file
Modified: camel/trunk/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml (original)
+++ camel/trunk/examples/camel-example-reportincident/src/main/resources/META-INF/spring/camel-context.xml Wed Mar 10 02:20:20 2010
@@ -32,8 +32,7 @@
<cxf:cxfEndpoint id="reportIncident"
address="http://localhost:9080/camel-example-reportincident/webservices/incident"
wsdlURL="etc/report_incident.wsdl"
- serviceClass="org.apache.camel.example.reportincident.ReportIncidentEndpoint">
- </cxf:cxfEndpoint>
+ serviceClass="org.apache.camel.example.reportincident.ReportIncidentEndpoint"/>
<bean id="myBean" class="org.apache.camel.example.reportincident.MyBean"/>
<bean id="filenameGenerator" class="org.apache.camel.example.reportincident.FilenameGenerator"/>
Modified: camel/trunk/examples/camel-example-reportincident/src/main/resources/etc/report_incident.wsdl
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident/src/main/resources/etc/report_incident.wsdl?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident/src/main/resources/etc/report_incident.wsdl (original)
+++ camel/trunk/examples/camel-example-reportincident/src/main/resources/etc/report_incident.wsdl Wed Mar 10 02:20:20 2010
@@ -27,7 +27,7 @@
<wsdl:types>
<xs:schema targetNamespace="http://reportincident.example.camel.apache.org">
<xs:element name="inputReportIncident">
- <xs:complexType name="inputReportIncident">
+ <xs:complexType>
<xs:sequence>
<xs:element type="xs:string" name="incidentId"/>
<xs:element type="xs:string" name="incidentDate"/>
@@ -41,7 +41,7 @@
</xs:complexType>
</xs:element>
<xs:element name="outputReportIncident">
- <xs:complexType name="outputReportIncident">
+ <xs:complexType>
<xs:sequence>
<xs:element type="xs:string" name="code"/>
</xs:sequence>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Mar 10 02:20:20 2010
@@ -78,7 +78,7 @@
<javax-mail-version>1.4.3</javax-mail-version>
<jaxb-version>2.1.12</jaxb-version>
<jaxb-api-version>2.1</jaxb-api-version>
- <jetty-version>6.1.22</jetty-version>
+ <jetty-version>7.0.1.v20091125</jetty-version>
<jettison-version>1.2</jettison-version>
<jruby-version>1.4.0</jruby-version>
<juel-version>2.1.2</juel-version>
@@ -928,13 +928,28 @@
<!-- optional jetty support -->
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
<version>${jetty-version}</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-client</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${jetty-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
<version>${jetty-version}</version>
</dependency>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Wed Mar 10 02:20:20 2010
@@ -72,8 +72,8 @@
<jcr-bundle-version>1.0_2</jcr-bundle-version>
<jdom-bundle-version>1.1_2</jdom-bundle-version>
<jettison-bundle-version>1.2</jettison-bundle-version>
- <jetty-bundle-version>6.1.22_1</jetty-bundle-version>
- <jetty-cometd-bundle-version>6.1.22_1-SNAPSHOT</jetty-cometd-bundle-version>
+ <jetty-bundle-version>7.0.1.v20091125</jetty-bundle-version>
+ <cometd-java-server-bundle-version>1.0.1_1-SNAPSHOT</cometd-java-server-bundle-version>
<jing-bundle-version>20030619_1</jing-bundle-version>
<jodatime-bundle-version>1.5.2_2</jodatime-bundle-version>
<josql-bundle-version>1.5_3</josql-bundle-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties Wed Mar 10 02:20:20 2010
@@ -54,7 +54,7 @@ org.apache.servicemix.bundles/org.apache
org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/${jexcelapi-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.jettison/${jettison-bundle-version}/jar
-org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-cometd/${jetty-cometd-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.cometd-java-server/${cometd-java-server-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql-bundle-version}/jar
org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}/jar
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed Mar 10 02:20:20 2010
@@ -33,7 +33,14 @@
<bundle>mvn:org.springframework/spring-jms/${spring-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-util/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-client/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec-bundle-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle>mvn:org.codehaus.jettison/jettison/${jettison-bundle-version}</bundle>
@@ -101,7 +108,16 @@
<bundle>mvn:org.apache.camel/camel-mina/${pom.version}</bundle>
</feature>
<feature name='camel-jetty' version='${pom.version}'>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-util/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-client/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty-bundle-version}</bundle>
+ <feature version='${pom.version}'>camel-core</feature>
<feature version='${pom.version}'>camel-http</feature>
<bundle>mvn:org.apache.camel/camel-jetty/${pom.version}</bundle>
</feature>
@@ -159,9 +175,17 @@
</feature>
<feature name='camel-cometd' version='${pom.version}'>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty-bundle-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-cometd/${jetty-cometd-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-util/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-io/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-http/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-client/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-continuation/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-server/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-security/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.eclipse.jetty/jetty-servlet/${jetty-bundle-version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cometd-java-server/${cometd-java-server-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
+ <feature version='${pom.version}'>camel-stream</feature>
<bundle>mvn:org.apache.camel/camel-cometd/${pom.version}</bundle>
</feature>
<feature name='camel-csv' version='${pom.version}'>
Modified: camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Wed Mar 10 02:20:20 2010
@@ -43,7 +43,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<site-repo-url>scpexe://people.apache.org/www/camel.apache.org/maven/</site-repo-url>
<felix-version>2.0.1</felix-version>
- <jetty-version>6.1.22</jetty-version>
+ <jetty-version>7.0.1.v20091125</jetty-version>
<jaxb-version>2.1.12</jaxb-version>
<jaxb-api-version>2.1</jaxb-api-version>
</properties>
@@ -265,7 +265,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
+ <artifactId>jetty-maven-plugin</artifactId>
<version>${jetty-version}</version>
</plugin>
Modified: camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml?rev=921210&r1=921209&r2=921210&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml Wed Mar 10 02:20:20 2010
@@ -94,7 +94,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
+ <artifactId>jetty-maven-plugin</artifactId>
<version>${jetty-version}</version>
<configuration>