Author: ffang
Date: Wed Dec 22 12:59:27 2010
New Revision: 1051879
URL: http://svn.apache.org/viewvc?rev=1051879&view=rev
Log:
[SMXCOMP]upgrade to cxf 2.3.1
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcEndpointWithInterceptor.java
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProviderMessageObserver.java
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/ListServiceHandler.java
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiOutWsdl1Interceptor.java
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/AsyncCxfBcConsumerInterceptor.java
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/ControlImpl.java
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/jettyThreadPool.xml
Modified: servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml?rev=1051879&r1=1051878&r2=1051879&view=diff
==============================================================================
--- servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml (original)
+++ servicemix/components/trunk/bindings/servicemix-cxf-bc/pom.xml Wed Dec 22
12:59:27 2010
@@ -45,8 +45,8 @@
</scm>
<properties>
- <cxf.version>2.2.11</cxf.version>
-
+ <cxf.version>2.3.1</cxf.version>
+ <cxf.jetty.version>7.2.1.v20101111</cxf.jetty.version>
<surefire.fork.mode>pertest</surefire.fork.mode>
<servicemix.osgi.import>
@@ -172,16 +172,25 @@
<artifactId>woodstox-core-asl</artifactId>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${cxf.jetty.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${cxf.jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-sslengine</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${cxf.jetty.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java?rev=1051879&r1=1051878&r2=1051879&view=diff
==============================================================================
---
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java
(original)
+++
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcConsumer.java
Wed Dec 22 12:59:27 2010
@@ -117,7 +117,7 @@ import org.apache.servicemix.cxfbc.inter
import org.apache.servicemix.cxfbc.interceptors.SetStatusInterceptor;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.soap.util.DomUtil;
-import org.mortbay.jetty.Handler;
+import org.eclipse.jetty.server.Handler;
import org.springframework.core.io.Resource;
import org.springframework.transaction.PlatformTransactionManager;
@@ -129,13 +129,13 @@ import org.springframework.transaction.P
public class CxfBcConsumer extends ConsumerEndpoint implements
CxfBcEndpointWithInterceptor {
- List<Interceptor> in = new CopyOnWriteArrayList<Interceptor>();
+ List<Interceptor<? extends Message>> in = new
CopyOnWriteArrayList<Interceptor<? extends Message>>();
- List<Interceptor> out = new CopyOnWriteArrayList<Interceptor>();
+ List<Interceptor<? extends Message>> out = new
CopyOnWriteArrayList<Interceptor<? extends Message>>();
- List<Interceptor> outFault = new CopyOnWriteArrayList<Interceptor>();
+ List<Interceptor<? extends Message>> outFault = new
CopyOnWriteArrayList<Interceptor<? extends Message>>();
- List<Interceptor> inFault = new CopyOnWriteArrayList<Interceptor>();
+ List<Interceptor<? extends Message>> inFault = new
CopyOnWriteArrayList<Interceptor<? extends Message>>();
private Resource wsdl;
@@ -212,7 +212,7 @@ public class CxfBcConsumer extends Consu
*
* @return a list of <code>Interceptor</code> objects
* */
- public List<Interceptor> getOutFaultInterceptors() {
+ public List<Interceptor<? extends Message>> getOutFaultInterceptors() {
return outFault;
}
@@ -222,7 +222,7 @@ public class CxfBcConsumer extends Consu
*
* @return a list of <code>Interceptor</code> objects
* */
- public List<Interceptor> getInFaultInterceptors() {
+ public List<Interceptor<? extends Message>> getInFaultInterceptors() {
return inFault;
}
@@ -232,7 +232,7 @@ public class CxfBcConsumer extends Consu
*
* @return a list of <code>Interceptor</code> objects
* */
- public List<Interceptor> getInInterceptors() {
+ public List<Interceptor<? extends Message>> getInInterceptors() {
return in;
}
@@ -242,7 +242,7 @@ public class CxfBcConsumer extends Consu
*
* @return a list of <code>Interceptor</code> objects
* */
- public List<Interceptor> getOutInterceptors() {
+ public List<Interceptor<? extends Message>> getOutInterceptors() {
return out;
}
@@ -253,7 +253,7 @@ public class CxfBcConsumer extends Consu
* @param interceptors a list of <code>Interceptor</code> objects
* @org.apache.xbean.Property description="a list of beans configuring
interceptors that process incoming responses"
* */
- public void setInInterceptors(List<Interceptor> interceptors) {
+ public void setInInterceptors(List<Interceptor<? extends Message>>
interceptors) {
in.addAll(interceptors);
}
@@ -264,7 +264,7 @@ public class CxfBcConsumer extends Consu
* @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);
}
@@ -275,7 +275,7 @@ public class CxfBcConsumer extends Consu
* @param interceptors a list of <code>Interceptor</code> objects
* @org.apache.xbean.Property description="a list of beans configuring
interceptors that process requests"
* */
- public void setOutInterceptors(List<Interceptor> interceptors) {
+ public void setOutInterceptors(List<Interceptor<? extends Message>>
interceptors) {
out.addAll(interceptors);
}
@@ -286,7 +286,7 @@ public class CxfBcConsumer extends Consu
* @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);
}
@@ -510,10 +510,10 @@ public class CxfBcConsumer extends Consu
cxfService.getOutInterceptors().add(
new MtomCheckInterceptor(isMtomEnabled()));
cxfService.getOutInterceptors().add(new StaxOutInterceptor());
- cxfService.getOutInterceptors().add(
+ /*cxfService.getOutInterceptors().add(
new SoapPreProtocolOutInterceptor());
cxfService.getOutInterceptors().add(
- new SoapOutInterceptor(getBus()));
+ new SoapOutInterceptor(getBus()));*/
cxfService.getOutFaultInterceptors().add(
new SoapOutInterceptor(getBus()));
@@ -864,24 +864,24 @@ public class CxfBcConsumer extends Consu
.get(ContinuationProvider.class.getName());
Continuation continuation = continuationProvider
.getContinuation();
- if (!continuation.isPending()) {
+ if (continuation.isNew()) {
CxfBcConsumer.this.messages.put(exchange
.getExchangeId(), message);
context.getDeliveryChannel().send(exchange);
if (!isSTFlow) {
continuation.suspend(timeout * 1000);
}
- } else {
- // retry or timeout
- if (!continuation.isResumed()) {
+ } else if (!continuation.isResumed()) {
+ if (!continuation.isPending()) {
messages.remove(exchange.getExchangeId());
// exchange timeout
throw new Exception("Exchange timed out: "
+ exchange.getExchangeId());
+ } else {
+ //retry
+ throw new
org.apache.cxf.continuations.SuspendedInvocationException();
}
-
- }
-
+ }
}
}
}
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcEndpointWithInterceptor.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcEndpointWithInterceptor.java?rev=1051879&r1=1051878&r2=1051879&view=diff
==============================================================================
---
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcEndpointWithInterceptor.java
(original)
+++
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcEndpointWithInterceptor.java
Wed Dec 22 12:59:27 2010
@@ -19,23 +19,24 @@ package org.apache.servicemix.cxfbc;
import java.util.List;
import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
public interface CxfBcEndpointWithInterceptor extends CxfBcEndpointType {
- List<Interceptor> getOutFaultInterceptors();
+ List<Interceptor<? extends Message>> getOutFaultInterceptors();
- List<Interceptor> getInFaultInterceptors();
+ List<Interceptor<? extends Message>> getInFaultInterceptors();
- List<Interceptor> getInInterceptors();
+ List<Interceptor<? extends Message>> getInInterceptors();
- List<Interceptor> getOutInterceptors();
+ List<Interceptor<? extends Message>> getOutInterceptors();
- void setInInterceptors(List<Interceptor> interceptors);
+ void setInInterceptors(List<Interceptor<? extends Message>> interceptors);
- void setInFaultInterceptors(List<Interceptor> interceptors);
+ void setInFaultInterceptors(List<Interceptor<? extends Message>>
interceptors);
- void setOutInterceptors(List<Interceptor> interceptors);
+ void setOutInterceptors(List<Interceptor<? extends Message>> interceptors);
- void setOutFaultInterceptors(List<Interceptor> interceptors);
+ void setOutFaultInterceptors(List<Interceptor<? extends Message>>
interceptors);
}
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java?rev=1051879&r1=1051878&r2=1051879&view=diff
==============================================================================
---
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
(original)
+++
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProvider.java
Wed Dec 22 12:59:27 2010
@@ -112,15 +112,14 @@ import org.springframework.core.io.Resou
public class CxfBcProvider extends ProviderEndpoint implements
CxfBcEndpointWithInterceptor {
- private static final TransformerFactory TRANSFORMER_FACTORY =
TransformerFactory.newInstance();
-
- List<Interceptor> in = new CopyOnWriteArrayList<Interceptor>();
+
+ List<Interceptor<? extends Message>> in = new
CopyOnWriteArrayList<Interceptor<? extends Message>>();
- List<Interceptor> out = new CopyOnWriteArrayList<Interceptor>();
+ List<Interceptor<? extends Message>> out = new
CopyOnWriteArrayList<Interceptor<? extends Message>>();
- List<Interceptor> outFault = new CopyOnWriteArrayList<Interceptor>();
+ List<Interceptor<? extends Message>> outFault = new
CopyOnWriteArrayList<Interceptor<? extends Message>>();
- List<Interceptor> inFault = new CopyOnWriteArrayList<Interceptor>();
+ List<Interceptor<? extends Message>> inFault = new
CopyOnWriteArrayList<Interceptor<? extends Message>>();
private Resource wsdl;
@@ -155,7 +154,7 @@ public class CxfBcProvider extends Provi
private Map<String, Object> properties = new ConcurrentHashMap<String,
Object>();
- private List<Interceptor> outList;
+ private List<Interceptor<? extends Message>> outList;
private PhaseChainCache cache = new PhaseChainCache();
@@ -163,7 +162,7 @@ public class CxfBcProvider extends Provi
@Override
public void activate() throws Exception {
super.activate();
- outList = new ArrayList<Interceptor>();
+ outList = new ArrayList<Interceptor<? extends Message>>();
if (isMtomEnabled()) {
outList.add(new JbiOutInterceptor());
outList.add(new MtomCheckInterceptor(true));
@@ -308,7 +307,7 @@ public class CxfBcProvider extends Provi
*
* @return a list of <code>Interceptor</code> objects
* */
- public List<Interceptor> getOutFaultInterceptors() {
+ public List<Interceptor<? extends Message>> getOutFaultInterceptors() {
return outFault;
}
@@ -318,7 +317,7 @@ public class CxfBcProvider extends Provi
*
* @return a list of <code>Interceptor</code> objects
* */
- public List<Interceptor> getInFaultInterceptors() {
+ public List<Interceptor<? extends Message>> getInFaultInterceptors() {
return inFault;
}
@@ -328,7 +327,7 @@ public class CxfBcProvider extends Provi
*
* @return a list of <code>Interceptor</code> objects
* */
- public List<Interceptor> getInInterceptors() {
+ public List<Interceptor<? extends Message>> getInInterceptors() {
return in;
}
@@ -338,7 +337,7 @@ public class CxfBcProvider extends Provi
*
* @return a list of <code>Interceptor</code> objects
* */
- public List<Interceptor> getOutInterceptors() {
+ public List<Interceptor<? extends Message>> getOutInterceptors() {
return out;
}
@@ -349,7 +348,7 @@ public class CxfBcProvider 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);
}
@@ -360,7 +359,7 @@ public class CxfBcProvider 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);
}
@@ -371,7 +370,7 @@ public class CxfBcProvider extends Provi
* @param interceptors a list of <code>Interceptor</code> objects
* @org.apache.xbean.Property description="a list of beans configuring
interceptors that process responses"
* */
- public void setOutInterceptors(List<Interceptor> interceptors) {
+ public void setOutInterceptors(List<Interceptor<? extends Message>>
interceptors) {
out.addAll(interceptors);
}
@@ -382,7 +381,7 @@ public class CxfBcProvider 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);
}
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProviderMessageObserver.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProviderMessageObserver.java?rev=1051879&r1=1051878&r2=1051879&view=diff
==============================================================================
---
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProviderMessageObserver.java
(original)
+++
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProviderMessageObserver.java
Wed Dec 22 12:59:27 2010
@@ -41,6 +41,7 @@ import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.interceptor.MustUnderstandInterceptor;
import org.apache.cxf.binding.soap.interceptor.ReadHeadersInterceptor;
+import org.apache.cxf.binding.soap.interceptor.StartBodyInterceptor;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.interceptor.AttachmentInInterceptor;
@@ -51,6 +52,7 @@ import org.apache.cxf.message.Attachment
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.phase.PhaseManager;
import org.apache.cxf.service.model.BindingOperationInfo;
@@ -64,6 +66,7 @@ import org.apache.cxf.ws.addressing.soap
import org.apache.servicemix.common.JbiConstants;
import org.apache.servicemix.cxfbc.interceptors.JbiInWsdl1Interceptor;
import org.apache.servicemix.cxfbc.interceptors.SchemaValidationInInterceptor;
+
import org.xml.sax.SAXException;
import com.sun.xml.bind.v2.runtime.reflect.ListIterator;
@@ -100,11 +103,12 @@ public class CxfBcProviderMessageObserve
public void onMessage(Message message) {
try {
// create Interceptor chain
-
+
PhaseManager pm = providerEndpoint.getBus().getExtension(
PhaseManager.class);
- List<Interceptor> inList = new ArrayList<Interceptor>();
+ List<Interceptor<? extends Message>> inList = new
ArrayList<Interceptor<? extends Message>>();
inList.add(new
ReadHeadersInterceptor(this.providerEndpoint.getBus()));
+ inList.add(new StartBodyInterceptor());
inList.add(new MustUnderstandInterceptor());
inList.add(new StaxInInterceptor());
inList.add(new
JbiInWsdl1Interceptor(this.providerEndpoint.isUseJBIWrapper(),
@@ -173,7 +177,7 @@ public class CxfBcProviderMessageObserve
}
messageExchange =
soapMessage.getExchange().get(MessageExchange.class);
- if (isPartialResponse(message)) {
+ if (MessageUtils.isPartialResponse(soapMessage)) {
//partial response for origianl channel when use decoupled
endpoint
return;
}
@@ -303,12 +307,4 @@ public class CxfBcProviderMessageObserve
return
Names.WSA_RELATIONSHIP_REPLY.equals(relatesTo.getRelationshipType());
}
- private boolean isPartialResponse(Message in) {
- if (in.get(Message.RESPONSE_CODE) != null) {
- return
in.get(Message.RESPONSE_CODE).equals(HttpURLConnection.HTTP_ACCEPTED);
- } else {
- return false;
- }
- }
-
}
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/ListServiceHandler.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/ListServiceHandler.java?rev=1051879&r1=1051878&r2=1051879&view=diff
==============================================================================
---
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/ListServiceHandler.java
(original)
+++
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/ListServiceHandler.java
Wed Dec 22 12:59:27 2010
@@ -31,12 +31,14 @@ import org.apache.cxf.Bus;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.endpoint.ServerRegistry;
import org.apache.cxf.transport.http_jetty.JettyHTTPDestination;
-import org.mortbay.jetty.HttpConnection;
-import org.mortbay.jetty.HttpMethods;
-import org.mortbay.jetty.MimeTypes;
-import org.mortbay.jetty.handler.AbstractHandler;
-import org.mortbay.util.ByteArrayISO8859Writer;
-import org.mortbay.util.StringUtil;
+import org.eclipse.jetty.http.HttpMethods;
+import org.eclipse.jetty.http.MimeTypes;
+import org.eclipse.jetty.server.HttpConnection;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.eclipse.jetty.util.ByteArrayISO8859Writer;
+import org.eclipse.jetty.util.StringUtil;
+
public class ListServiceHandler extends AbstractHandler {
@@ -105,4 +107,10 @@ public class ListServiceHandler extends
out.close();
}
+ public void handle(String target, Request baseRequest, HttpServletRequest
request,
+ HttpServletResponse response) throws IOException,
ServletException {
+ handle(target, request, response, 0);
+
+ }
+
}
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiOutWsdl1Interceptor.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiOutWsdl1Interceptor.java?rev=1051879&r1=1051878&r2=1051879&view=diff
==============================================================================
---
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiOutWsdl1Interceptor.java
(original)
+++
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/interceptors/JbiOutWsdl1Interceptor.java
Wed Dec 22 12:59:27 2010
@@ -36,6 +36,7 @@ import org.apache.cxf.binding.soap.model
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.headers.Header;
import org.apache.cxf.helpers.NSStack;
+import org.apache.cxf.helpers.XMLUtils;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.service.model.BindingMessageInfo;
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/AsyncCxfBcConsumerInterceptor.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/AsyncCxfBcConsumerInterceptor.java?rev=1051879&r1=1051878&r2=1051879&view=diff
==============================================================================
---
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/AsyncCxfBcConsumerInterceptor.java
(original)
+++
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/AsyncCxfBcConsumerInterceptor.java
Wed Dec 22 12:59:27 2010
@@ -28,7 +28,6 @@ import org.apache.servicemix.cxfbc.CxfBc
public class AsyncCxfBcConsumerInterceptor extends AbstractPhaseInterceptor {
private long currentThreadId;
- private long before;
private boolean firstInvocation = true;
public AsyncCxfBcConsumerInterceptor() {
@@ -40,7 +39,6 @@ public class AsyncCxfBcConsumerIntercept
if (firstInvocation) {
firstInvocation = false;
currentThreadId = Thread.currentThread().getId();
- before = System.currentTimeMillis();
} else {
if (Thread.currentThread().getId() != currentThreadId) {
//ensure only one thread is used for the cxf bc
consumer
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java?rev=1051879&r1=1051878&r2=1051879&view=diff
==============================================================================
---
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java
(original)
+++
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java
Wed Dec 22 12:59:27 2010
@@ -19,6 +19,7 @@ package org.apache.servicemix.cxfbc;
import java.net.URL;
import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
import javax.xml.ws.soap.SOAPBinding;
import org.apache.cxf.calculator.CalculatorImpl;
import org.apache.cxf.calculator.CalculatorPortType;
@@ -27,6 +28,8 @@ import org.apache.cxf.frontend.ClientPro
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.EndpointImpl;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.springframework.context.support.AbstractXmlApplicationContext;
public class CxfBcProviderConsumerTest extends CxfBcSpringTestSupport {
@@ -57,6 +60,7 @@ public class CxfBcProviderConsumerTest e
ClientProxy.getClient(port).getInInterceptors().add(new
LoggingInInterceptor());
ClientProxy.getClient(port).getOutFaultInterceptors().add(new
LoggingOutInterceptor());
ClientProxy.getClient(port).getOutInterceptors().add(new
LoggingInInterceptor());
+
int ret = port.add(1, 2);
assertEquals(ret, 3);
try {
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java?rev=1051879&r1=1051878&r2=1051879&view=diff
==============================================================================
---
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java
(original)
+++
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java
Wed Dec 22 12:59:27 2010
@@ -32,6 +32,7 @@ import org.apache.cxf.bus.spring.SpringB
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.jaxws.ServiceImpl;
import org.apache.cxf.jaxws.support.ServiceDelegateAccessor;
+import org.apache.cxf.message.Message;
import org.apache.cxf.ws.addressing.AddressingBuilder;
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.AttributedURIType;
@@ -120,7 +121,7 @@ public class CxfBcAddressingTest extends
messageIDs.clear();
mapVerifier = new MAPVerifier();
headerVerifier = new HeaderVerifier();
- Interceptor[] interceptors = {mapVerifier, headerVerifier };
+ Interceptor<?>[] interceptors = {mapVerifier, headerVerifier };
addInterceptors(staticBus.getInInterceptors(), interceptors);
addInterceptors(staticBus.getOutInterceptors(), interceptors);
addInterceptors(staticBus.getOutFaultInterceptors(), interceptors);
@@ -144,7 +145,7 @@ public class CxfBcAddressingTest extends
}
public void tearDown() throws Exception {
- Interceptor[] interceptors = {mapVerifier, headerVerifier };
+ Interceptor<?>[] interceptors = {mapVerifier, headerVerifier };
removeInterceptors(staticBus.getInInterceptors(), interceptors);
removeInterceptors(staticBus.getOutInterceptors(), interceptors);
removeInterceptors(staticBus.getOutFaultInterceptors(), interceptors);
@@ -311,14 +312,14 @@ public class CxfBcAddressingTest extends
staticBus.shutdown(true);
}
- private void addInterceptors(List<Interceptor> chain,
- Interceptor[] interceptors) {
+ private void addInterceptors(List<Interceptor<? extends Message>> chain,
+ Interceptor<? extends Message>[]
interceptors) {
for (int i = 0; i < interceptors.length; i++) {
chain.add(interceptors[i]);
}
}
- private void removeInterceptors(List<Interceptor> chain,
- Interceptor[] interceptors) {
+ private void removeInterceptors(List<Interceptor<? extends Message>> chain,
+ Interceptor<? extends Message>[]
interceptors) {
for (int i = 0; i < interceptors.length; i++) {
chain.add(interceptors[i]);
}
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/ControlImpl.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/ControlImpl.java?rev=1051879&r1=1051878&r2=1051879&view=diff
==============================================================================
---
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/ControlImpl.java
(original)
+++
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/ControlImpl.java
Wed Dec 22 12:59:27 2010
@@ -32,6 +32,7 @@ import org.apache.cxf.greeter_control.ty
import org.apache.cxf.greeter_control.types.StartGreeterResponse;
import org.apache.cxf.greeter_control.types.StopGreeterResponse;
import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
@WebService(serviceName = "ControlService",
portName = "ControlPort",
@@ -117,7 +118,7 @@ public class ControlImpl {
}
public void setFaultLocation(FaultLocation fl) {
- List<Interceptor> interceptors = greeterBus.getInInterceptors();
+ List<Interceptor<? extends Message>> interceptors =
greeterBus.getInInterceptors();
FaultThrowingInterceptor fi = null;
for (Interceptor i : interceptors) {
if (i instanceof FaultThrowingInterceptor) {
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java?rev=1051879&r1=1051878&r2=1051879&view=diff
==============================================================================
---
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java
(original)
+++
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java
Wed Dec 22 12:59:27 2010
@@ -796,35 +796,37 @@ public class CxfBcRMSequenceTest extends
// + two requests (second request does not include acknowledgement for
first response as
// in the meantime the client has terminated the sequence
- String[] expectedActions = new String[3];
+ String[] expectedActions = new String[4];
expectedActions[0] = RMConstants.getCreateSequenceAction();
for (int i = 1; i < expectedActions.length; i++) {
expectedActions[i] = GREETME_ACTION;
}
+ expectedActions[2] = RMConstants.getSequenceAcknowledgmentAction();
mf.verifyActions(expectedActions, true);
- mf.verifyMessageNumbers(new String[] {null, "1", "2"}, true);
- mf.verifyLastMessage(new boolean[3], true);
- mf.verifyAcknowledgements(new boolean[] {false, false, false}, true);
+ mf.verifyMessageNumbers(new String[] {null, "1", null, "2"}, true);
+ mf.verifyLastMessage(new boolean[4], true);
+ mf.verifyAcknowledgements(new boolean[] {false, false, true, false},
true);
// Expected inbound:
// createSequenceResponse
// + 1 response with acknowledgement
// + 1 fault without acknowledgement
- mf.verifyMessages(3, false);
+ mf.verifyMessages(4, false);
expectedActions = new String[]
{RMConstants.getCreateSequenceResponseAction(),
- GREETME_RESPONSE_ACTION, null};
+ GREETME_RESPONSE_ACTION,
+ null,
+ null};
mf.verifyActions(expectedActions, false);
- mf.verifyMessageNumbers(new String[] {null, "1", null}, false);
- mf.verifyAcknowledgements(new boolean[] {false, true, false} , false);
-
- // the third inbound message has a SequenceFault header
-
- mf.verifySequenceFault(RMConstants.getUnknownSequenceFaultCode(),
false, 2);
+ mf.verifyMessageNumbers(new String[] {null, "1", null, null}, false);
+ mf.verifyAcknowledgements(new boolean[] {false, true, false, false} ,
false);
+ // the last inbound message has a SequenceFault header
+ mf.verifySequenceFault(RMConstants.getUnknownSequenceFaultCode(),
false, 3);
}
+
public void testOnewayMessageLoss() throws Exception {
if (!doTestOnewayMessageLoss) {
return;
@@ -1204,8 +1206,8 @@ public class CxfBcRMSequenceTest extends
init("org/apache/servicemix/cxfbc/ws/rm/message-loss-server.xml",
true);
// avoid client side message loss
- List<Interceptor> outInterceptors = greeterBus.getOutInterceptors();
- for (Interceptor i : outInterceptors) {
+ List<Interceptor<? extends Message>> outInterceptors =
greeterBus.getOutInterceptors();
+ for (Interceptor<? extends Message> i : outInterceptors) {
if (i.getClass().equals(MessageLossSimulator.class)) {
outInterceptors.remove(i);
break;
@@ -1399,8 +1401,8 @@ public class CxfBcRMSequenceTest extends
mr.awaitMessages(nExpectedOut, nExpectedIn, timeout);
}
- private void removeRMInterceptors(List<Interceptor> interceptors) {
- for (Iterator<Interceptor> it = interceptors.iterator();
it.hasNext();) {
+ private void removeRMInterceptors(List<Interceptor<? extends Message>>
interceptors) {
+ for (Iterator<Interceptor<? extends Message>> it =
interceptors.iterator(); it.hasNext();) {
Interceptor i = it.next();
if (i instanceof RMSoapInterceptor
|| i instanceof RMOutInterceptor
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/jettyThreadPool.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/jettyThreadPool.xml?rev=1051879&r1=1051878&r2=1051879&view=diff
==============================================================================
---
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/jettyThreadPool.xml
(original)
+++
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/jettyThreadPool.xml
Wed Dec 22 12:59:27 2010
@@ -42,7 +42,7 @@
<httpj:engine-factory bus="cxf">
<httpj:engine port="19000">
- <httpj:threadingParameters minThreads="1" maxThreads="2" />
+ <httpj:threadingParameters minThreads="1" maxThreads="3" />
</httpj:engine>
</httpj:engine-factory>
