activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r521714 - in /activemq/camel/trunk: ./ apache-camel/ apache-camel/src/main/descriptors/ camel-cxf/ camel-cxf/src/ camel-cxf/src/main/ camel-cxf/src/main/java/ camel-cxf/src/main/java/org/ camel-cxf/src/main/java/org/apache/ camel-cxf/src/ma...
Date Fri, 23 Mar 2007 13:10:11 GMT
Author: jstrachan
Date: Fri Mar 23 06:10:09 2007
New Revision: 521714

URL: http://svn.apache.org/viewvc?view=rev&rev=521714
Log:
updated assembly to new names and including camel-cxf and camel-script in the build

Added:
    activemq/camel/trunk/camel-cxf/
    activemq/camel/trunk/camel-cxf/pom.xml   (with props)
    activemq/camel/trunk/camel-cxf/src/
    activemq/camel/trunk/camel-cxf/src/main/
    activemq/camel/trunk/camel-cxf/src/main/java/
    activemq/camel/trunk/camel-cxf/src/main/java/org/
    activemq/camel/trunk/camel-cxf/src/main/java/org/apache/
    activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/
    activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/
    activemq/camel/trunk/camel-cxf/src/main/java/org/apache/camel/component/cxf/
    activemq/camel/trunk/camel-cxf/src/main/resources/
    activemq/camel/trunk/camel-cxf/src/main/resources/META-INF/
    activemq/camel/trunk/camel-cxf/src/main/resources/META-INF/services/
    activemq/camel/trunk/camel-cxf/src/main/resources/META-INF/services/org/
    activemq/camel/trunk/camel-cxf/src/main/resources/META-INF/services/org/apache/
    activemq/camel/trunk/camel-cxf/src/main/resources/META-INF/services/org/apache/camel/
    activemq/camel/trunk/camel-cxf/src/main/resources/META-INF/services/org/apache/camel/EndpointResolver/
    activemq/camel/trunk/camel-cxf/src/test/
    activemq/camel/trunk/camel-cxf/src/test/java/
    activemq/camel/trunk/camel-cxf/src/test/java/org/
    activemq/camel/trunk/camel-cxf/src/test/java/org/apache/
    activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/
    activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/
    activemq/camel/trunk/camel-cxf/src/test/java/org/apache/camel/component/cxf/
    activemq/camel/trunk/camel-cxf/src/test/resources/
Modified:
    activemq/camel/trunk/apache-camel/pom.xml
    activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
    activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
    activemq/camel/trunk/camel-jms/pom.xml
    activemq/camel/trunk/pom.xml

Modified: activemq/camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/pom.xml?view=diff&rev=521714&r1=521713&r2=521714
==============================================================================
--- activemq/camel/trunk/apache-camel/pom.xml (original)
+++ activemq/camel/trunk/apache-camel/pom.xml Fri Mar 23 06:10:09 2007
@@ -28,9 +28,9 @@
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>camel-assembly</artifactId>
+  <artifactId>apache-camel</artifactId>
   <name>Camel :: Assembly</name>
-  <description>Camel Assembly</description>
+  <description>Apache Camel Assembly</description>
 
   <dependencies>
 
@@ -40,6 +40,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-cxf</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-http</artifactId>
     </dependency>
     <dependency>
@@ -56,6 +60,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-script</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-spring</artifactId>
     </dependency>
 
@@ -148,7 +156,7 @@
               <goal>createbundle</goal>
             </goals>
             <configuration>
-              <includes>camel-core,camel-http,camel-jbi,camel-jms,camel-mina,camel-spring,commons-logging</includes>
+              <includes>camel-core,camel-cxf,camel-http,camel-jbi,camel-jms,camel-mina,camel-script,camel-spring,commons-logging</includes>
             </configuration>
           </execution>
         </executions>

Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml?view=diff&rev=521714&r1=521713&r2=521714
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml (original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml Fri Mar 23 06:10:09
2007
@@ -50,10 +50,12 @@
       <scope>runtime</scope>
       <includes>
         <include>org.apache.camel:camel-core</include>
+        <include>org.apache.camel:camel-cxf</include>
         <include>org.apache.camel:camel-http</include>
         <include>org.apache.camel:camel-jbi</include>
         <include>org.apache.camel:camel-jms</include>
         <include>org.apache.camel:camel-mina</include>
+        <include>org.apache.camel:camel-script</include>
         <include>org.apache.camel:camel-spring</include>
         <include>commons-logging:commons-logging</include>
       </includes>

Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml?view=diff&rev=521714&r1=521713&r2=521714
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml (original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml Fri Mar 23 06:10:09
2007
@@ -56,10 +56,12 @@
       <scope>runtime</scope>
       <includes>
         <include>org.apache.camel:camel-core</include>
+        <include>org.apache.camel:camel-cxf</include>
         <include>org.apache.camel:camel-http</include>
         <include>org.apache.camel:camel-jbi</include>
         <include>org.apache.camel:camel-jms</include>
         <include>org.apache.camel:camel-mina</include>
+        <include>org.apache.camel:camel-script</include>
         <include>org.apache.camel:camel-spring</include>
         <include>commons-logging:commons-logging</include>
       </includes>

Added: activemq/camel/trunk/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-cxf/pom.xml?view=auto&rev=521714
==============================================================================
--- activemq/camel/trunk/camel-cxf/pom.xml (added)
+++ activemq/camel/trunk/camel-cxf/pom.xml Fri Mar 23 06:10:09 2007
@@ -0,0 +1,60 @@
+<?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>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>camel-cxf</artifactId>
+  <name>Camel :: CXF</name>
+  <description>Camel CXF support</description>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-core</artifactId>
+    </dependency>
+
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>

Propchange: activemq/camel/trunk/camel-cxf/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-cxf/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: activemq/camel/trunk/camel-cxf/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: activemq/camel/trunk/camel-jms/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-jms/pom.xml?view=diff&rev=521714&r1=521713&r2=521714
==============================================================================
--- activemq/camel/trunk/camel-jms/pom.xml (original)
+++ activemq/camel/trunk/camel-jms/pom.xml Fri Mar 23 06:10:09 2007
@@ -42,7 +42,6 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <optional>false</optional>
     </dependency>
 
     <dependency>

Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?view=diff&rev=521714&r1=521713&r2=521714
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Fri Mar 23 06:10:09 2007
@@ -97,7 +97,7 @@
     <repository>
       <id>apache.incubating.releases</id>
       <name>Apache Incubating Release Distribution Repository</name>
-      <url>scpexe://minotaur.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+      <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
     </repository>
     <snapshotRepository>
       <id>apache.snapshots</id>
@@ -111,8 +111,9 @@
   </distributionManagement>
 
   <modules>
-    <module>camel-assembly</module>
+    <module>apache-camel</module>
     <module>camel-core</module>
+    <module>camel-cxf</module>
     <module>camel-http</module>
     <module>camel-jms</module>
     <module>camel-jbi</module>
@@ -138,6 +139,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-cxf</artifactId>
+        <version>${camel-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-http</artifactId>
         <version>${camel-version}</version>
       </dependency>
@@ -158,6 +164,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-script</artifactId>
+        <version>${camel-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-spring</artifactId>
         <version>${camel-version}</version>
       </dependency>
@@ -339,6 +350,13 @@
         <scope>test</scope>
       </dependency>
 
+
+      <!-- optional CXF support -->
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-core</artifactId>
+        <version>2.0-incubator-RC-SNAPSHOT</version>
+      </dependency>
 
       <dependency>
         <groupId>junit</groupId>



Mime
View raw message