You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ge...@apache.org on 2009/04/17 16:03:27 UTC

svn commit: r766016 - in /camel/trunk: ./ components/camel-jcr/ platforms/ platforms/karaf/ platforms/karaf/features/ platforms/karaf/features/src/ platforms/karaf/features/src/main/ platforms/karaf/features/src/main/resources/ tests/camel-itest-osgi/ ...

Author: gertv
Date: Fri Apr 17 14:03:15 2009
New Revision: 766016

URL: http://svn.apache.org/viewvc?rev=766016&view=rev
Log:
CAMEL-1526: Add a ServiceMix Kernel features descriptor to Camel

Added:
    camel/trunk/platforms/
    camel/trunk/platforms/karaf/
    camel/trunk/platforms/karaf/features/   (with props)
    camel/trunk/platforms/karaf/features/pom.xml
    camel/trunk/platforms/karaf/features/src/
    camel/trunk/platforms/karaf/features/src/main/
    camel/trunk/platforms/karaf/features/src/main/resources/
    camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties
    camel/trunk/platforms/karaf/pom.xml
    camel/trunk/platforms/pom.xml
Modified:
    camel/trunk/components/camel-jcr/pom.xml
    camel/trunk/pom.xml
    camel/trunk/tests/camel-itest-osgi/   (props changed)
    camel/trunk/tooling/archetypes/camel-archetype-war/   (props changed)

Modified: camel/trunk/components/camel-jcr/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jcr/pom.xml?rev=766016&r1=766015&r2=766016&view=diff
==============================================================================
--- camel/trunk/components/camel-jcr/pom.xml (original)
+++ camel/trunk/components/camel-jcr/pom.xml Fri Apr 17 14:03:15 2009
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
-      <version>1.4.5</version>
+      <version>1.5.3</version>
     </dependency>
     <dependency>
       <groupId>javax.jcr</groupId>

Propchange: camel/trunk/platforms/karaf/features/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 17 14:03:15 2009
@@ -0,0 +1 @@
+target

