You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/07/30 17:18:11 UTC
svn commit: r799322 - in /camel/trunk: components/camel-restlet/
components/camel-restlet/src/main/java/org/apache/camel/component/restlet/
components/camel-restlet/src/test/java/org/apache/camel/component/restlet/
platforms/karaf/features/src/main/res...
Author: davsclaus
Date: Thu Jul 30 15:18:11 2009
New Revision: 799322
URL: http://svn.apache.org/viewvc?rev=799322&view=rev
Log:
Fixed unit test error with camel-restlet
Modified:
camel/trunk/components/camel-restlet/pom.xml
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-restlet/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/pom.xml?rev=799322&r1=799321&r2=799322&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/pom.xml (original)
+++ camel/trunk/components/camel-restlet/pom.xml Thu Jul 30 15:18:11 2009
@@ -38,6 +38,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-http</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.restlet</groupId>
<artifactId>org.restlet</artifactId>
<version>1.1.4</version>
Modified: camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java?rev=799322&r1=799321&r2=799322&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java (original)
+++ camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java Thu Jul 30 15:18:11 2009
@@ -183,11 +183,6 @@
return endpoint.getHost() + ":" + endpoint.getPort();
}
- /**
- * @param uriPattern
- * @param endpoint
- * @param target
- */
private void attachUriPatternToRestlet(String uriPattern, RestletEndpoint endpoint, Restlet target) {
MethodBasedRouter router = getMethodRouter(uriPattern);
Modified: camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java?rev=799322&r1=799321&r2=799322&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java (original)
+++ camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java Thu Jul 30 15:18:11 2009
@@ -212,7 +212,4 @@
return restletUriPatterns;
}
-
-
-
}
Modified: camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java?rev=799322&r1=799321&r2=799322&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java (original)
+++ camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletRouteBuilderTest.java Thu Jul 30 15:18:11 2009
@@ -73,7 +73,6 @@
String response = (String)template.requestBody("direct:start", "<order foo='1'/>");
assertEquals("received [<order foo='1'/>] as an order id = " + ID, response);
- response = "";
response = (String)template.sendBodyAndHeader(
"restlet:http://localhost:9080/orders?restletMethod=post&foo=bar",
ExchangePattern.InOut,
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=799322&r1=799321&r2=799322&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu Jul 30 15:18:11 2009
@@ -346,7 +346,9 @@
<bundle>mvn:org.apache.camel/camel-quartz/${pom.version}</bundle>
</feature>
<feature name='camel-restlet' version='${pom.version}'>
+ <feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-restlet/${pom.version}</bundle>
+ <feature version='${pom.version}'>camel-http</feature>
</feature>
<feature name='camel-rmi' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>