Author: ningjiang
Date: Wed Dec 8 11:34:58 2010
New Revision: 1043363
URL: http://svn.apache.org/viewvc?rev=1043363&view=rev
Log:
CAMEL-3402 Use ServiceMix guice bundle
Modified:
camel/trunk/components/camel-guice/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-guice/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/pom.xml?rev=1043363&r1=1043362&r2=1043363&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/pom.xml (original)
+++ camel/trunk/components/camel-guice/pom.xml Wed Dec 8 11:34:58 2010
@@ -33,6 +33,9 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.guice.*</camel.osgi.export.pkg>
+ <camel.osgi.import.additional>
+ com.google.inject*;version="[2,3)"
+ </camel.osgi.import.additional>
</properties>
<dependencies>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1043363&r1=1043362&r2=1043363&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Dec 8 11:34:58 2010
@@ -1006,11 +1006,6 @@
<artifactId>guiceyfruit-core</artifactId>
<version>${guiceyfruit-version}</version>
</dependency>
- <dependency>
- <groupId>org.guiceyfruit</groupId>
- <artifactId>guiceyfruit-junit3</artifactId>
- <version>${guiceyfruit-version}</version>
- </dependency>
<!-- optional dozer dependencies -->
<dependency>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1043363&r1=1043362&r2=1043363&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Wed Dec 8 11:34:58 2010
@@ -67,6 +67,7 @@
<geronimo-jsp-version>1.0.1</geronimo-jsp-version>
<geronimo-ws-metadata-spec-version>1.1.2</geronimo-ws-metadata-spec-version>
<gernimo-annotation-spec-version>1.1.1</gernimo-annotation-spec-version>
+ <guice-bundle-version>2.0_1-SNAPSHOT</guice-bundle-version>
<hamcrest-bundle-version>1.2-dev1_1</hamcrest-bundle-version>
<hapi-bundle-version>0.5.1_3</hapi-bundle-version>
<hibernate-validator-bundle-version>4.1.0.Final_1</hibernate-validator-bundle-version>
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=1043363&r1=1043362&r2=1043363&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
Wed Dec 8 11:34:58 2010
@@ -280,8 +280,7 @@
<bundle>mvn:org.apache.camel/camel-ftp/${pom.version}</bundle>
</feature>
<feature name='camel-guice' version='${pom.version}'>
-
<bundle>mvn:http://guiceyfruit.googlecode.com/svn/repo/releases!org.guiceyfruit/guiceyfruit-core/${guiceyfruit-version}</bundle>
-
<bundle>mvn:http://guiceyfruit.googlecode.com/svn/repo/releases!org.guiceyfruit/guice-all/${guiceyfruit-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.guice/${guice-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${gernimo-annotation-spec-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}</bundle>
<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=1043363&r1=1043362&r2=1043363&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed
Dec 8 11:34:58 2010
@@ -283,8 +283,7 @@
<bundle>mvn:org.apache.camel/camel-ftp/${pom.version}</bundle>
</feature>
<feature name='camel-guice' version='${pom.version}'>
-
<bundle>mvn:http://guiceyfruit.googlecode.com/svn/repo/releases!org.guiceyfruit/guiceyfruit-core/${guiceyfruit-version}</bundle>
-
<bundle>mvn:http://guiceyfruit.googlecode.com/svn/repo/releases!org.guiceyfruit/guice-all/${guiceyfruit-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.guice/${guice-bundle-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${gernimo-annotation-spec-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}</bundle>
<feature version='${pom.version}'>camel-core</feature>
