Author: ningjiang
Date: Tue Jun 2 15:04:55 2009
New Revision: 781050
URL: http://svn.apache.org/viewvc?rev=781050&view=rev
Log:
CAMEL-1667 upgraded CXF version to 2.2.2
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestinationFactory.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java
camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java
camel/trunk/pom.xml
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java?rev=781050&r1=781049&r2=781050&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
Tue Jun 2 15:04:55 2009
@@ -28,7 +28,9 @@
import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
import org.apache.cxf.configuration.spring.BusWiringType;
import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
+import org.apache.cxf.jaxrs.model.UserResource;
import org.apache.cxf.jaxrs.spring.JAXRSClientFactoryBeanDefinitionParser;
+import org.apache.cxf.jaxrs.utils.ResourceUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
@@ -41,6 +43,7 @@
setBeanClass(SpringJAXRSClientFactoryBean.class);
}
+
@Override
protected void doParse(Element element, ParserContext ctx,
BeanDefinitionBuilder bean) {
super.doParse(element, ctx, bean);
@@ -59,9 +62,12 @@
List list = ctx.getDelegate().parseListElement(el,
bean.getBeanDefinition());
bean.addPropertyValue(name, list);
} else if ("features".equals(name) || "providers".equals(name)
- || "schemaLocations".equals(name)) {
+ || "schemaLocations".equals(name) ||
"modelBeans".equals(name)) {
List list = ctx.getDelegate().parseListElement(el,
bean.getBeanDefinition());
bean.addPropertyValue(name, list);
+ } else if ("model".equals(name)) {
+ List<UserResource> resources =
ResourceUtils.getResourcesFromElement(el);
+ bean.addPropertyValue("modelBeans", resources);
} else {
setFirstChildAsProperty(el, ctx, bean, name);
}
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java?rev=781050&r1=781049&r2=781050&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
Tue Jun 2 15:04:55 2009
@@ -33,8 +33,10 @@
import org.apache.cxf.configuration.spring.BusWiringType;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.JAXRSServiceFactoryBean;
+import org.apache.cxf.jaxrs.model.UserResource;
import org.apache.cxf.jaxrs.spring.JAXRSServerFactoryBeanDefinitionParser;
import
org.apache.cxf.jaxrs.spring.JAXRSServerFactoryBeanDefinitionParser.SpringJAXRSServerFactoryBean;
+import org.apache.cxf.jaxrs.utils.ResourceUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
@@ -77,9 +79,13 @@
List list = ctx.getDelegate().parseListElement(el,
bean.getBeanDefinition());
bean.addPropertyValue(name, list);
} else if ("features".equals(name) || "schemaLocations".equals(name)
- || "providers".equals(name) || "serviceBeans".equals(name)) {
+ || "providers".equals(name) || "serviceBeans".equals(name)
+ || "modelBeans".equals(name)) {
List list = ctx.getDelegate().parseListElement(el,
bean.getBeanDefinition());
bean.addPropertyValue(name, list);
+ } else if ("model".equals(name)) {
+ List<UserResource> resources =
ResourceUtils.getResourcesFromElement(el);
+ bean.addPropertyValue("modelBeans", resources);
} else {
setFirstChildAsProperty(el, ctx, bean, name);
}
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestinationFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestinationFactory.java?rev=781050&r1=781049&r2=781050&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestinationFactory.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/NullDestinationFactory.java
Tue Jun 2 15:04:55 2009
@@ -31,7 +31,7 @@
// setup the endpoint information
ei.setAddress("local://" + ei.getService().getName().toString() + "/"
+ ei.getName().getLocalPart());
// working as the dispatch mode, the binding factory will not add
interceptor
-
ei.getBinding().setProperty(AbstractBindingFactory.DATABINDING_DISABLED,
Boolean.TRUE);
+
//ei.getBinding().setProperty(AbstractBindingFactory.DATABINDING_DISABLED,
Boolean.TRUE);
// do nothing here , just creating a null destination to store the
observer
return new NullDestination();
}
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java?rev=781050&r1=781049&r2=781050&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/WSDLSoapServiceFactoryBean.java
Tue Jun 2 15:04:55 2009
@@ -66,7 +66,7 @@
//setup the endpoint address
ei.setAddress("local://" +
ei.getService().getName().toString() + "/" + ei.getName().getLocalPart());
// working as the dispatch mode, the binding factory will not
add interceptor
-
ei.getBinding().setProperty(AbstractBindingFactory.DATABINDING_DISABLED,
Boolean.TRUE);
+
//ei.getBinding().setProperty(AbstractBindingFactory.DATABINDING_DISABLED,
Boolean.TRUE);
}
}
Modified:
camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd?rev=781050&r1=781049&r2=781050&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd
(original)
+++ camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd
Tue Jun 2 15:04:55 2009
@@ -76,10 +76,8 @@
<xsd:element name="outFaultInterceptors" type="xsd:anyType"
minOccurs="0"/>
<xsd:element name="properties" type="beans:mapType" minOccurs="0"/>
<xsd:element name="serviceBeans" type="xsd:anyType" minOccurs="0"/>
- <!-- this is only supported in CXF 2.2.3
<xsd:element name="modelBeans" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="model" type="model" minOccurs="0"/>
- -->
<xsd:element name="providers" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="extensionMappings" type="xsd:anyType"
minOccurs="0"/>
<xsd:element name="languageMappings" type="xsd:anyType"
minOccurs="0"/>
@@ -90,9 +88,7 @@
<xsd:attribute name="bus" type="xsd:string" />
<xsd:attribute name="serviceClass" type="xsd:string"/>
<xsd:attribute name="transportId" type="xsd:string"/>
- <!-- this is only supported in CXF 2.2.3
<xsd:attribute name="modelRef" type="xsd:string" />
- -->
<xsd:attribute name="bindingId" type="xsd:string" />
<xsd:attribute name="staticSubresourceResolution" type="xsd:boolean"
/>
</xsd:extension>
@@ -114,10 +110,8 @@
<xsd:element name="outFaultInterceptors" type="xsd:anyType"
minOccurs="0"/>
<xsd:element name="properties" type="beans:mapType" minOccurs="0"/>
<xsd:element name="providers" type="xsd:anyType" minOccurs="0"/>
- <!-- this is only supported in CXF 2.2.3
<xsd:element name="modelBeans" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="model" type="model" minOccurs="0"/>
- -->
<xsd:element name="headers" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="schemaLocations" type="schemasType"
minOccurs="0"/>
</xsd:all>
@@ -128,9 +122,7 @@
<xsd:attribute name="bus" type="xsd:string" />
<xsd:attribute name="transportId" type="xsd:string"/>
<xsd:attribute name="bindingId" type="xsd:string" />
- <!-- this is only supported in CXF 2.2.3
<xsd:attribute name="modelRef" type="xsd:string" />
- -->
<xsd:attribute name="username" type="xsd:string"/>
<xsd:attribute name="password" type="xsd:string"/>
</xsd:extension>
@@ -144,7 +136,6 @@
</xsd:sequence>
</xsd:complexType>
- <!-- this is only supported in CXF 2.2.3
<xsd:complexType name="model">
<xsd:sequence>
<xsd:element name="resource" minOccurs="0" maxOccurs="unbounded">
@@ -174,6 +165,5 @@
</xsd:element>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:string"/>
- </xsd:complexType>
- -->
+ </xsd:complexType>
</xsd:schema>
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java?rev=781050&r1=781049&r2=781050&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
Tue Jun 2 15:04:55 2009
@@ -69,7 +69,7 @@
assertEquals("Can't get the right message count",
fromHandler.getMessageCount(), 8);
assertEquals("Can't get the right fault count",
fromHandler.getFaultCount(), 0);
- assertEquals("Can't get the right headers count",
fromHandler.getGetHeadersCount(), 0);
+ assertEquals("Can't get the right headers count",
fromHandler.getGetHeadersCount(), 4);
}
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java?rev=781050&r1=781049&r2=781050&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java
Tue Jun 2 15:04:55 2009
@@ -32,7 +32,7 @@
return getHeadersCount;
}
- public Set<QName> getHeaders() {
+ public Set<QName> getHeaders() {
getHeadersCount++;
return null;
}
Modified: camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=781050&r1=781049&r2=781050&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Tue Jun 2 15:04:55 2009
@@ -44,7 +44,7 @@
<activemq-version>5.2.0</activemq-version>
<apacheds-version>1.5.4</apacheds-version>
<axiom-version>1.2.8</axiom-version>
- <cxf-version>2.2.1</cxf-version>
+ <cxf-version>2.2.2</cxf-version>
<felix-version>1.4.1</felix-version>
<felix-osgi-version>1.2.0</felix-osgi-version>
<geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>
