Author: davsclaus
Date: Tue Dec 14 14:22:07 2010
New Revision: 1049102
URL: http://svn.apache.org/viewvc?rev=1049102&view=rev
Log:
CAMEL-3407: Revert back to use restlet JARs directly as their are already osgi
bundles. CAMEL-3243: Include restlet engine in pom.xml at runtime.
Modified:
camel/trunk/components/camel-restlet/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java
Modified: camel/trunk/components/camel-restlet/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/pom.xml?rev=1049102&r1=1049101&r2=1049102&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/pom.xml (original)
+++ camel/trunk/components/camel-restlet/pom.xml Tue Dec 14 14:22:07 2010
@@ -53,12 +53,16 @@
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.restlet</artifactId>
+ <groupId>org.restlet</groupId>
+ <artifactId>org.restlet</artifactId>
+ </dependency>
+ <!-- restlet engine is needed at runtime -->
+ <dependency>
+ <groupId>com.noelios.restlet</groupId>
+ <artifactId>com.noelios.restlet</artifactId>
</dependency>
<!-- test artifacts -->
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1049102&r1=1049101&r2=1049102&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Dec 14 14:22:07 2010
@@ -115,7 +115,7 @@
<qpid-version>0.5.0</qpid-version>
<quartz-version>1.8.4</quartz-version>
<quickfix-version>1.5.0</quickfix-version>
- <restlet-bundle-version>1.1.10_1</restlet-bundle-version>
+ <restlet-version>1.1.10</restlet-version>
<rome-version>1.0</rome-version>
<saxon-version>9.1.0.8</saxon-version>
<scala-version>2.8.0</scala-version>
@@ -1090,9 +1090,14 @@
<!-- optional restlet support -->
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.restlet</artifactId>
- <version>${restlet-bundle-version}</version>
+ <groupId>org.restlet</groupId>
+ <artifactId>org.restlet</artifactId>
+ <version>${restlet-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.noelios.restlet</groupId>
+ <artifactId>com.noelios.restlet</artifactId>
+ <version>${restlet-version}</version>
</dependency>
<!-- optional jakarta http core support -->
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml?rev=1049102&r1=1049101&r2=1049102&view=diff
==============================================================================
---
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
(original)
+++
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
Tue Dec 14 14:22:07 2010
@@ -474,8 +474,9 @@
</feature>
<feature name='camel-restlet' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.restlet/${restlet-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-restlet/${pom.version}</bundle>
+
<bundle>mvn:http://maven.restlet.org!org.restlet/org.restlet/${restlet-version}</bundle>
+
<bundle>mvn:http://maven.restlet.org!com.noelios.restlet/com.noelios.restlet/${restlet-version}</bundle>
</feature>
<feature name='camel-rmi' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
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=1049102&r1=1049101&r2=1049102&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Dec 14 14:22:07 2010
@@ -477,8 +477,9 @@
</feature>
<feature name='camel-restlet' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.restlet/${restlet-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-restlet/${pom.version}</bundle>
+
<bundle>mvn:http://maven.restlet.org!org.restlet/org.restlet/${restlet-version}</bundle>
+
<bundle>mvn:http://maven.restlet.org!com.noelios.restlet/com.noelios.restlet/${restlet-version}</bundle>
</feature>
<feature name='camel-rmi' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
Modified:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java?rev=1049102&r1=1049101&r2=1049102&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java
(original)
+++
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java
Tue Dec 14 14:22:07 2010
@@ -34,7 +34,7 @@ public class CamelJpaTest extends Abstra
@Configuration
public static Option[] configure() {
- return configure(COMPONENT);
+ return configure(COMPONENT, false, true);
}
}
\ No newline at end of file
