camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r902034 - in /camel/trunk: examples/camel-example-cafe/ examples/camel-example-cxf/pom.xml examples/camel-example-loan-broker/pom.xml tests/camel-itest/pom.xml
Date Fri, 22 Jan 2010 08:38:32 GMT
Author: ningjiang
Date: Fri Jan 22 08:38:30 2010
New Revision: 902034

URL: http://svn.apache.org/viewvc?rev=902034&view=rev
Log:
Fixed the build error which is caused by camel-cxf pom.xml changed

Modified:
    camel/trunk/examples/camel-example-cafe/   (props changed)
    camel/trunk/examples/camel-example-cxf/pom.xml
    camel/trunk/examples/camel-example-loan-broker/pom.xml
    camel/trunk/tests/camel-itest/pom.xml

Propchange: camel/trunk/examples/camel-example-cafe/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jan 22 08:38:30 2010
@@ -0,0 +1,7 @@
+.project
+.checkstyle
+.pmd
+.classpath
+target
+.settings
+eclipse-classes

Modified: camel/trunk/examples/camel-example-cxf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/pom.xml?rev=902034&r1=902033&r2=902034&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/pom.xml (original)
+++ camel/trunk/examples/camel-example-cxf/pom.xml Fri Jan 22 08:38:30 2010
@@ -72,6 +72,12 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jetty</artifactId>
     </dependency>
+    
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-transports-http-jetty</artifactId>
+      <version>${cxf-version}</version>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.cxf</groupId>

Modified: camel/trunk/examples/camel-example-loan-broker/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/pom.xml?rev=902034&r1=902033&r2=902034&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-loan-broker/pom.xml (original)
+++ camel/trunk/examples/camel-example-loan-broker/pom.xml Fri Jan 22 08:38:30 2010
@@ -52,12 +52,17 @@
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-cxf</artifactId>
-      <exclusions>
-        <exclusion>
-      	  <groupId>org.slf4j</groupId>
-      	  <artifactId>slf4j-jdk14</artifactId>
-      	</exclusion>
-      </exclusions>
+    </dependency>
+    <dependency>
+       <groupId>org.apache.cxf</groupId>
+       <artifactId>cxf-rt-transports-http-jetty</artifactId>
+       <version>${cxf-version}</version>
+       <exclusions>
+          <exclusion>
+             <groupId>org.slf4j</groupId>
+             <artifactId>slf4j-jdk14</artifactId>
+           </exclusion>
+        </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>

Modified: camel/trunk/tests/camel-itest/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/pom.xml?rev=902034&r1=902033&r2=902034&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/pom.xml (original)
+++ camel/trunk/tests/camel-itest/pom.xml Fri Jan 22 08:38:30 2010
@@ -51,10 +51,6 @@
                     <groupId>org.apache.geronimo.specs</groupId>
                     <artifactId>geronimo-javamail_1.4_spec</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-jdk14</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -206,6 +202,18 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http-jetty</artifactId>
+            <version>${cxf-version}</version>
+            <scope>test</scope>
+            <exclusions>
+              <exclusion>
+                 <groupId>org.slf4j</groupId>
+                 <artifactId>slf4j-jdk14</artifactId>
+              </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <scope>test</scope>



Mime
View raw message