camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r816078 - in /camel/branches/camel-1.x: ./ camel-core/ components/camel-amqp/ components/camel-cxf/ components/camel-flatpack/ components/camel-freemarker/ components/camel-http/ components/camel-jpa/ components/camel-mina/ components/camel...
Date Thu, 17 Sep 2009 07:15:04 GMT
Author: gnodet
Date: Thu Sep 17 07:15:03 2009
New Revision: 816078

URL: http://svn.apache.org/viewvc?rev=816078&view=rev
Log:
CAMEL-1988: better OSGI metadata

Modified:
    camel/branches/camel-1.x/camel-core/pom.xml
    camel/branches/camel-1.x/components/camel-amqp/pom.xml
    camel/branches/camel-1.x/components/camel-cxf/pom.xml
    camel/branches/camel-1.x/components/camel-flatpack/pom.xml
    camel/branches/camel-1.x/components/camel-freemarker/pom.xml
    camel/branches/camel-1.x/components/camel-http/pom.xml
    camel/branches/camel-1.x/components/camel-jpa/pom.xml
    camel/branches/camel-1.x/components/camel-mina/pom.xml
    camel/branches/camel-1.x/components/camel-osgi/pom.xml
    camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java
    camel/branches/camel-1.x/components/camel-spring-integration/pom.xml
    camel/branches/camel-1.x/components/camel-spring/pom.xml
    camel/branches/camel-1.x/components/camel-stringtemplate/pom.xml
    camel/branches/camel-1.x/components/camel-velocity/pom.xml
    camel/branches/camel-1.x/components/camel-xmlbeans/pom.xml
    camel/branches/camel-1.x/components/camel-xmpp/pom.xml
    camel/branches/camel-1.x/parent/pom.xml
    camel/branches/camel-1.x/platforms/karaf/features/pom.xml
    camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
    camel/branches/camel-1.x/pom.xml

Modified: camel/branches/camel-1.x/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/pom.xml (original)
+++ camel/branches/camel-1.x/camel-core/pom.xml Thu Sep 17 07:15:03 2009
@@ -33,14 +33,25 @@
   <description>The Core Camel POJO based router</description>
 
   <properties>
-	<camel.osgi.export.pkg>
-		org.apache.camel.*
+  	<camel.osgi.export.pkg>
+  		org.apache.camel.*
     </camel.osgi.export.pkg>
-	<camel.osgi.import>
-		!javax.xml.bind.annotation.adapters,
-		org.apache.xalan.xsltc.trax;resolution:=optional,
-		*
-    </camel.osgi.import>
+  	<camel.osgi.import>
+  		!javax.xml.bind.annotation.adapters,
+  	    !org.apache.camel.*,
+  		org.apache.xalan.xsltc.trax;resolution:=optional,
+        javax.activation;resolution:=optional,
+        javax.xml.bind;resolution:=optional,
+        javax.xml.bind.annotation;resolution:=optional,
+        javax.xml.stream;resolution:=optional,
+        org.springframework.jmx.export.annotation;resolution:=optional,
+        org.springframework.jmx.export.assembler;resolution:=optional,
+        org.springframework.jmx.export.metadata;resolution:=optional,
+  		*
+      </camel.osgi.import>
+      <camel.osgi.dynamic>
+          org.apache.camel.spring.util;${camel.osgi.import.strict.version}
+      </camel.osgi.dynamic>
   </properties>
 
   <repositories>

Modified: camel/branches/camel-1.x/components/camel-amqp/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-amqp/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-amqp/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-amqp/pom.xml Thu Sep 17 07:15:03 2009
@@ -34,7 +34,6 @@
 
   <properties>
     <camel.osgi.export.pkg>org.apache.camel.component.amqp.*</camel.osgi.export.pkg>
-    <qpid-version>0.5.0</qpid-version>
   </properties>
 
   <repositories>

Modified: camel/branches/camel-1.x/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-cxf/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-cxf/pom.xml Thu Sep 17 07:15:03 2009
@@ -33,7 +33,6 @@
   <description>Camel CXF support</description>
 
   <properties>
