You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ch...@apache.org on 2007/08/28 19:52:36 UTC
svn commit: r570501 - in /activemq/camel/trunk/components: ./ camel-atom/
camel-http/ camel-http/src/main/java/org/apache/camel/component/http/
camel-http/src/main/resources/META-INF/services/org/apache/camel/component/
camel-http/src/test/java/org/apa...
Author: chirino
Date: Tue Aug 28 10:52:33 2007
New Revision: 570501
URL: http://svn.apache.org/viewvc?rev=570501&view=rev
Log:
Fix for https://issues.apache.org/activemq/browse/CAMEL-120
Seperated out the jetty component from the standard http component so that http polling can be implemented.
Added:
activemq/camel/trunk/components/camel-jetty/ (with props)
activemq/camel/trunk/components/camel-jetty/pom.xml (with props)
activemq/camel/trunk/components/camel-jetty/src/
activemq/camel/trunk/components/camel-jetty/src/main/
activemq/camel/trunk/components/camel-jetty/src/main/java/
activemq/camel/trunk/components/camel-jetty/src/main/java/org/
activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/
activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/
activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/
activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/
activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java (with props)
activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/package.html (with props)
activemq/camel/trunk/components/camel-jetty/src/main/resources/
activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/
activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/LICENSE.txt (with props)
activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/NOTICE.txt (with props)
activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/services/
activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/services/org/
activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/services/org/apache/
activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/services/org/apache/camel/
activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/services/org/apache/camel/component/
activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/services/org/apache/camel/component/jetty
activemq/camel/trunk/components/camel-jetty/src/test/
activemq/camel/trunk/components/camel-jetty/src/test/java/
activemq/camel/trunk/components/camel-jetty/src/test/java/org/
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java (with props)
activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteUsingUrlPostTest.java (with props)
activemq/camel/trunk/components/camel-jetty/src/test/resources/
Removed:
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/JettyHttpComponent.java
activemq/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpRouteTest.java
activemq/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpRouteUsingUrlPostTest.java
Modified:
activemq/camel/trunk/components/camel-atom/ (props changed)
activemq/camel/trunk/components/camel-http/pom.xml
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
activemq/camel/trunk/components/camel-http/src/main/resources/META-INF/services/org/apache/camel/component/http
activemq/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java
activemq/camel/trunk/components/pom.xml
Propchange: activemq/camel/trunk/components/camel-atom/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Aug 28 10:52:33 2007
@@ -0,0 +1,6 @@
+.checkstyle
+.pmd
+target
+eclipse-classes
+.classpath
+.project
Modified: activemq/camel/trunk/components/camel-http/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/pom.xml?rev=570501&r1=570500&r2=570501&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-http/pom.xml (original)
+++ activemq/camel/trunk/components/camel-http/pom.xml Tue Aug 28 10:52:33 2007
@@ -43,19 +43,11 @@
<artifactId>geronimo-servlet_2.4_spec</artifactId>
</dependency>
- <!-- only required for consuming -->
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1-rc1</version>
- <optional>true</optional>
- </dependency>
-
- <!-- only required for producing -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <optional>true</optional>
+ <optional>false</optional>
</dependency>
<!-- testing -->
Modified: activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java?rev=570501&r1=570500&r2=570501&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java (original)
+++ activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java Tue Aug 28 10:52:33 2007
@@ -16,9 +16,13 @@
*/
package org.apache.camel.component.http;
+import java.net.URI;
import java.util.Map;
+import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
+import org.apache.camel.Processor;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultComponent;
/**
@@ -29,15 +33,12 @@
*/
public class HttpComponent extends DefaultComponent<HttpExchange> {
- private CamelServlet camelServlet;
-
/**
* Connects the URL specified on the endpoint to the specified processor.
*
* @throws Exception
*/
public void connect(HttpConsumer consumer) throws Exception {
- camelServlet.connect(consumer);
}
/**
@@ -47,20 +48,19 @@
* @throws Exception
*/
public void disconnect(HttpConsumer consumer) throws Exception {
- camelServlet.disconnect(consumer);
- }
-
- public CamelServlet getCamelServlet() {
- return camelServlet;
}
- public void setCamelServlet(CamelServlet camelServlet) {
- this.camelServlet = camelServlet;
- }
@Override
protected Endpoint<HttpExchange> createEndpoint(String uri, String remaining, Map parameters) throws Exception {
- return new HttpEndpoint(uri, this);
+ return new HttpEndpoint(uri, this, new URI(uri)) {
+
+ // TODO: we should implement this using a polling http client.
+ @Override
+ public Consumer<HttpExchange> createConsumer(Processor processor) throws Exception {
+ throw new RuntimeCamelException("Not implemented. You can only produce to a http endpoint.");
+ }
+ };
}
}
Modified: activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java?rev=570501&r1=570500&r2=570501&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java Tue Aug 28 10:52:33 2007
@@ -38,10 +38,10 @@
private HttpComponent component;
private URI httpUri;
- protected HttpEndpoint(String uri, HttpComponent component) throws URISyntaxException {
- super(uri, component);
+ public HttpEndpoint(String endPointURI, HttpComponent component, URI httpURI) throws URISyntaxException {
+ super(endPointURI, component);
this.component = component;
- this.httpUri = new URI(uri);
+ this.httpUri = httpURI;
}
public HttpProducer createProducer() throws Exception {
Modified: activemq/camel/trunk/components/camel-http/src/main/resources/META-INF/services/org/apache/camel/component/http
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/resources/META-INF/services/org/apache/camel/component/http?rev=570501&r1=570500&r2=570501&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-http/src/main/resources/META-INF/services/org/apache/camel/component/http (original)
+++ activemq/camel/trunk/components/camel-http/src/main/resources/META-INF/services/org/apache/camel/component/http Tue Aug 28 10:52:33 2007
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.component.http.JettyHttpComponent
+class=org.apache.camel.component.http.HttpComponent
Modified: activemq/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java?rev=570501&r1=570500&r2=570501&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java (original)
+++ activemq/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpGetTest.java Tue Aug 28 10:52:33 2007
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.http;
-import java.io.IOException;
import java.util.List;
import java.util.Map;
Propchange: activemq/camel/trunk/components/camel-jetty/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Aug 28 10:52:33 2007
@@ -0,0 +1,6 @@
+.checkstyle
+.pmd
+target
+eclipse-classes
+.classpath
+.project
Added: activemq/camel/trunk/components/camel-jetty/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/pom.xml?rev=570501&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/pom.xml (added)
+++ activemq/camel/trunk/components/camel-jetty/pom.xml Tue Aug 28 10:52:33 2007
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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.
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-jetty</artifactId>
+ <name>Camel :: Jetty</name>
+ <description>Camel Jetty support</description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <optional>false</optional>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: activemq/camel/trunk/components/camel-jetty/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-jetty/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-jetty/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=570501&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java (added)
+++ activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java Tue Aug 28 10:52:33 2007
@@ -0,0 +1,185 @@
+/**
+ * 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;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.component.http.CamelServlet;
+import org.apache.camel.component.http.HttpComponent;
+import org.apache.camel.component.http.HttpConsumer;
+import org.apache.camel.component.http.HttpEndpoint;
+import org.apache.camel.component.http.HttpExchange;
+import org.apache.camel.component.http.HttpProducer;
+import org.apache.camel.util.URISupport;
+
+import org.mortbay.jetty.Connector;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.nio.SelectChannelConnector;
+import org.mortbay.jetty.security.SslSocketConnector;
+import org.mortbay.jetty.servlet.Context;
+import org.mortbay.jetty.servlet.ServletHolder;
+
+/**
+ * An HttpComponent which starts an embedded Jetty for to handle consuming from
+ * the http endpoints.
+ *
+ * @version $Revision$
+ */
+public class JettyHttpComponent extends HttpComponent {
+
+ class ConnectorRef {
+ Connector connector;
+ int refCount;
+
+ public ConnectorRef(Connector connector) {
+ this.connector = connector;
+ increment();
+ }
+
+ public int increment() {
+ return ++refCount;
+ }
+
+ public int decrement() {
+ return --refCount;
+ }
+ }
+
+ private CamelServlet camelServlet;
+ private Server server;
+ private final HashMap<String, ConnectorRef> connectors = new HashMap<String, ConnectorRef>();
+
+ @Override
+ protected Endpoint<HttpExchange> createEndpoint(String uri, String remaining, Map parameters) throws Exception {
+ return new HttpEndpoint(uri, this, new URI(remaining)) {
+ @Override
+ public HttpProducer createProducer() throws Exception {
+ throw new RuntimeCamelException("Not implemented. You can only consume from a jetty endpoint.");
+ }
+ };
+ }
+
+ /**
+ * Connects the URL specified on the endpoint to the specified processor.
+ *
+ * @throws Exception
+ */
+ @Override
+ public void connect(HttpConsumer consumer) throws Exception {
+
+ // Make sure that there is a connector for the requested endpoint.
+ HttpEndpoint endpoint = (HttpEndpoint)consumer.getEndpoint();
+ String connectorKey = endpoint.getProtocol() + ":" + endpoint.getPort();
+
+ synchronized (connectors) {
+ ConnectorRef connectorRef = connectors.get(connectorKey);
+ if (connectorRef == null) {
+ Connector connector;
+ if ("https".equals(endpoint.getProtocol())) {
+ connector = new SslSocketConnector();
+ } else {
+ connector = new SelectChannelConnector();
+ }
+ connector.setPort(endpoint.getPort());
+ getServer().addConnector(connector);
+ connector.start();
+ connectorRef = new ConnectorRef(connector);
+ } else {
+ // ref track the connector
+ connectorRef.increment();
+ }
+ }
+
+ camelServlet.connect(consumer);
+ }
+
+ /**
+ * Disconnects the URL specified on the endpoint from the specified
+ * processor.
+ *
+ * @throws Exception
+ */
+ @Override
+ public void disconnect(HttpConsumer consumer) throws Exception {
+ camelServlet.disconnect(consumer);
+
+ // If the connector is not needed anymore.. then stop it.
+ HttpEndpoint endpoint = (HttpEndpoint)consumer.getEndpoint();
+ String connectorKey = endpoint.getProtocol() + ":" + endpoint.getPort();
+
+ synchronized (connectors) {
+ ConnectorRef connectorRef = connectors.get(connectorKey);
+ if (connectorRef != null) {
+ if (connectorRef.decrement() == 0) {
+ getServer().removeConnector(connectorRef.connector);
+ connectorRef.connector.stop();
+ connectors.remove(connectorKey);
+ }
+ }
+ }
+ }
+
+ // Properties
+ // -------------------------------------------------------------------------
+
+ public Server getServer() throws Exception {
+ if (server == null) {
+ server = createServer();
+ }
+ return server;
+ }
+
+ public void setServer(Server server) {
+ this.server = server;
+ }
+
+ // Implementation methods
+ // -------------------------------------------------------------------------
+
+ protected Server createServer() throws Exception {
+ camelServlet = new CamelServlet();
+
+ Server server = new Server();
+ Context context = new Context(Context.NO_SECURITY | Context.NO_SESSIONS);
+
+ context.setContextPath("/");
+ ServletHolder holder = new ServletHolder();
+ holder.setServlet(camelServlet);
+ context.addServlet(holder, "/*");
+ server.setHandler(context);
+
+ server.start();
+ return server;
+ }
+
+ @Override
+ protected void doStop() throws Exception {
+ for (ConnectorRef connectorRef : connectors.values()) {
+ connectorRef.connector.stop();
+ }
+ connectors.clear();
+
+ if (server != null) {
+ server.stop();
+ }
+ super.doStop();
+ }
+}
Propchange: activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/package.html
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/package.html?rev=570501&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/package.html (added)
+++ activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/package.html Tue Aug 28 10:52:33 2007
@@ -0,0 +1,25 @@
+<!--
+ 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.
+-->
+<html>
+<head>
+</head>
+<body>
+
+Defines the <a href="http://activemq.apache.org/camel/jetty-http.html">Jetty HTTP Component</a>
+
+</body>
+</html>
Propchange: activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/package.html
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: activemq/camel/trunk/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/package.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/LICENSE.txt?rev=570501&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/LICENSE.txt (added)
+++ activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/LICENSE.txt Tue Aug 28 10:52:33 2007
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
Propchange: activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:executable = *
Propchange: activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/NOTICE.txt?rev=570501&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/NOTICE.txt (added)
+++ activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/NOTICE.txt Tue Aug 28 10:52:33 2007
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
Propchange: activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/services/org/apache/camel/component/jetty
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/services/org/apache/camel/component/jetty?rev=570501&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/services/org/apache/camel/component/jetty (added)
+++ activemq/camel/trunk/components/camel-jetty/src/main/resources/META-INF/services/org/apache/camel/component/jetty Tue Aug 28 10:52:33 2007
@@ -0,0 +1,17 @@
+#
+# 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.
+#
+class=org.apache.camel.component.jetty.JettyHttpComponent
\ No newline at end of file
Added: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java?rev=570501&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java (added)
+++ activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java Tue Aug 28 10:52:33 2007
@@ -0,0 +1,68 @@
+/**
+ * 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;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ * @version $Revision$
+ */
+public class HttpRouteTest extends ContextTestSupport {
+ protected String expectedBody = "<hello>world!</hello>";
+
+ public void testEndpoint() throws Exception {
+ MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:a", MockEndpoint.class);
+ mockEndpoint.expectedBodiesReceived(expectedBody);
+
+ invokeHttpEndpoint();
+
+ mockEndpoint.assertIsSatisfied();
+ List<Exchange> list = mockEndpoint.getReceivedExchanges();
+ Exchange exchange = list.get(0);
+ assertNotNull("exchange", exchange);
+
+ Message in = exchange.getIn();
+ assertNotNull("in", in);
+
+ Map<String, Object> headers = in.getHeaders();
+
+ log.info("Headers: " + headers);
+
+ assertTrue("Should be more than one header but was: " + headers, headers.size() > 0);
+ }
+
+ protected void invokeHttpEndpoint() throws IOException {
+ template.sendBodyAndHeader("http://localhost:8080/test", expectedBody, "Content-Type", "application/xml");
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() {
+ from("jetty:http://localhost:8080/test").to("mock:a");
+ }
+ };
+ }
+}
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteUsingUrlPostTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteUsingUrlPostTest.java?rev=570501&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteUsingUrlPostTest.java (added)
+++ activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteUsingUrlPostTest.java Tue Aug 28 10:52:33 2007
@@ -0,0 +1,62 @@
+/**
+ * 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;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.net.URL;
+import java.net.URLConnection;
+
+/**
+ * @version $Revision$
+ */
+public class HttpRouteUsingUrlPostTest extends HttpRouteTest {
+
+ protected void invokeHttpEndpoint() throws IOException {
+ URL url = new URL("http://localhost:8080/test");
+ URLConnection urlConnection = url.openConnection();
+ urlConnection.setDoInput(true);
+ urlConnection.setDoOutput(true);
+ urlConnection.setUseCaches(false);
+ urlConnection.setRequestProperty("Content-Type", "application/xml");
+
+ // Send POST data
+ OutputStream out = urlConnection.getOutputStream();
+ BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out));
+ writer.write(expectedBody);
+ writer.close();
+
+ // read the response data
+ BufferedReader reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
+ while (true) {
+ String line = reader.readLine();
+ if (line == null) {
+ break;
+ }
+ log.info("Read: " + line);
+ }
+ reader.close();
+
+// InputStream is = url.openConnection().getInputStream();
+// System.out.println("Content: "+is);
+ }
+
+}
\ No newline at end of file
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteUsingUrlPostTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteUsingUrlPostTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/pom.xml?rev=570501&r1=570500&r2=570501&view=diff
==============================================================================
--- activemq/camel/trunk/components/pom.xml (original)
+++ activemq/camel/trunk/components/pom.xml Tue Aug 28 10:52:33 2007
@@ -43,6 +43,7 @@
<module>camel-http</module>
<module>camel-irc</module>
<module>camel-jaxb</module>
+ <module>camel-jetty</module>
<module>camel-jing</module>
<module>camel-jms</module>
<module>camel-josql</module>