Author: davsclaus
Date: Tue May 17 09:19:22 2011
New Revision: 1104077

URL: http://svn.apache.org/viewvc?rev=1104077&view=rev
Log:
CAMEL-3383: Aligned artifcat id of karaf command with the other camel 
artifacts. Added the command to the parent pom.xml. Added missing relative path 
in pom.xml

Modified:
    camel/trunk/apache-camel/pom.xml
    camel/trunk/parent/pom.xml
    camel/trunk/platforms/karaf/commands/pom.xml
    camel/trunk/platforms/karaf/features/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml
    camel/trunk/platforms/karaf/pom.xml

Modified: camel/trunk/apache-camel/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/apache-camel/pom.xml?rev=1104077&r1=1104076&r2=1104077&view=diff
==============================================================================
--- camel/trunk/apache-camel/pom.xml (original)
+++ camel/trunk/apache-camel/pom.xml Tue May 17 09:19:22 2011
@@ -38,6 +38,7 @@
   </properties>
 
   <dependencies>
+       <!-- camel components -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
@@ -318,6 +319,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-restlet</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-rmi</artifactId>
     </dependency>
     <dependency>
@@ -436,11 +441,14 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-xstream</artifactId>
     </dependency>
+
+    <!-- camel karaf -->
     <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-restlet</artifactId>
+      <groupId>org.apache.camel.karaf</groupId>
+      <artifactId>camel-karaf-commands</artifactId>
     </dependency>
 
+    <!-- camel examples -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-example-aggregate</artifactId>

Modified: camel/trunk/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1104077&r1=1104076&r2=1104077&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue May 17 09:19:22 2011
@@ -208,13 +208,12 @@
   <dependencyManagement>
     <dependencies>
 
-      <!-- Camel jars -->
+      <!-- camel components -->
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-core</artifactId>
         <version>${project.version}</version>
       </dependency>
-
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-amqp</artifactId>
@@ -707,6 +706,14 @@
         <version>${project.version}</version>
       </dependency>
 
+      <!-- camel karaf -->
+      <dependency>
+        <groupId>org.apache.camel.karaf</groupId>
+        <artifactId>camel-karaf-commands</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <!-- camel examples -->
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-example-aggregate</artifactId>
@@ -832,12 +839,13 @@
         <artifactId>camel-example-tracer</artifactId>
         <version>${project.version}</version>
       </dependency>
+
+      <!-- camel misc -->
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-manual</artifactId>
         <version>${project.version}</version>
       </dependency>
-
       <dependency>
         <groupId>org.apache.camel.tests</groupId>
         <artifactId>org.apache.camel.tests.mock-javamail_1.7</artifactId>
@@ -859,7 +867,6 @@
         <version>${fuse-commons-management-version}</version>
       </dependency>
 
-
       <!-- optional dependencies -->
       <dependency>
         <groupId>javax.xml.bind</groupId>
@@ -877,7 +884,6 @@
         <artifactId>stax-api</artifactId>
         <version>${stax-api-version}</version>
       </dependency>
-
       <dependency>
         <groupId>com.sun.xml.bind</groupId>
         <artifactId>jaxb-impl</artifactId>
@@ -947,54 +953,47 @@
         <version>${xbean-spring-version}</version>
       </dependency>
 
+      <!-- spec jars -->
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         <version>${geronimo-j2ee-connector-spec-version}</version>
       </dependency>
-
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
         <version>${geronimo-j2ee-jacc-spec-version}</version>
       </dependency>
-
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
         <version>${geronimo-j2ee-management-spec-version}</version>
       </dependency>
-
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jms_1.1_spec</artifactId>
         <version>${geronimo-jms-spec-version}</version>
       </dependency>
-
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jpa_3.0_spec</artifactId>
         <version>${geronimo-jpa-spec-version}</version>
       </dependency>
-
       <dependency>
         <groupId>org.apache.servicemix.specs</groupId>
         
<artifactId>org.apache.servicemix.specs.java-persistence-api-1.1.1</artifactId>
         <version>${servicemix-specs-version}</version>
       </dependency>
-
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jsp_2.1_spec</artifactId>
         <version>${geronimo-jsp-spec-version}</version>
       </dependency>