-     <camel.osgi.import.pkg>org.apache.cxf*;version="[2.2,3.0.0)",*</camel.osgi.import.pkg>
      <camel.osgi.export.pkg>org.apache.camel.component.cxf.*</camel.osgi.export.pkg>
   </properties>
 

Modified: camel/branches/camel-1.x/components/camel-flatpack/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-flatpack/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-flatpack/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-flatpack/pom.xml Thu Sep 17 07:15:03 2009
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>net.sf.flatpack</groupId>
       <artifactId>flatpack</artifactId>
-      <version>3.1.1</version>
+      <version>${flatpack-version}</version>
     </dependency>
 
 

Modified: camel/branches/camel-1.x/components/camel-freemarker/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-freemarker/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-freemarker/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-freemarker/pom.xml Thu Sep 17 07:15:03 2009
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
-            <version>2.3.15</version>
+            <version>${freemarker-version}</version>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>

Modified: camel/branches/camel-1.x/components/camel-http/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-http/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-http/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-http/pom.xml Thu Sep 17 07:15:03 2009
@@ -33,7 +33,6 @@
   <description>Camel HTTP support</description>
 
   <properties>
-    <camel.osgi.import.pkg>org.apache.commons.httpclient.*;version="[3.1,4.0)",*</camel.osgi.import.pkg>
 	<camel.osgi.export.pkg>org.apache.camel.component.http.*</camel.osgi.export.pkg>
   </properties>
 
@@ -51,7 +50,7 @@
     <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
-      <version>3.1</version>
+      <version>${httpclient-version}</version>
       <optional>false</optional>
     </dependency>
 

Modified: camel/branches/camel-1.x/components/camel-jpa/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jpa/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-jpa/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-jpa/pom.xml Thu Sep 17 07:15:03 2009
@@ -33,8 +33,18 @@
   </parent>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.component.jpa.*,
-      org.apache.camel.processor.idempotent.jpa.*</camel.osgi.export.pkg>
+    <camel.osgi.export.pkg>
+      org.apache.camel.component.jpa.*,
+      org.apache.camel.processor.idempotent.jpa.*
+    </camel.osgi.export.pkg>
+    <camel.osgi.import.pkg>
+      !javax.xml.bind.annotation.adapters,
+      !org.apache.camel.component.jpa.*,
+      !org.apache.camel.processor.idempotent.jpa.*,
+      org.apache.camel.*;${camel.osgi.import.camel.version},
+      ${camel.osgi.import.defaults},
+      *
+    </camel.osgi.import.pkg>
   </properties>
 
   <dependencies>

Modified: camel/branches/camel-1.x/components/camel-mina/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-mina/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-mina/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-mina/pom.xml Thu Sep 17 07:15:03 2009
@@ -33,7 +33,6 @@
     <description>Camel MINA support</description>
 
     <properties>
-        <camel.osgi.import.pkg>org.apache.mina.*;version="[1.1.7,2.0)",*</camel.osgi.import.pkg>
         <camel.osgi.export.pkg>org.apache.camel.component.mina.*</camel.osgi.export.pkg>
     </properties>
 

Modified: camel/branches/camel-1.x/components/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-osgi/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-osgi/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-osgi/pom.xml Thu Sep 17 07:15:03 2009
@@ -33,8 +33,19 @@
   <description>Camel OSGi support</description>
 
   <properties>
-    <camel.osgi.export.pkg>org.apache.camel.osgi.*</camel.osgi.export.pkg>
-    <camel.osgi.activator>org.apache.camel.osgi.Activator</camel.osgi.activator>
+      <camel.osgi.export.pkg>
+          org.apache.camel.osgi.*
+      </camel.osgi.export.pkg>
+      <camel.osgi.import.pkg>
+          !javax.xml.bind.annotation.adapters,
+          !org.apache.camel.osgi.*,
+          org.apache.camel.*;${camel.osgi.import.strict.version},
+          ${camel.osgi.import.defaults},
+          *
+      </camel.osgi.import.pkg>
+      <camel.osgi.activator>
+          org.apache.camel.osgi.Activator
+      </camel.osgi.activator>
   </properties>
 
   <dependencies>

