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/10/22 10:18:40 UTC
svn commit: r828348 - in /camel/trunk:
components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java
parent/pom.xml
Author: ningjiang
Date: Thu Oct 22 08:18:39 2009
New Revision: 828348
URL: http://svn.apache.org/viewvc?rev=828348&view=rev
Log:
CAMEL-2096 Upgraded the CXF version to 2.2.4
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java?rev=828348&r1=828347&r2=828348&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java Thu Oct 22 08:18:39 2009
@@ -159,7 +159,7 @@
}
@SuppressWarnings("unchecked")
- private Method findRightMethod(List<Class> resourceClasses, String methodName, Class[] parameterTypes) throws NoSuchMethodException {
+ private Method findRightMethod(List<Class<?>> resourceClasses, String methodName, Class[] parameterTypes) throws NoSuchMethodException {
Method answer = null;
for (Class<?> clazz : resourceClasses) {
try {
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java?rev=828348&r1=828347&r2=828348&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java Thu Oct 22 08:18:39 2009
@@ -33,14 +33,14 @@
public void testCxfRsServerFactoryBean() {
SpringJAXRSServerFactoryBean sfb1 = (SpringJAXRSServerFactoryBean) ctx.getBean("rsServer1");
assertEquals("Get a wrong address", sfb1.getAddress(), "http://localhost:9000/server1");
- List<Class> resource1Classes = sfb1.getResourceClasses();
+ List<Class<?>> resource1Classes = sfb1.getResourceClasses();
assertEquals("Get a wrong size of resouceClasses", resource1Classes.size(), 1);
assertEquals("Get a wrong resource class", resource1Classes.get(0), CustomerService.class);
SpringJAXRSServerFactoryBean sfb2 = (SpringJAXRSServerFactoryBean) ctx.getBean("rsServer2");
assertEquals("Get a wrong address", sfb2.getAddress(), "http://localhost:9000/server2");
sfb2.getResourceClasses();
- List<Class> resource2Classes = sfb2.getResourceClasses();
+ List<Class<?>> resource2Classes = sfb2.getResourceClasses();
assertEquals("Get a wrong size of resouceClasses", resource2Classes.size(), 1);
assertEquals("Get a wrong resource class", resource2Classes.get(0), CustomerService.class);
}
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=828348&r1=828347&r2=828348&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Oct 22 08:18:39 2009
@@ -38,7 +38,7 @@
<activemq-version>5.3.0</activemq-version>
<apacheds-version>1.5.4</apacheds-version>
<axiom-version>1.2.8</axiom-version>
- <cxf-version>2.2.3</cxf-version>
+ <cxf-version>2.2.4</cxf-version>
<felix-osgi-version>1.2.0</felix-osgi-version>
<fuse-commons-management-version>1.0</fuse-commons-management-version>
<geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>