Added: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=766016&view=auto
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (added)
+++ camel/trunk/platforms/karaf/features/pom.xml Fri Apr 17 14:03:15 2009
@@ -0,0 +1,394 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <!--
+
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements.  See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to You under the Apache License, Version 2.0
+        (the "License"); you may not use this file except in compliance with
+        the License.  You may obtain a copy of the License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>karaf</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.camel.karaf</groupId>
+    <artifactId>features</artifactId>
+    <packaging>pom</packaging>
+    <version>2.0-SNAPSHOT</version>
+    <name>Camel :: Platforms :: Apache Karaf :: Features</name>
+
+    <properties>
+      <abdera-bundle-version>0.4.0-incubating_1</abdera-bundle-version>
+      <ant-bundle-version>1.7.0_1</ant-bundle-version>
+      <antlr-bundle-version>3.0.1_1</antlr-bundle-version>
+      <asm-bundle-version>2.2.3_1</asm-bundle-version>
+      <dom4j-bundle-version>1.6_1</dom4j-bundle-version>
+      <commons-beanutils-version>1.7.0_1</commons-beanutils-version>
+      <commons-dbcp-bundle-version>1.2.2_3</commons-dbcp-bundle-version>
+      <commons-csv-bundle-version>1.0-r706899_1</commons-csv-bundle-version>
+      <commons-httpclient-bundle-version>3.1_1</commons-httpclient-bundle-version>
+      <commons-io-bundle-version>1.3.2_1</commons-io-bundle-version>
+      <flatpack-bundle-version>3.1.1_1</flatpack-bundle-version>
+      <geronimo-el-version>1.0.1</geronimo-el-version>
+      <geronimo-jsp-version>1.0.1</geronimo-jsp-version>
+      <hamcrest-bundle-version>1.2-dev1_1</hamcrest-bundle-version>
+      <ibatis-bundle-version>2.3.4.726_1</ibatis-bundle-version>
+      <jexcelapi-bundle-version>2.4.2_1</jexcelapi-bundle-version>
+      <httpcore-bundle-version>4.0-alpha6_1</httpcore-bundle-version>
+      <irclib-bundle-version>1.10_1</irclib-bundle-version>
+      <isorelax-bundle-version>20050913_1</isorelax-bundle-version>
+      <jcr-bundle-version>1.0_1</jcr-bundle-version>
+      <jdom-bundle-version>1.1_1</jdom-bundle-version>
+      <jettison-bundle-version>1.0.1_1</jettison-bundle-version>
+      <jing-bundle-version>20030619_1</jing-bundle-version>
+      <jodatime-bundle-version>1.5.2_1</jodatime-bundle-version>
+      <josql-bundle-version>1.5_1</josql-bundle-version>
+      <jsch-bundle-version>0.1.31_1</jsch-bundle-version>
+      <juel-bundle-version>2.1.0_1</juel-bundle-version>
+      <junit-bundle-version>4.4_1</junit-bundle-version>
+      <ognl-bundle-version>2.7.3_1</ognl-bundle-version>
+      <oscache-bundle-version>2.4_1</oscache-bundle-version>
+      <quartz-bundle-version>1.6.1_1</quartz-bundle-version>
+      <qpid-bundle-version>1.0-incubating-M2.1_1</qpid-bundle-version>
+      <saxon-bundle-version>9.1.0.1_1</saxon-bundle-version>
+      <servicemix-specs-version>1.3.0</servicemix-specs-version>
+      <smack-bundle-version>3.0.4_1</smack-bundle-version>
+      <stringtemplate-bundle-version>3.2_1</stringtemplate-bundle-version>
+      <velocity-bundle-version>1.5_1</velocity-bundle-version>
+      <xmlbeans-bundle-version>2.4.0_2</xmlbeans-bundle-version>
+      <xmlsec-bundle-version>1.3.0_1</xmlsec-bundle-version>
+      <xmlresolver-bundle-version>1.2_1</xmlresolver-bundle-version>
+      <xpp3-bundle-version>1.1.4c_1</xpp3-bundle-version>
+      <xstream-bundle-version>1.3_1</xstream-bundle-version>
+      <werken-xpath-bundle-version>0.9.4_1</werken-xpath-bundle-version>
+      <wsdl4j-bundle-version>1.6.1_1</wsdl4j-bundle-version>
+    </properties>
+
+    <repositories>
+      <!-- repo for the spring integration jars -->
+    <repository>
+      <id>com.springsource.repository.bundles.external</id>
+      <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
+      <url>http://repository.springsource.com/maven/bundles/external</url>
+    </repository>
+    <repository>
+      <id>uface.m2</id>
+      <url>http://uface.googlecode.com/svn/maven/</url>
+      <name>UFace Maven Repository</name>
+    </repository>
+
+    <!-- TODO we can remove this when the commons-csv release syncs to the main repo -->
+    <repository>
+      <id>open.iona.m2</id>
+      <name>IONA Open Source Community Release Repository</name>
+      <url>http://repo.open.iona.com/maven2</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+
+    </repositories>
+
+    <build>
+      <resources>
+        <resource>
+          <directory>src/main/resources</directory>
+          <filtering>true</filtering>
+        </resource>
+      </resources>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <executions>
+            <execution>
+              <phase>process-resources</phase>
+              <goals>
+                <goal>resources</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.servicemix.tooling</groupId>
+          <artifactId>features-maven-plugin</artifactId>
+          <executions>
+            <execution>
+              <phase>compile</phase>
+              <goals>
+                <goal>generate-features-xml</goal>
+              </goals>
+              <configuration>
+                <bundles>target/classes/bundles.properties</bundles>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </build>
+
+   <dependencies>
+     <!-- Apache ServiceMix Kernel -->
+     <dependency>
+       <groupId>org.apache.servicemix.kernel</groupId>
+       <artifactId>apache-servicemix-kernel</artifactId>
+       <version>1.1.0</version>
+       <type>pom</type>
+       <scope>provided</scope>
+       <exclusions>
+         <exclusion>
+           <groupId>org.apache.servicemix.bundles</groupId>
+           <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+         </exclusion>
+       </exclusions>
+     </dependency>
+     <!-- some Camel components have to built in a specific order -->
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-core</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-spring</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-osgi</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-cxf</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-http</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-mina</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-jetty</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-jms</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <!-- the rest of them are just built alpabetically -->
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-amqp</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-atom</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-bam</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-csv</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-flatpack</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-ftp</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-groovy</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-hamcrest</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-ibatis</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-irc</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-jaxb</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-jcr</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-jhc</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-jing</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-jdbc</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-josql</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-jpa</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-jxpath</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-jpa</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-juel</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-jpa</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <!-- Moved quartz before mail to have commons-collections auto-discovered, cfr. SMX4KNL-260 -->
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-quartz</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-mail</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-msv</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-ognl</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-rmi</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-saxon</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-scala</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-script</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-spring-integration</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-sql</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-stream</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-stringtemplate</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <!-- skipping camel-swing/camel-uface -->
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-velocity</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-xmlbeans</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-xmpp</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>org.apache.camel</groupId>
+       <artifactId>camel-xstream</artifactId>
+       <version>${pom.version}</version>
+     </dependency>
+   </dependencies>
+</project>

