Author: ffang
Date: Wed Dec 22 12:49:36 2010
New Revision: 1051876
URL: http://svn.apache.org/viewvc?rev=1051876&view=rev
Log:
[SMXCOMP]upgrade to cxf 2.3.1
Modified:
servicemix/components/trunk/engines/servicemix-cxf-se/pom.xml
servicemix/components/trunk/engines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
servicemix/components/trunk/engines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeProxyFactoryBean.java
Modified: servicemix/components/trunk/engines/servicemix-cxf-se/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-cxf-se/pom.xml?rev=1051876&r1=1051875&r2=1051876&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-cxf-se/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-cxf-se/pom.xml Wed Dec 22
12:49:36 2010
@@ -34,7 +34,7 @@
<name>Apache ServiceMix :: Components :: CXF Service Engine</name>
<properties>
- <cxf.version>2.2.11</cxf.version>
+ <cxf.version>2.3.1</cxf.version>
<servicemix.osgi.import>
!org.apache.servicemix.cxfse*,
Modified:
servicemix/components/trunk/engines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java?rev=1051876&r1=1051875&r2=1051876&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
(original)
+++
servicemix/components/trunk/engines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeEndpoint.java
Wed Dec 22 12:49:36 2010
@@ -96,13 +96,13 @@ public class CxfSeEndpoint extends Provi
private Server server;
- private List<Interceptor> in = new CopyOnWriteArrayList<Interceptor>();
+ private List<Interceptor<? extends Message>> in = new
CopyOnWriteArrayList<Interceptor<? extends Message>>();
- private List<Interceptor> out = new CopyOnWriteArrayList<Interceptor>();
+ private List<Interceptor<? extends Message>> out = new
CopyOnWriteArrayList<Interceptor<? extends Message>>();
- private List<Interceptor> outFault = new
CopyOnWriteArrayList<Interceptor>();
+ private List<Interceptor<? extends Message>> outFault = new
CopyOnWriteArrayList<Interceptor<? extends Message>>();
- private List<Interceptor> inFault = new
CopyOnWriteArrayList<Interceptor>();
+ private List<Interceptor<? extends Message>> inFault = new
CopyOnWriteArrayList<Interceptor<? extends Message>>();
private Map properties;
@@ -150,7 +150,7 @@ public class CxfSeEndpoint extends Provi
*
* @return a list of <code>Interceptor</code> objects
*/
- public List<Interceptor> getOutFaultInterceptors() {
+ public List<Interceptor<? extends Message>> getOutFaultInterceptors() {
return outFault;
}
@@ -160,7 +160,7 @@ public class CxfSeEndpoint extends Provi
*
* @return a list of <code>Interceptor</code> objects
*/
- public List<Interceptor> getInFaultInterceptors() {
+ public List<Interceptor<? extends Message>> getInFaultInterceptors() {
return inFault;
}
@@ -170,7 +170,7 @@ public class CxfSeEndpoint extends Provi
*
* @return a list of <code>Interceptor</code> objects
*/
- public List<Interceptor> getInInterceptors() {
+ public List<Interceptor<? extends Message>> getInInterceptors() {
return in;
}
@@ -180,7 +180,7 @@ public class CxfSeEndpoint extends Provi
*
* @return a list of <code>Interceptor</code> objects
*/
- public List<Interceptor> getOutInterceptors() {
+ public List<Interceptor<? extends Message>> getOutInterceptors() {
return out;
}
@@ -191,7 +191,7 @@ public class CxfSeEndpoint extends Provi
* @param interceptors a list of <code>Interceptor</code> objects
* @org.apache.xbean.Property description="a list of beans configuring
interceptors that process incoming requests"
*/
- public void setInInterceptors(List<Interceptor> interceptors) {
+ public void setInInterceptors(List<Interceptor<? extends Message>>
interceptors) {
in.addAll(interceptors);
}
@@ -202,7 +202,7 @@ public class CxfSeEndpoint extends Provi
* @param interceptors a list of <code>Interceptor</code> objects
* @org.apache.xbean.Property description="a list of beans configuring
interceptors that process incoming faults"
*/
- public void setInFaultInterceptors(List<Interceptor> interceptors) {
+ public void setInFaultInterceptors(List<Interceptor<? extends Message>>
interceptors) {
inFault.addAll(interceptors);
}
@@ -213,7 +213,7 @@ public class CxfSeEndpoint extends Provi
* @param interceptors a list of <code>Interceptor</code> objects
* @org.apache.xbean.Property description="a list of beans configuring
interceptors that process response messages"
*/
- public void setOutInterceptors(List<Interceptor> interceptors) {
+ public void setOutInterceptors(List<Interceptor<? extends Message>>
interceptors) {
out.addAll(interceptors);
}
@@ -224,7 +224,7 @@ public class CxfSeEndpoint extends Provi
* @param interceptors a list of <code>Interceptor</code> objects
* @org.apache.xbean.Property description="a list of beans configuring
interceptors that process fault messages being returned to the consumer"
*/
- public void setOutFaultInterceptors(List<Interceptor> interceptors) {
+ public void setOutFaultInterceptors(List<Interceptor<? extends Message>>
interceptors) {
outFault.addAll(interceptors);
}
@@ -390,7 +390,7 @@ public class CxfSeEndpoint extends Provi
}
- private void removeInterceptor(List<Interceptor> interceptors, String
whichInterceptor) {
+ private void removeInterceptor(List<Interceptor<? extends Message>>
interceptors, String whichInterceptor) {
for (Interceptor interceptor : interceptors) {
if (interceptor.getClass().getName().endsWith(whichInterceptor)) {
interceptors.remove(interceptor);
Modified:
servicemix/components/trunk/engines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeProxyFactoryBean.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeProxyFactoryBean.java?rev=1051876&r1=1051875&r2=1051876&view=diff
==============================================================================
---
servicemix/components/trunk/engines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeProxyFactoryBean.java
(original)
+++
servicemix/components/trunk/engines/servicemix-cxf-se/src/main/java/org/apache/servicemix/cxfse/CxfSeProxyFactoryBean.java
Wed Dec 22 12:49:36 2010
@@ -30,6 +30,7 @@ import org.apache.cxf.bus.spring.SpringB
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
+import org.apache.cxf.message.Message;
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.jbi.JBITransportFactory;
import org.apache.servicemix.cxfse.interceptors.AttachmentInInterceptor;
@@ -142,7 +143,7 @@ public class CxfSeProxyFactoryBean imple
return proxy;
}
- private void removeInterceptor(List<Interceptor> interceptors, String
whichInterceptor) {
+ private void removeInterceptor(List<Interceptor<? extends Message>>
interceptors, String whichInterceptor) {
for (Interceptor interceptor : interceptors) {
if
(interceptor.getClass().getName().endsWith(whichInterceptor)) {
interceptors.remove(interceptor);