Modified: camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java
(original)
+++ camel/branches/camel-1.x/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java
Thu Sep 17 07:15:03 2009
@@ -30,6 +30,10 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 
+import org.apache.camel.Component;
+import org.apache.camel.TypeConverter;
+import org.apache.camel.spi.Language;
+import org.apache.camel.spi.LanguageResolver;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -91,7 +95,15 @@
         }
     }
 
-    protected synchronized void addComponentEntry(String entryPath, Bundle bundle, Map<String,
ComponentEntry> entries) {
+    protected synchronized void addComponentEntry(String entryPath, Bundle bundle, Map<String,
ComponentEntry> entries, Class clazz) {
+        // Check bundle compatibility
+        try {
+            if (bundle.loadClass(clazz.getName()) != clazz) {
+                return;
+            }
+        } catch (Throwable t) {
+            return;
+        }
         Enumeration e = bundle.getEntryPaths(entryPath);
         if (e != null) {
             while (e.hasMoreElements()) {
@@ -110,12 +122,21 @@
     }
 
     protected void mayBeAddComponentAndLanguageFor(Bundle bundle) {        
-        addComponentEntry(META_INF_COMPONENT, bundle, COMPONENTS);
-        addComponentEntry(META_INF_LANGUAGE, bundle, LANGUAGES);
-        addComponentEntry(META_INF_LANGUAGE_RESOLVER, bundle, LANGUAGE_RESOLVERS);
+        addComponentEntry(META_INF_COMPONENT, bundle, COMPONENTS, Component.class);
+        addComponentEntry(META_INF_LANGUAGE, bundle, LANGUAGES, Language.class);
+        addComponentEntry(META_INF_LANGUAGE_RESOLVER, bundle, LANGUAGE_RESOLVERS, LanguageResolver.class);
     }
     
     protected synchronized void mayBeAddTypeConverterFor(Bundle bundle) {
+        // Check bundle compatibility
+        try {
+            Class clazz = TypeConverter.class;
+            if (bundle.loadClass(clazz.getName()) != clazz) {
+                return;
+            }
+        } catch (Throwable t) {
+            return;
+        }
         try {
             Enumeration e = bundle.getResources(META_INF_TYPE_CONVERTER);
             if (e != null) {

Modified: camel/branches/camel-1.x/components/camel-spring-integration/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-spring-integration/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-spring-integration/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-spring-integration/pom.xml Thu Sep 17 07:15:03
2009
@@ -35,7 +35,6 @@
 
   <properties>
 	<camel.osgi.export.pkg>org.apache.camel.component.spring.integration.*</camel.osgi.export.pkg>
-    <spring-integration-version>1.0.1.RELEASE</spring-integration-version>
   </properties>
 
   <version>1.6.2-SNAPSHOT</version>

Modified: camel/branches/camel-1.x/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-spring/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-spring/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-spring/pom.xml Thu Sep 17 07:15:03 2009
@@ -33,19 +33,27 @@
   <packaging>bundle</packaging>
 
   <properties>
-  <camel.osgi.import>
-    !javax.xml.bind.annotation.adapters,
-    org.apache.camel.osgi;resolution:=optional,
-    *
-  </camel.osgi.import>
-  <camel.osgi.export>
-    org.apache.camel.spring.*;${camel.osgi.version},
-    org.apache.camel.component;${camel.osgi.split.pkg};${camel.osgi.version},
-    org.apache.camel.component.event;${camel.osgi.split.pkg};${camel.osgi.version},
-    org.apache.camel.component.test;${camel.osgi.split.pkg};${camel.osgi.version},
-    org.apache.camel.component.validator;${camel.osgi.split.pkg};${camel.osgi.version},
-    org.apache.camel.component.xslt;${camel.osgi.split.pkg};${camel.osgi.version}
-  </camel.osgi.export>
+      <camel.osgi.import>
+        !org.apache.camel.spring.*,
+        !org.apache.camel.component,
+        !org.apache.camel.component.event,
+        !org.apache.camel.component.validator,
+        !org.apache.camel.component.xslt,
+        !javax.xml.bind.annotation.adapters,
+        org.apache.camel.*;${camel.osgi.import.strict.version},
+        *
+      </camel.osgi.import>
+      <camel.osgi.export>
+        org.apache.camel.spring.*;${camel.osgi.version},
+        org.apache.camel.component;${camel.osgi.split.pkg};${camel.osgi.version},
+        org.apache.camel.component.event;${camel.osgi.split.pkg};${camel.osgi.version},
+        org.apache.camel.component.test;${camel.osgi.split.pkg};${camel.osgi.version},
+        org.apache.camel.component.validator;${camel.osgi.split.pkg};${camel.osgi.version},
+        org.apache.camel.component.xslt;${camel.osgi.split.pkg};${camel.osgi.version}
+      </camel.osgi.export>
+      <camel.osgi.dynamic>
+          org.apache.camel.osgi;${camel.osgi.import.strict.version}
+      </camel.osgi.dynamic>
   </properties>
 
   <dependencies>

Modified: camel/branches/camel-1.x/components/camel-stringtemplate/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-stringtemplate/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-stringtemplate/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-stringtemplate/pom.xml Thu Sep 17 07:15:03 2009
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>stringtemplate</artifactId>
-      <version>3.0</version>
+      <version>${stringtemplate-version}</version>
     </dependency>
 
     <!-- testing -->

Modified: camel/branches/camel-1.x/components/camel-velocity/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-velocity/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-velocity/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-velocity/pom.xml Thu Sep 17 07:15:03 2009
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
-      <version>1.6.1</version>
+      <version>${velocity-version}</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>

Modified: camel/branches/camel-1.x/components/camel-xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-xmlbeans/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-xmlbeans/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-xmlbeans/pom.xml Thu Sep 17 07:15:03 2009
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.apache.xmlbeans</groupId>
       <artifactId>xmlbeans</artifactId>
-      <version>2.4.0</version>
+      <version>${xmlbeans-version}</version>
     </dependency>
     <dependency>
       <groupId>stax</groupId>

Modified: camel/branches/camel-1.x/components/camel-xmpp/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-xmpp/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-xmpp/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-xmpp/pom.xml Thu Sep 17 07:15:03 2009
@@ -66,12 +66,12 @@
     <dependency>
       <groupId>org.igniterealtime.smack</groupId>
       <artifactId>smack</artifactId>
-      <version>3.0.4</version>
+      <version>${smack-version}</version>
     </dependency>
     <dependency>
       <groupId>org.igniterealtime.smack</groupId>
       <artifactId>smackx</artifactId>
-      <version>3.0.4</version>
+      <version>${smack-version}</version>
     </dependency>
     <!-- to allow Spring annotations (jmx) to be tested -->
     <dependency>

Modified: camel/branches/camel-1.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/parent/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/parent/pom.xml (original)
+++ camel/branches/camel-1.x/parent/pom.xml Thu Sep 17 07:15:03 2009
@@ -41,13 +41,13 @@
     <apacheds-version>1.5.4</apacheds-version>
     <axiom-version>1.2.8</axiom-version>
     <cxf-version>2.2.2</cxf-version>
-    <felix-version>1.4.1</felix-version>
     <felix-osgi-version>1.2.0</felix-osgi-version>
     <geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>
     <geronimo-jpa-spec-version>1.1.1</geronimo-jpa-spec-version>
     <geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
     <httpcore-version>4.0-beta3</httpcore-version>
     <httpcore-niossl-version>4.0-alpha6</httpcore-niossl-version>
+    <httpclient-version>3.1</httpclient-version>
     <jetty-version>6.1.14</jetty-version>
     <slf4j-version>1.5.6</slf4j-version>
     <openjpa-version>1.2.0</openjpa-version>
@@ -69,6 +69,8 @@
     <commons-dbcp-version>1.2.2</commons-dbcp-version>
     <derby-version>10.4.2.0</derby-version>
     <easymock-version>2.4</easymock-version>
+    <flatpack-version>3.1.1</flatpack-version>
+    <freemarker-version>2.3.15</freemarker-version>
     <hamcrest-version>1.2-dev1</hamcrest-version>
     <hibernate-version>3.2.6.ga</hibernate-version>
     <hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
@@ -76,28 +78,63 @@
     <groovy-version>1.5.6</groovy-version>
     <guiceyfruit-version>2.0-beta-4</guiceyfruit-version>
     <google-collection-version>snapshot-20080530</google-collection-version>
+    <spring-integration-version>1.0.1.RELEASE</spring-integration-version>
+    <stringtemplate-version>3.0</stringtemplate-version>
     <junit-version>3.8.2</junit-version>
     <ognl-version>2.7.3_1</ognl-version>
     <saxon-version>9.1.0.1</saxon-version>
     <scala-version>2.7.3</scala-version>
     <scala-plugin-version>2.9.1</scala-plugin-version>
+    <smack-version>3.0.4</smack-version>
     <testng-version>5.8</testng-version>
+    <velocity-version>1.6.2</velocity-version>
     <xbean-spring-version>3.4</xbean-spring-version>
+    <qpid-version>0.5.0</qpid-version>
+    <xmlbeans-version>2.4.0</xmlbeans-version>
 
     <!-- Repositories -->
     <m1-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-repo-url>
     <site-repo-url>scpexe://people.apache.org/www/camel.apache.org/maven/</site-repo-url>
 
     <!-- OSGi bundles properties -->
-    <camel.osgi.import.pkg>!javax.xml.bind.annotation.adapters,*</camel.osgi.import.pkg>
+    <camel.osgi.import.camel.version>version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))"</camel.osgi.import.camel.version>
+    <camel.osgi.import.strict.version>version="[$(version;===;${camel.osgi.version.clean}),$(version;==+;${camel.osgi.version.clean}))"</camel.osgi.import.strict.version>
+    <camel.osgi.import.default.version>[$(version;==;$(@)),$(version;+;$(@)))</camel.osgi.import.default.version>
+    <camel.osgi.import.defaults>
+        org.apache.commons.logging.*;version="[1.1,2)",
+        org.apache.cxf.*;version="[2.2,3)",
+        org.apache.qpid.*;version="[0.5,0.6)",
+        org.apache.abdera.*;version="[0.4,0.5)",
+        org.apache.commons.httpclient.*;version="[3.1,4.0)",
+        org.apache.mina.*;version="[1.1.7,2.0)",
+        org.apache.velocity.*;version="[1.6.2,2)",
+        org.apache.xmlbeans.*;version="[2.4,3)",
+        com.thoughtworks.xstream.*;version="[1.3,2)",
+        org.antlr.stringtemplate.*;version="[3.0,4)",
+        org.jivesoftware.smack.*;version="[3.0,4)",
+        org.ccil.cowan.tagsoup.*;version="[1.2,2)",
+        org.mortbay.cometd.*;version="[6.1,7)",
+        net.sf.flatpack.*;version="[3.1.1,4)",
+        freemarker.*;version="[2.3.15,3)",
+    </camel.osgi.import.defaults>
+    <camel.osgi.import.additional />
+    <camel.osgi.import.pkg>
+        !javax.xml.bind.annotation.adapters,
+        !${camel.osgi.export.pkg},
+        org.apache.camel.*;${camel.osgi.import.camel.version},
+        ${camel.osgi.import.defaults},
+        ${camel.osgi.import.additional},
+        *
+    </camel.osgi.import.pkg>
     <camel.osgi.activator />
     <camel.osgi.private.pkg>!*</camel.osgi.private.pkg>
     <camel.osgi.export>${camel.osgi.export.pkg};${camel.osgi.version}</camel.osgi.export>
     <camel.osgi.version>version=${project.version}</camel.osgi.version>
     <camel.osgi.split.pkg>-split-package:=first</camel.osgi.split.pkg>
     <camel.osgi.import>${camel.osgi.import.pkg}</camel.osgi.import>
+    <camel.osgi.dynamic />
     <camel.osgi.symbolic.name>${groupId}.${artifactId}</camel.osgi.symbolic.name>
-    <camel.osgi.exclude.dependencies>true</camel.osgi.exclude.dependencies>
+    <camel.osgi.exclude.dependencies>false</camel.osgi.exclude.dependencies>
 
     <!-- encoding -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -883,6 +920,74 @@
   </dependencyManagement>
 
   <build>
+       <plugins>
+           <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-antrun-plugin</artifactId>
+               <version>1.2</version>
+               <inherited>true</inherited>
+               <executions>
+                   <execution>
+                       <id>create-prop</id>
+                       <phase>initialize</phase>
+                       <configuration>
+                           <tasks>
+                               <taskdef resource="net/sf/antcontrib/antcontrib.properties"
classpathref="maven.plugin.classpath"/>
+                               <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp"/>
+                               <property name="mv" value="${project.version}"/>
+                               <echo message="Maven version:   ${mv}" />
+                               <propertyregex property="ov.p1" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?"
replace="\1" defaultValue="0"/>
+                               <propertyregex property="ov.p2" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?"
replace=".\2" defaultValue=".0"/>
+                               <propertyregex property="ov.p3" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?"
replace=".\3" defaultValue=".0"/>
+                               <propertyregex property="ov.p4" input="${mv}" regexp="(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:[^a-zA-Z0-9](.*))?"
replace=".\4" defaultValue=""/>
+                               <propertyregex property="ov.p1a" input="${ov.p1}" regexp="(.+)"
replace="\1" defaultValue="0"/>
+                               <propertyregex property="ov.p2a" input="${ov.p2}" regexp="(\..+)"
replace="\1" defaultValue=".0"/>
+                               <propertyregex property="ov.p3a" input="${ov.p3}" regexp="(\..+)"
replace="\1" defaultValue=".0"/>
+                               <propertyregex property="ov.p4a" input="${ov.p4}" regexp="(\..+)"
replace="\1" defaultValue=""/>
+                               <property name="ov" value="${ov.p1a}${ov.p2a}${ov.p3a}${ov.p4a}"/>
+                               <echo message="OSGi version:    ${ov}" />
+                               <mkdir dir="target"/>
+                               <echo message="camel.osgi.version.clean = ${ov}" file="target/camel.osgi.version.txt"/>
+                           </tasks>
+                       </configuration>
+                       <goals>
+                           <goal>run</goal>
+                       </goals>
+                   </execution>
+               </executions>
+               <dependencies>
+                   <dependency>
+                       <groupId>ant-contrib</groupId>
+                       <artifactId>ant-contrib</artifactId>
+                       <version>1.0b3</version>
+                   </dependency>
+                   <dependency>
+                       <groupId>ant</groupId>
+                       <artifactId>ant-optional</artifactId>
+                       <version>1.5.3-1</version>
+                   </dependency>
+              </dependencies>
+           </plugin>
+           <plugin>
+               <groupId>org.codehaus.mojo</groupId>
+               <artifactId>properties-maven-plugin</artifactId>
+               <version>1.0-alpha-2</version>
+               <inherited>true</inherited>
+               <executions>
+                 <execution>
+                   <phase>initialize</phase>
+                   <goals>
+                     <goal>read-project-properties</goal>
+                   </goals>
+                   <configuration>
+                     <files>
+                       <file>target/camel.osgi.version.txt</file>
+                     </files>
+                   </configuration>
+                 </execution>
+               </executions>
+           </plugin>
+      </plugins>
     <pluginManagement>
             <plugins>
                 <plugin>

Modified: camel/branches/camel-1.x/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/pom.xml Thu Sep 17 07:15:03 2009
@@ -40,6 +40,7 @@
       <aopalliance-bundle-version>1.0_1</aopalliance-bundle-version>
       <asm-bundle-version>2.2.3_1</asm-bundle-version>
       <dom4j-bundle-version>1.6_1</dom4j-bundle-version>
+      <cglib-version>2.1_3_2</cglib-version>
       <commons-beanutils-bundle-version>1.7.0_1</commons-beanutils-bundle-version>
       <commons-dbcp-bundle-version>1.2.2_3</commons-dbcp-bundle-version>
       <commons-csv-version>1.0-r706899_1</commons-csv-version>
@@ -84,6 +85,8 @@
       <servicemix-specs-version>1.4-SNAPSHOT</servicemix-specs-version>
       <servlet-api-2.5-version>2.5-20081211</servlet-api-2.5-version>
       <smack-bundle-version>3.0.4_1</smack-bundle-version>      
+      <spring-version>2.5.6.SEC01</spring-version>
+      <spring-osgi-version>1.2.0</spring-osgi-version>
       <spring-commons-collections-version>3.2.1</spring-commons-collections-version>
       <spring-javaconfig-version>1.0.0-20090215</spring-javaconfig-version>
       <spring-javax-persistence-version>1.99.0</spring-javax-persistence-version>

Modified: camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-1.x/platforms/karaf/features/src/main/resources/features.xml Thu
Sep 17 07:15:03 2009
@@ -10,16 +10,21 @@
   <feature name='camel-spring' version='${pom.version}'>
     <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance-bundle-version}</bundle>
-    <bundle>mvn:org.springframework/spring-aop/${spring-version}</bundle>
-    <bundle>mvn:org.springframework/spring-beans/${spring-version}</bundle>
     <bundle>mvn:org.springframework/spring-core/${spring-version}</bundle>
+    <bundle>mvn:org.springframework/spring-beans/${spring-version}</bundle>
     <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
+    <bundle>mvn:org.springframework/spring-aop/${spring-version}</bundle>
     <bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
     <feature version='${pom.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-spring/${pom.version}</bundle>
   </feature>
   <feature name='camel-osgi' version='${pom.version}'>
     <feature version='${pom.version}'>camel-spring</feature>
+    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}</bundle>
+    <bundle>mvn:org.springframework.osgi/spring-osgi-io/${spring-osgi-version}</bundle>
+    <bundle>mvn:org.springframework.osgi/spring-osgi-core/${spring-osgi-version}</bundle>
+    <bundle>mvn:org.springframework.osgi/spring-osgi-extender/${spring-osgi-version}</bundle>
+    <bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${spring-osgi-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-osgi/${pom.version}</bundle>
   </feature>
   <feature name='camel-cxf' version='${pom.version}'>

Modified: camel/branches/camel-1.x/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/pom.xml?rev=816078&r1=816077&r2=816078&view=diff
==============================================================================
--- camel/branches/camel-1.x/pom.xml (original)
+++ camel/branches/camel-1.x/pom.xml Thu Sep 17 07:15:03 2009
@@ -44,7 +44,7 @@
     <m1-repo-url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m1-snapshot-repository</m1-repo-url>
     <site-repo-url>scpexe://people.apache.org/www/camel.apache.org/maven/</site-repo-url>
 
-    <felix-version>1.4.1</felix-version>
+    <felix-version>2.0.0</felix-version>
   </properties>
 
   <url>http://apache.apache.org/camel/</url>
@@ -289,21 +289,23 @@
 
     <plugins>
 	  <plugin>
-            <groupId>org.apache.felix</groupId>
+        <groupId>org.apache.felix</groupId>
 	    <artifactId>maven-bundle-plugin</artifactId>
 	    <version>${felix-version}</version>
 	    <extensions>true</extensions>
 	    <configuration>
-              <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
+          <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
 	      <instructions>
 	        <Bundle-Name>${artifactId}</Bundle-Name>
 	        <Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
-                <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
+            <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
 	        <Export-Package>${camel.osgi.export}</Export-Package>
 	        <Import-Package>${camel.osgi.import}</Import-Package>
+	        <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
 	        <Private-Package>${camel.osgi.private.pkg}</Private-Package>
 	        <Implementation-Title>Apache Camel</Implementation-Title>
 	        <Implementation-Version>${project.version}</Implementation-Version>
+	        <_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
 	      </instructions>
 	    </configuration>
       </plugin>



Mime
View raw message