camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r735628 - in /activemq/camel/trunk/components/camel-cxf: pom.xml src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java src/test/resources/org/apache/camel/component/cxf/context-camel-1145.xml
Date Mon, 19 Jan 2009 08:23:40 GMT
Author: ningjiang
Date: Mon Jan 19 00:23:40 2009
New Revision: 735628

URL: http://svn.apache.org/viewvc?rev=735628&view=rev
Log:
CAMEL-1256 Added apache snapshot repository and Fixed the build error in my box (Windows JDK1.5.0_13)

Modified:
    activemq/camel/trunk/components/camel-cxf/pom.xml
    activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
    activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/context-camel-1145.xml

Modified: activemq/camel/trunk/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/pom.xml?rev=735628&r1=735627&r2=735628&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/pom.xml (original)
+++ activemq/camel/trunk/components/camel-cxf/pom.xml Mon Jan 19 00:23:40 2009
@@ -45,6 +45,18 @@
       <url>http://download.java.net/maven/1</url>
       <!--<url>https://maven-repository.dev.java.net/nonav/repository</url>-->
       <layout>legacy</layout>
+    </repository>    
+    <!--  for CXF snapshot -->
+    <repository>
+      <id>apache.snapshot</id>
+      <name>Apache Snapshot Maven Repo</name>
+      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
     </repository>
   </repositories>
 

Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=735628&r1=735627&r2=735628&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
(original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
Mon Jan 19 00:23:40 2009
@@ -40,6 +40,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.common.util.ClassHelper;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.ClientImpl;
 import org.apache.cxf.endpoint.Endpoint;
@@ -284,16 +285,16 @@
         wsdlURL = url;
     }
     
-    public String getServiceClass() {
+    public String getServiceClass() {        
         return serviceClass;
     }
-
-    public void setServiceClass(String className) {
-        serviceClass = className;
-    }
-    
+      
     public void setServiceClass(Object instance) {
-        serviceClass = instance.getClass().getName();
+        if (instance instanceof String) {
+            serviceClass = (String) instance;
+        } else {
+            serviceClass = ClassHelper.getRealClass(instance).getName();
+        }
     }
 
     public void setPortName(String port) {

Modified: activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/context-camel-1145.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/context-camel-1145.xml?rev=735628&r1=735627&r2=735628&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/context-camel-1145.xml
(original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/context-camel-1145.xml
Mon Jan 19 00:23:40 2009
@@ -44,7 +44,7 @@
     	<property name="logLevel" value="INFO"/>
 	</bean>
 	
-	<bean id="traceFormatter" class="org.apache.camel.processor.interceptor.TraceFormatter">
+	<bean id="traceFormatter" class="org.apache.camel.processor.interceptor.DefaultTraceFormatter">
     	<property name="showBody" value="true"/>
     	<property name="showBodyType" value="true"/>
     	<property name="showProperties" value="true"/>



Mime
View raw message