Added: camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties?rev=766016&view=auto
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties (added)
+++ camel/trunk/platforms/karaf/features/src/main/resources/bundles.properties Fri Apr 17 14:03:15 2009
@@ -0,0 +1,82 @@
+################################################################################
+#
+#    Licensed to the Apache Software Foundation (ASF) under one or more
+#    contributor license agreements.  See the NOTICE file distributed with
+#    this work for additional information regarding copyright ownership.
+#    The ASF licenses this file to You under the Apache License, Version 2.0
+#    (the "License"); you may not use this file except in compliance with
+#    the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+################################################################################
+
+#Apache ServiceMix specs
+org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix-specs-version}/jar
+org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.0/${servicemix-specs-version}/jar
+org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.1/${servicemix-specs-version}/jar
+org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.0/${servicemix-specs-version}/jar
+org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix-specs-version}/jar
+org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-version}/jar
+org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}/jar
+org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix-specs-version}/jar
+org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}/jar
+
+#Apache Geronimo specs
+org.apache.geronimo.specs/geronimo-el_1.0_spec/${geronimo-el-version}/jar
+org.apache.geronimo.specs/geronimo-jsp_2.1_spec/${geronimo-jsp-version}/jar
+
+#Apache ServiceMix bundles
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera/${abdera-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/${antlr-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-csv/${commons-csv-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/${commons-dbcp-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.flatpack/${flatpack-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.hamcrest/${hamcrest-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.jcr-api/${jcr-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.jexcelapi/${jexcelapi-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.jettison/${jettison-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.josql/${josql-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch/${jsch-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.juel/${juel-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.oscache/${oscache-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.httpcore/${httpcore-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.jing/${jing-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.qpid/${qpid-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.smack/${smack-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.stringtemplate/${stringtemplate-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.werken-xpath/${werken-xpath-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}/jar
+org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}/jar
+
+#Apache CXF bundle
+org.apache.cxf/cxf-bundle/${cxf-version}/jar
+
+#Other bundles
+org.scala-lang/scala-bundle/${scala-version}/jar

Added: camel/trunk/platforms/karaf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/pom.xml?rev=766016&view=auto
==============================================================================
--- camel/trunk/platforms/karaf/pom.xml (added)
+++ camel/trunk/platforms/karaf/pom.xml Fri Apr 17 14:03:15 2009
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <!--
+
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements.  See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to You under the Apache License, Version 2.0
+        (the "License"); you may not use this file except in compliance with
+        the License.  You may obtain a copy of the License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>platforms</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.camel</groupId>
+    <artifactId>karaf</artifactId>
+    <packaging>pom</packaging>
+    <version>2.0-SNAPSHOT</version>
+    <name>Camel :: Platforms :: Apache Karaf</name>
+
+    <properties>
+      <features-maven-plugin-version>1.2-SNAPSHOT</features-maven-plugin-version>
+      <servicemix-kernel-version>1.1.0</servicemix-kernel-version>
+    </properties>
+
+    <modules>
+      <module>features</module>
+    </modules>
+ 
+    <build>
+      <pluginManagement> 
+        <plugins>
+          <plugin>
+            <groupId>org.apache.servicemix.tooling</groupId>
+            <artifactId>features-maven-plugin</artifactId>
+            <version>${features-maven-plugin-version}</version>
+          </plugin>
+        </plugins>
+      </pluginManagement>
+    </build>
+</project>

Added: camel/trunk/platforms/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/pom.xml?rev=766016&view=auto
==============================================================================
--- camel/trunk/platforms/pom.xml (added)
+++ camel/trunk/platforms/pom.xml Fri Apr 17 14:03:15 2009
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>camel-parent</artifactId>
+    <version>2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>platforms</artifactId>
+  <name>Camel :: Platforms</name>
+  <description>Camel Platforms</description>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>karaf</module>
+  </modules>
+</project>

Modified: camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=766016&r1=766015&r2=766016&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Fri Apr 17 14:03:15 2009
@@ -43,6 +43,7 @@
     <!-- Note that activemq dependency is only used for testing! -->
     <activemq-version>5.2.0</activemq-version>
     <apacheds-version>1.5.4</apacheds-version>
+    <axiom-version>1.2.8</axiom-version>
     <cxf-version>2.2</cxf-version>
     <felix-version>1.4.1</felix-version>
     <felix-osgi-version>1.2.0</felix-osgi-version>
@@ -76,7 +77,7 @@
     <guiceyfruit-version>2.0-beta-6</guiceyfruit-version>
     <junit-version>3.8.2</junit-version>
     <saxon-version>9.1.0.1</saxon-version>
-    <scala-version>2.7.2</scala-version>
+    <scala-version>2.7.3</scala-version>
     <scala-plugin-version>2.9.1</scala-plugin-version>
     <testng-version>5.8</testng-version>
     <xbean-spring-version>3.4</xbean-spring-version>
@@ -152,6 +153,7 @@
     <module>camel-core</module>
     <module>components</module>
     <module>examples</module>
+    <module>platforms</module>
     <module>tooling</module>
     <module>tests</module>
     <module>apache-camel</module>
@@ -683,7 +685,7 @@
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jpa_3.0_spec</artifactId>
-        <version>1.0</version>
+        <version>1.1.1</version>
       </dependency>
 
       <!-- Optional Spring Support -->
@@ -949,6 +951,12 @@
         <version>1.2</version>
       </dependency>
 
+      <!-- optional Axiom -->
+      <dependency>
+        <groupId>org.apache.ws.commons.axiom</groupId>
+        <artifactId>axiom-impl</artifactId>
+        <version>1.2.8</version>
+      </dependency>
 
     </dependencies>
   </dependencyManagement>

Propchange: camel/trunk/tests/camel-itest-osgi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 17 14:03:15 2009
@@ -0,0 +1 @@
+target

Propchange: camel/trunk/tooling/archetypes/camel-archetype-war/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Apr 17 14:03:15 2009
@@ -0,0 +1,5 @@
+target
+eclipse-classes
+.project
+.classpath
+.settings