camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1429313 - in /camel/trunk: components/camel-guice/pom.xml components/camel-guice/src/main/java/org/apache/camel/guice/support/CloseFailedException.java parent/pom.xml platforms/karaf/features/src/main/resources/features.xml
Date Sat, 05 Jan 2013 15:15:52 GMT
Author: ningjiang
Date: Sat Jan  5 15:15:52 2013
New Revision: 1429313

URL: http://svn.apache.org/viewvc?rev=1429313&view=rev
Log:
CAMEL-4209 Made the camel-guice feature to work

Modified:
    camel/trunk/components/camel-guice/pom.xml
    camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/support/CloseFailedException.java
    camel/trunk/parent/pom.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=1429313&r1=1429312&r2=1429313&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/pom.xml (original)
+++ camel/trunk/components/camel-guice/pom.xml Sat Jan  5 15:15:52 2013
@@ -32,7 +32,7 @@
   <properties>    
     <camel.osgi.export.pkg>org.apache.camel.guice.*</camel.osgi.export.pkg>
     <camel.osgi.import.additional>
-        com.google.inject*;version="[1.2,3)"        
+        com.google.inject*;version="[1.2,4)"        
     </camel.osgi.import.additional>
   </properties>
 

Modified: camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/support/CloseFailedException.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/support/CloseFailedException.java?rev=1429313&r1=1429312&r2=1429313&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/support/CloseFailedException.java
(original)
+++ camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/support/CloseFailedException.java
Sat Jan  5 15:15:52 2013
@@ -26,8 +26,6 @@ import com.google.inject.spi.Message;
  * Indicates that an attempt to close an injector or scope failed closing one or
  * more bindings.
  * 
- * @author james.strachan@gmail.com (James Strachan)
- * @version
  */
 public class CloseFailedException extends IOException {
     private static final long serialVersionUID = 4794716198859801415L;

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1429313&r1=1429312&r2=1429313&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sat Jan  5 15:15:52 2013
@@ -142,7 +142,7 @@
     <google-guava-version>13.0.1</google-guava-version>
     <groovy-version>2.0.6</groovy-version>
     <gson-version>2.2.2</gson-version>
-    <guice-bundle-version>3.0_2</guice-bundle-version>
+    <guice-bundle-version>3.0_1-SNAPSHOT</guice-bundle-version>
     <guice-version>3.0</guice-version>
     <hadoop-bundle-version>1.0.4_1</hadoop-bundle-version>
     <hadoop-version>1.0.4</hadoop-version>
@@ -178,6 +178,7 @@
     <java-apns-version>0.1.6</java-apns-version>
     <javacrumbs-version>0.22</javacrumbs-version>
     <javassist-bundle-version>3.12.1.GA_3</javassist-bundle-version>
+    <javax-inject-bundle-version>1_2</javax-inject-bundle-version>
     <javax-mail-version>1.4.5</javax-mail-version>
     <jaxb-bundle-version>2.2.1.1_2</jaxb-bundle-version>
     <jaxen-version>1.1.4</jaxen-version>

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=1429313&r1=1429312&r2=1429313&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sat Jan  5 15:15:52
2013
@@ -343,8 +343,9 @@
   </feature>
   <feature name='camel-guice' version='${project.version}' resolver='(obr)' start-level='50'>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.guice/${guice-bundle-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation-spec-version}</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-guice/${project.version}</bundle>
   </feature>
@@ -399,7 +400,7 @@
     <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
     <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty6-bundle-version}</bundle>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_2</bundle>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hadoop-core/${hadoop-bundle-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hbase/${hbase-bundle-version}</bundle>



Mime
View raw message