-
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jta_1.1_spec</artifactId>
         <version>${geronimo-jta-spec-version}</version>
       </dependency>
-
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-servlet_2.4_spec</artifactId>
@@ -1057,13 +1056,11 @@
         <artifactId>spring-tx</artifactId>
         <version>${spring-version}</version>
       </dependency>
-
       <dependency>
         <groupId>org.springframework.osgi</groupId>
         <artifactId>spring-osgi-core</artifactId>
         <version>${spring-osgi-version}</version>
       </dependency>
-
       <dependency>
         <groupId>org.springframework.osgi</groupId>
         <artifactId>spring-osgi-mock</artifactId>
@@ -1203,6 +1200,7 @@
         <artifactId>pax-swissbox-tinybundles</artifactId>
         <version>${pax-tiny-bundle-version}</version>
       </dependency>
+
       <!-- optional Saxon support-->
       <dependency>
         <groupId>net.sf.saxon</groupId>
@@ -1271,6 +1269,7 @@
         <version>${openjpa-version}</version>
       </dependency>
 
+      <!-- optional EHCache -->
       <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.ehcache</artifactId>
@@ -1324,12 +1323,14 @@
         <version>${xstream-version}</version>
       </dependency>
 
+      <!-- optional Jettison -->
       <dependency>
         <groupId>org.codehaus.jettison</groupId>
         <artifactId>jettison</artifactId>
         <version>${jettison-version}</version>
       </dependency>
 
+      <!-- optional Tagsoup -->
       <dependency>
         <groupId>org.ccil.cowan.tagsoup</groupId>
         <artifactId>tagsoup</artifactId>
@@ -1343,6 +1344,7 @@
         <version>1.2.8</version>
       </dependency>
 
+      <!-- optional misc -->
       <dependency>
         <groupId>org.jruby</groupId>
         <artifactId>jruby</artifactId>
@@ -1441,7 +1443,7 @@
                 <echo file="target/camel.osgi.version.txt">
                   camel.osgi.version.clean = ${ov}
                   camel.schema.version = ${os}
-                              </echo>
+                 </echo>
               </tasks>
             </configuration>
             <goals>

Modified: camel/trunk/platforms/karaf/commands/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/commands/pom.xml?rev=1104077&r1=1104076&r2=1104077&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/commands/pom.xml (original)
+++ camel/trunk/platforms/karaf/commands/pom.xml Tue May 17 09:19:22 2011
@@ -23,10 +23,11 @@
     <groupId>org.apache.camel</groupId>
     <artifactId>karaf</artifactId>
     <version>2.8-SNAPSHOT</version>
+    <relativePath>..</relativePath>
   </parent>
 
   <groupId>org.apache.camel.karaf</groupId>
-  <artifactId>org.apache.camel.karaf.commands</artifactId>
+  <artifactId>camel-karaf-commands</artifactId>
   <packaging>bundle</packaging>
   <name>Camel :: Platforms :: Apache Karaf :: Commands</name>
 

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1104077&r1=1104076&r2=1104077&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue May 17 09:19:22 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.camel</groupId>
         <artifactId>karaf</artifactId>
         <version>2.8-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <groupId>org.apache.camel.karaf</groupId>

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=1104077&r1=1104076&r2=1104077&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml 
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue 
May 17 09:19:22 2011
@@ -30,7 +30,7 @@
     
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
     
<bundle>mvn:org.fusesource.commonman/commons-management/${commons-management-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-core/${pom.version}</bundle>
-    
<bundle>mvn:org.apache.camel.karaf/org.apache.camel.karaf.commands/${pom.version}</bundle>
+    
<bundle>mvn:org.apache.camel.karaf/camel-karaf-commands/${pom.version}</bundle>
   </feature>
   <feature name='camel-spring' version='${pom.version}' resolver='(obr)'>
     <bundle 
dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>

Modified: camel/trunk/platforms/karaf/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/pom.xml?rev=1104077&r1=1104076&r2=1104077&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/pom.xml (original)
+++ camel/trunk/platforms/karaf/pom.xml Tue May 17 09:19:22 2011
@@ -25,6 +25,7 @@
         <groupId>org.apache.camel</groupId>
         <artifactId>platforms</artifactId>
         <version>2.8-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <groupId>org.apache.camel</groupId>


Reply via email to