You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/03/30 16:01:26 UTC
svn commit: r759973 - in /camel/branches/camel-1.x: ./
components/camel-cxf/src/test/java/org/apache/camel/component/cxf/
components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/
components/camel-velocity/src/main/java/org/apache/camel/c...
Author: ningjiang
Date: Mon Mar 30 14:01:26 2009
New Revision: 759973
URL: http://svn.apache.org/viewvc?rev=759973&view=rev
Log:
CAMEL-1469 upgraded the CXF version to 2.2
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest.java
camel/branches/camel-1.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest-context.xml
camel/branches/camel-1.x/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
camel/branches/camel-1.x/pom.xml
Modified: camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest.java?rev=759973&r1=759972&r2=759973&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest.java (original)
+++ camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest.java Mon Mar 30 14:01:26 2009
@@ -74,10 +74,8 @@
server = svrBean.create();
server.start();
}
-
- // TODO Need CXF 2.1.5 or later https://issues.apache.org/activemq/browse/CAMEL-1351
- public void testDummy() { }
- public void xxtestInvokingServiceFromCXFClient() throws Exception {
+
+ public void testInvokingServiceFromCXFClient() throws Exception {
LoggingOutInterceptor logInterceptor = null;
Modified: camel/branches/camel-1.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest-context.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest-context.xml?rev=759973&r1=759972&r2=759973&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest-context.xml (original)
+++ camel/branches/camel-1.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest-context.xml Mon Mar 30 14:01:26 2009
@@ -29,21 +29,17 @@
</cxf:properties>
</cxf:cxfEndpoint>
- <!-- TODO need to upgrade CXF to at least 2.1.5
- START SNIPPET: enableLoggingOutInterceptor
- it really should have been user-prestream but CXF does have such phase!
+ <!-- START SNIPPET: enableLoggingOutInterceptor
+ it really should have been user-prestream but CXF does have such phase! -->
<bean id="loggingOutInterceptor" class="org.apache.cxf.interceptor.LoggingOutInterceptor">
<constructor-arg value="write"/>
</bean>
- -->
+
<cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:9002/helloworld"
serviceClass="org.apache.camel.component.cxf.HelloService">
- <!--
- TODO need to upgrade CXF to at least 2.1.5
- <cxf:outInterceptors>
+ <cxf:outInterceptors>
<ref bean="loggingOutInterceptor"/>
- </cxf:outInterceptors>
- -->
+ </cxf:outInterceptors>
<cxf:properties>
<entry key="dataFormat" value="MESSAGE"/>
</cxf:properties>
Modified: camel/branches/camel-1.x/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java?rev=759973&r1=759972&r2=759973&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java (original)
+++ camel/branches/camel-1.x/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java Mon Mar 30 14:01:26 2009
@@ -61,8 +61,8 @@
if (velocityEngine == null) {
velocityEngine = component.getVelocityEngine();
velocityEngine.setProperty(Velocity.FILE_RESOURCE_LOADER_CACHE, isLoaderCache() ? Boolean.TRUE : Boolean.FALSE);
- velocityEngine.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, Log4JLogChute.class.getName());
- velocityEngine.setProperty(Log4JLogChute.RUNTIME_LOG_LOG4J_LOGGER, VelocityEndpoint.class.getName());
+ velocityEngine.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, CommonsLogLogChute.class.getName());
+ velocityEngine.setProperty(CommonsLogLogChute.LOGCHUTE_COMMONS_LOG_NAME, VelocityEndpoint.class.getName());
velocityEngine.init();
}
return velocityEngine;
Modified: camel/branches/camel-1.x/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/pom.xml?rev=759973&r1=759972&r2=759973&view=diff
==============================================================================
--- camel/branches/camel-1.x/pom.xml (original)
+++ camel/branches/camel-1.x/pom.xml Mon Mar 30 14:01:26 2009
@@ -43,7 +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>
- <cxf-version>2.1.4</cxf-version>
+ <cxf-version>2.2</cxf-version>
<felix-version>1.4.1</felix-version>
<felix-osgi-version>1.2.0</felix-osgi-version>
<httpcore-version>4.0-beta3</httpcore-version>