You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/11/16 16:15:02 UTC
svn commit: r880785 [3/3] - in /cxf/trunk:
api/src/main/java/org/apache/cxf/interceptor/
api/src/main/java/org/apache/cxf/phase/
api/src/main/java/org/apache/cxf/ws/policy/
rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/
rt/bindings/coloc...
Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java Mon Nov 16 15:14:59 2009
@@ -30,6 +30,7 @@
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.provider.AegisElementProvider;
import org.apache.cxf.jaxrs.provider.DataBindingJSONProvider;
+import org.apache.cxf.message.Message;
import org.apache.cxf.sdo.SDODataBinding;
import org.apache.cxf.systest.jaxrs.sdo.SDOResource;
import org.apache.cxf.systest.jaxrs.sdo.Structure;
@@ -89,7 +90,7 @@
bean.setProvider(provider);
bean.setAddress("http://localhost:9080/databinding/sdo");
bean.setResourceClass(SDOResource.class);
- List<Interceptor> list = new ArrayList<Interceptor>();
+ List<Interceptor<? extends Message>> list = new ArrayList<Interceptor<? extends Message>>();
list.add(new LoggingInInterceptor());
bean.setInInterceptors(list);
SDOResource client = bean.create(SDOResource.class);
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java Mon Nov 16 15:14:59 2009
@@ -37,6 +37,7 @@
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.testutil.common.AbstractClientServerTestBase;
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.AddressingPropertiesImpl;
@@ -105,14 +106,14 @@
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.remove(interceptors[i]);
}
@@ -133,7 +134,7 @@
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);
@@ -158,7 +159,7 @@
@After
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);
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/Server.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/Server.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/Server.java Mon Nov 16 15:14:59 2009
@@ -30,6 +30,7 @@
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
public class Server extends AbstractBusTestServerBase implements VerificationCache {
@@ -56,15 +57,15 @@
mapVerifier.verificationCache = this;
HeaderVerifier headerVerifier = new HeaderVerifier();
headerVerifier.verificationCache = this;
- Interceptor[] interceptors = {mapVerifier, headerVerifier};
+ Interceptor<?>[] interceptors = {mapVerifier, headerVerifier};
addInterceptors(getBus().getInInterceptors(), interceptors);
addInterceptors(getBus().getInFaultInterceptors(), interceptors);
addInterceptors(getBus().getOutInterceptors(), interceptors);
addInterceptors(getBus().getOutFaultInterceptors(), interceptors);
}
- 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]);
}
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/WSAFeatureTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/WSAFeatureTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/WSAFeatureTest.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/WSAFeatureTest.java Mon Nov 16 15:14:59 2009
@@ -27,6 +27,7 @@
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+import org.apache.cxf.message.Message;
import org.apache.cxf.test.AbstractCXFTest;
import org.apache.cxf.ws.addressing.MAPAggregator;
import org.apache.cxf.ws.addressing.WSAddressingFeature;
@@ -63,11 +64,11 @@
checkAddressInterceptors(client.getInInterceptors());
}
- private void checkAddressInterceptors(List<Interceptor> interceptors) {
+ private void checkAddressInterceptors(List<Interceptor<? extends Message>> interceptors) {
boolean hasAg = false;
boolean hasCodec = false;
- for (Interceptor i : interceptors) {
+ for (Interceptor<? extends Message> i : interceptors) {
if (i instanceof MAPAggregator) {
hasAg = true;
} else if (i instanceof MAPCodec) {
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/WSAFeatureXmlTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/WSAFeatureXmlTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/WSAFeatureXmlTest.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/spring/WSAFeatureXmlTest.java Mon Nov 16 15:14:59 2009
@@ -31,6 +31,7 @@
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+import org.apache.cxf.message.Message;
import org.apache.cxf.test.AbstractCXFTest;
import org.apache.cxf.ws.addressing.MAPAggregator;
import org.apache.cxf.ws.addressing.soap.MAPCodec;
@@ -77,11 +78,11 @@
checkAddressInterceptors(client.getInInterceptors());
}
- private void checkAddressInterceptors(List<Interceptor> interceptors) {
+ private void checkAddressInterceptors(List<Interceptor<? extends Message>> interceptors) {
boolean hasAg = false;
boolean hasCodec = false;
- for (Interceptor i : interceptors) {
+ for (Interceptor<? extends Message> i : interceptors) {
if (i instanceof MAPAggregator) {
hasAg = true;
} else if (i instanceof MAPCodec) {
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java Mon Nov 16 15:14:59 2009
@@ -32,6 +32,7 @@
import org.apache.cxf.greeter_control.Greeter;
import org.apache.cxf.greeter_control.PingMeFault;
import org.apache.cxf.interceptor.Interceptor;
+import org.apache.cxf.message.Message;
import org.apache.cxf.systest.ws.util.ConnectionHelper;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
@@ -126,15 +127,15 @@
private static void testInterceptors(Bus b) {
boolean hasServerIn = false;
boolean hasServerOut = false;
- List<Interceptor> inInterceptors = b.getInInterceptors();
- for (Interceptor i : inInterceptors) {
+ List<Interceptor<? extends Message>> inInterceptors = b.getInInterceptors();
+ for (Interceptor<? extends Message> i : inInterceptors) {
if (i instanceof PolicyInInterceptor) {
hasServerIn = true;
}
}
assertTrue(hasServerIn);
- for (Interceptor i : b.getOutInterceptors()) {
+ for (Interceptor<? extends Message> i : b.getOutInterceptors()) {
if (i instanceof PolicyOutInterceptor) {
hasServerOut = true;
}
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java Mon Nov 16 15:14:59 2009
@@ -42,10 +42,8 @@
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.XMLUtils;
import org.apache.cxf.helpers.XPathUtils;
-import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
-//import org.apache.cxf.jaxws.EndpointImpl;
@WebService(serviceName = "ControlService",
@@ -67,8 +65,8 @@
LOG.info("Initialised bus " + greeterBus + " with cfg file resource: " + cfgResource);
LOG.fine("greeterBus inInterceptors: " + greeterBus.getInInterceptors());
- Interceptor logIn = new LoggingInInterceptor();
- Interceptor logOut = new LoggingOutInterceptor();
+ LoggingInInterceptor logIn = new LoggingInInterceptor();
+ LoggingOutInterceptor logOut = new LoggingOutInterceptor();
greeterBus.getInInterceptors().add(logIn);
greeterBus.getOutInterceptors().add(logOut);
greeterBus.getOutFaultInterceptors().add(logOut);
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/MessageLossSimulator.java Mon Nov 16 15:14:59 2009
@@ -28,6 +28,7 @@
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.interceptor.MessageSenderInterceptor;
import org.apache.cxf.io.AbstractWrappedOutputStream;
@@ -72,9 +73,9 @@
}
InterceptorChain chain = message.getInterceptorChain();
- ListIterator it = chain.getIterator();
+ ListIterator<Interceptor<? extends Message>> it = chain.getIterator();
while (it.hasNext()) {
- PhaseInterceptor pi = (PhaseInterceptor)it.next();
+ PhaseInterceptor<?> pi = (PhaseInterceptor)it.next();
if (MessageSenderInterceptor.class.getName().equals(pi.getId())) {
chain.remove(pi);
LOG.fine("Removed MessageSenderInterceptor from interceptor chain.");
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java Mon Nov 16 15:14:59 2009
@@ -722,7 +722,7 @@
init(cfg);
- class MessageNumberInterceptor extends AbstractPhaseInterceptor {
+ class MessageNumberInterceptor extends AbstractPhaseInterceptor<Message> {
public MessageNumberInterceptor() {
super(Phase.USER_LOGICAL);
}
@@ -788,7 +788,7 @@
public void testUnknownSequence() throws Exception {
init("org/apache/cxf/systest/ws/rm/rminterceptors.xml");
- class SequenceIdInterceptor extends AbstractPhaseInterceptor {
+ class SequenceIdInterceptor extends AbstractPhaseInterceptor<Message> {
public SequenceIdInterceptor() {
super(Phase.USER_LOGICAL);
}
@@ -1236,8 +1236,8 @@
init("org/apache/cxf/systest/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;
@@ -1474,9 +1474,9 @@
mr.awaitMessages(nExpectedOut, nExpectedIn, timeout);
}
- private void removeRMInterceptors(List<Interceptor> interceptors) {
- for (Iterator<Interceptor> it = interceptors.iterator(); it.hasNext();) {
- Interceptor i = it.next();
+ private void removeRMInterceptors(List<Interceptor<? extends Message>> interceptors) {
+ for (Iterator<Interceptor<? extends Message>> it = interceptors.iterator(); it.hasNext();) {
+ Interceptor<? extends Message> i = it.next();
if (i instanceof RMSoapInterceptor
|| i instanceof RMOutInterceptor
|| i instanceof RMInInterceptor) {
Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/OutMessageRecorder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/OutMessageRecorder.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/OutMessageRecorder.java (original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/util/OutMessageRecorder.java Mon Nov 16 15:14:59 2009
@@ -41,7 +41,7 @@
/**
*
*/
-public class OutMessageRecorder extends AbstractPhaseInterceptor {
+public class OutMessageRecorder extends AbstractPhaseInterceptor<Message> {
private static final Logger LOG = LogUtils.getLogger(OutMessageRecorder.class);
private List<byte[]> outbound;
Modified: cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java (original)
+++ cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/ControlImpl.java Mon Nov 16 15:14:59 2009
@@ -37,6 +37,7 @@
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",
@@ -112,7 +113,7 @@
}
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: cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/FaultThrowingInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/FaultThrowingInterceptor.java?rev=880785&r1=880784&r2=880785&view=diff
==============================================================================
--- cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/FaultThrowingInterceptor.java (original)
+++ cxf/trunk/testutils/src/main/java/org/apache/cxf/greeter_control/FaultThrowingInterceptor.java Mon Nov 16 15:14:59 2009
@@ -32,7 +32,7 @@
/**
*
*/
-public class FaultThrowingInterceptor extends AbstractPhaseInterceptor {
+public class FaultThrowingInterceptor extends AbstractPhaseInterceptor<Message> {
public static final MessageFormat MESSAGE_FORMAT
= new MessageFormat("Interceptor fault in phase {0}.");