You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2010/07/08 11:19:35 UTC
svn commit: r961652 - in
/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc:
./ fault/ interceptors/ mtom/ provider/ ws/addressing/ ws/policy/ ws/rm/
ws/security/
Author: ffang
Date: Thu Jul 8 09:19:31 2010
New Revision: 961652
URL: http://svn.apache.org/viewvc?rev=961652&view=rev
Log:
[SMXCOMP-771] Upgrade to spring 3.x
Added:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSpringTestSupport.java
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBCConsumerAsynTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBCSESystemTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcConsumerExtraPrefixTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcDecoupledProviderTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcHttpJmsBridgeMtomTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJaxwsProviderTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsThrottleTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionWsdlConfigTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerMtomTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderMtomTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcRetrieveWsdlFromInternalEndpointTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSUClassloaderTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSchemaValidationTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSeOnewayTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSeRuntimeExceptionTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSeStFlowTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/fault/CxfBcFaultTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/interceptors/CxfBcInterceptorTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/mtom/CxfBCMtomJMSFlowTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/mtom/CxfBCMtomTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderAsyncSystemTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcProviderAddressingTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/policy/JBIServer.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBCRMTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBCSecurityTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcHttpsConsumerTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderConsumerMtomSecurityTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderHttpsTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/JAASServer.java
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBCConsumerAsynTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBCConsumerAsynTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBCConsumerAsynTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBCConsumerAsynTest.java Thu Jul 8 09:19:31 2010
@@ -30,11 +30,9 @@ import org.apache.cxf.interceptor.Loggin
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBCConsumerAsynTest extends SpringTestSupport {
+public class CxfBCConsumerAsynTest extends CxfBcSpringTestSupport {
private static final Logger LOG = LogUtils.getL7dLogger(CxfBCConsumerAsynTest.class);
public void setUp() throws Exception {
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBCSESystemTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBCSESystemTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBCSESystemTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBCSESystemTest.java Thu Jul 8 09:19:31 2010
@@ -33,11 +33,9 @@ import org.apache.cxf.interceptor.Loggin
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBCSESystemTest extends SpringTestSupport {
+public class CxfBCSESystemTest extends CxfBcSpringTestSupport {
private static final Logger LOG = LogUtils.getL7dLogger(CxfBCSESystemTest.class);
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcConsumerExtraPrefixTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcConsumerExtraPrefixTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcConsumerExtraPrefixTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcConsumerExtraPrefixTest.java Thu Jul 8 09:19:31 2010
@@ -27,12 +27,10 @@ import org.apache.cxf.calculator.Calcula
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.EndpointImpl;
-import org.apache.servicemix.tck.SpringTestSupport;
import org.apache.servicemix.util.FileUtil;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcConsumerExtraPrefixTest extends SpringTestSupport {
+public class CxfBcConsumerExtraPrefixTest extends CxfBcSpringTestSupport {
public void testBridge() throws Exception {
// start external service
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcDecoupledProviderTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcDecoupledProviderTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcDecoupledProviderTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcDecoupledProviderTest.java Thu Jul 8 09:19:31 2010
@@ -39,12 +39,10 @@ import org.apache.servicemix.client.Defa
import org.apache.servicemix.cxfse.CxfSeComponent;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcDecoupledProviderTest extends SpringTestSupport {
+public class CxfBcDecoupledProviderTest extends CxfBcSpringTestSupport {
private static final Logger LOG = LogUtils.getL7dLogger(org.apache.servicemix.cxfbc.CxfBcDecoupledProviderTest.class);
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcHttpJmsBridgeMtomTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcHttpJmsBridgeMtomTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcHttpJmsBridgeMtomTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcHttpJmsBridgeMtomTest.java Thu Jul 8 09:19:31 2010
@@ -47,11 +47,9 @@ import org.apache.cxf.service.factory.Re
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.testutil.common.ServerLauncher;
import org.apache.servicemix.cxfbc.mtom.TestMtomImpl;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcHttpJmsBridgeMtomTest extends SpringTestSupport {
+public class CxfBcHttpJmsBridgeMtomTest extends CxfBcSpringTestSupport {
public static final QName MTOM_PORT = new QName(
"http://cxf.apache.org/mime", "TestMtomPort");
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJaxwsProviderTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJaxwsProviderTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJaxwsProviderTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJaxwsProviderTest.java Thu Jul 8 09:19:31 2010
@@ -25,14 +25,12 @@ import org.apache.cxf.calculator.Calcula
import org.apache.cxf.calculator.CalculatorService;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
/*
* this test demostrate how the jaxws provider is invoked through cxf bc and cxf se
*/
-public class CxfBcJaxwsProviderTest extends SpringTestSupport {
+public class CxfBcJaxwsProviderTest extends CxfBcSpringTestSupport {
@Override
protected AbstractXmlApplicationContext createBeanFactory() {
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTest.java Thu Jul 8 09:19:31 2010
@@ -34,11 +34,9 @@ import org.apache.hello_world_soap_http.
import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcJmsTest extends SpringTestSupport {
+public class CxfBcJmsTest extends CxfBcSpringTestSupport {
protected static boolean serversStarted;
private ServerLauncher sl;
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsThrottleTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsThrottleTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsThrottleTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsThrottleTest.java Thu Jul 8 09:19:31 2010
@@ -33,11 +33,9 @@ import org.apache.hello_world_soap_http.
import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcJmsThrottleTest extends SpringTestSupport {
+public class CxfBcJmsThrottleTest extends CxfBcSpringTestSupport {
protected static boolean serversStarted;
private ServerLauncher sl;
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionTest.java Thu Jul 8 09:19:31 2010
@@ -34,15 +34,12 @@ import org.apache.hello_world_soap_http.
import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcJmsTransactionTest extends SpringTestSupport {
+public class CxfBcJmsTransactionTest extends CxfBcSpringTestSupport {
protected static boolean serversStarted;
private ServerLauncher sl;
- private ServerLauncher embeddedLauncher;
private ServerLauncher jmsLauncher;
@@ -61,7 +58,6 @@ public class CxfBcJmsTransactionTest ext
assertTrue("server did not launch correctly",
launchServer(EmbededJMSBrokerLauncher.class, props, true));
- embeddedLauncher = sl;
props = new HashMap<String, String>();
if (System.getProperty("javax.xml.transform.TransformerFactory") != null) {
props.put("javax.xml.transform.TransformerFactory", System.getProperty("javax.xml.transform.TransformerFactory"));
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionWsdlConfigTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionWsdlConfigTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionWsdlConfigTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcJmsTransactionWsdlConfigTest.java Thu Jul 8 09:19:31 2010
@@ -34,15 +34,12 @@ import org.apache.hello_world_soap_http.
import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcJmsTransactionWsdlConfigTest extends SpringTestSupport {
+public class CxfBcJmsTransactionWsdlConfigTest extends CxfBcSpringTestSupport {
protected static boolean serversStarted;
private ServerLauncher sl;
- private ServerLauncher embeddedLauncher;
private ServerLauncher jmsLauncher;
@@ -60,7 +57,6 @@ public class CxfBcJmsTransactionWsdlConf
assertTrue("server did not launch correctly",
launchServer(EmbededJMSBrokerLauncher.class, props, true));
- embeddedLauncher = sl;
props = new HashMap<String, String>();
if (System.getProperty("javax.xml.transform.TransformerFactory") != null) {
props.put("javax.xml.transform.TransformerFactory", System.getProperty("javax.xml.transform.TransformerFactory"));
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerMtomTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerMtomTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerMtomTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerMtomTest.java Thu Jul 8 09:19:31 2010
@@ -44,11 +44,9 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.servicemix.cxfbc.mtom.TestMtomImpl;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcProviderConsumerMtomTest extends SpringTestSupport {
+public class CxfBcProviderConsumerMtomTest extends CxfBcSpringTestSupport {
public static final QName MTOM_PORT = new QName(
"http://cxf.apache.org/mime", "TestMtomPort");
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderConsumerTest.java Thu Jul 8 09:19:31 2010
@@ -27,11 +27,9 @@ 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.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcProviderConsumerTest extends SpringTestSupport {
+public class CxfBcProviderConsumerTest extends CxfBcSpringTestSupport {
public void testBridge() throws Exception {
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderMtomTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderMtomTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderMtomTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderMtomTest.java Thu Jul 8 09:19:31 2010
@@ -37,12 +37,10 @@ import org.apache.servicemix.cxfbc.mtom.
import org.apache.servicemix.cxfse.CxfSeComponent;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcProviderMtomTest extends SpringTestSupport {
+public class CxfBcProviderMtomTest extends CxfBcSpringTestSupport {
private DefaultServiceMixClient client;
private InOut io;
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcProviderTest.java Thu Jul 8 09:19:31 2010
@@ -22,7 +22,6 @@ import java.util.logging.Logger;
import javax.jbi.messaging.InOut;
import javax.xml.namespace.QName;
-import javax.xml.ws.soap.SOAPBinding;
import org.apache.cxf.calculator.CalculatorImpl;
import org.apache.cxf.calculator.CalculatorPortType;
import org.apache.cxf.common.logging.LogUtils;
@@ -30,23 +29,19 @@ import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
-import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.apache.servicemix.client.DefaultServiceMixClient;
-import org.apache.servicemix.cxfbc.mtom.TestMtomImpl;
import org.apache.servicemix.cxfse.CxfSeComponent;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
import uri.helloworld.HelloPortType;
-public class CxfBcProviderTest extends SpringTestSupport {
+public class CxfBcProviderTest extends CxfBcSpringTestSupport {
private static final Logger LOG = LogUtils.getL7dLogger(org.apache.servicemix.cxfbc.CxfBcProviderTest.class);
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcRetrieveWsdlFromInternalEndpointTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcRetrieveWsdlFromInternalEndpointTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcRetrieveWsdlFromInternalEndpointTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcRetrieveWsdlFromInternalEndpointTest.java Thu Jul 8 09:19:31 2010
@@ -25,12 +25,10 @@ import org.apache.cxf.calculator.Calcula
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcRetrieveWsdlFromInternalEndpointTest extends SpringTestSupport {
+public class CxfBcRetrieveWsdlFromInternalEndpointTest extends CxfBcSpringTestSupport {
private CxfBcComponent component;
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSUClassloaderTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSUClassloaderTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSUClassloaderTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSUClassloaderTest.java Thu Jul 8 09:19:31 2010
@@ -28,11 +28,9 @@ import org.apache.cxf.common.logging.Log
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcSUClassloaderTest extends SpringTestSupport {
+public class CxfBcSUClassloaderTest extends CxfBcSpringTestSupport {
private static final Logger LOG = LogUtils.getL7dLogger(CxfBcSUClassloaderTest.class);
private CxfBcComponent component;
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSchemaValidationTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSchemaValidationTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSchemaValidationTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSchemaValidationTest.java Thu Jul 8 09:19:31 2010
@@ -24,12 +24,10 @@ import org.apache.hello_world_soap_http_
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcSchemaValidationTest extends SpringTestSupport {
+public class CxfBcSchemaValidationTest extends CxfBcSpringTestSupport {
private static final Logger LOG = LogUtils.getL7dLogger(CxfBcSchemaValidationTest.class);
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSeOnewayTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSeOnewayTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSeOnewayTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSeOnewayTest.java Thu Jul 8 09:19:31 2010
@@ -23,13 +23,11 @@ import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
-import org.apache.servicemix.tck.SpringTestSupport;
import org.apache.servicemix.util.FileUtil;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcSeOnewayTest extends SpringTestSupport {
+public class CxfBcSeOnewayTest extends CxfBcSpringTestSupport {
public void tearDown() throws Exception {
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSeRuntimeExceptionTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSeRuntimeExceptionTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSeRuntimeExceptionTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSeRuntimeExceptionTest.java Thu Jul 8 09:19:31 2010
@@ -24,12 +24,10 @@ import org.apache.hello_world_soap_http_
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcSeRuntimeExceptionTest extends SpringTestSupport {
+public class CxfBcSeRuntimeExceptionTest extends CxfBcSpringTestSupport {
private static final Logger LOG = LogUtils.getL7dLogger(CxfBcSchemaValidationTest.class);
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSeStFlowTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSeStFlowTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSeStFlowTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSeStFlowTest.java Thu Jul 8 09:19:31 2010
@@ -30,11 +30,9 @@ import org.apache.cxf.interceptor.Loggin
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcSeStFlowTest extends SpringTestSupport {
+public class CxfBcSeStFlowTest extends CxfBcSpringTestSupport {
private static final Logger LOG = LogUtils.getL7dLogger(CxfBcSeStFlowTest.class);
Added: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSpringTestSupport.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSpringTestSupport.java?rev=961652&view=auto
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSpringTestSupport.java (added)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/CxfBcSpringTestSupport.java Thu Jul 8 09:19:31 2010
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.servicemix.cxfbc;
+
+import java.util.List;
+
+import org.apache.servicemix.tck.SpringTestSupport;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+
+public abstract class CxfBcSpringTestSupport extends SpringTestSupport {
+
+ public static class ClassPathXmlApplicationContext extends org.apache.xbean.spring.context.ClassPathXmlApplicationContext {
+ public ClassPathXmlApplicationContext(String configLocation) throws BeansException {
+ super(new String[] { configLocation }, false);
+ setValidating(false);
+ refresh();
+ }
+
+ public ClassPathXmlApplicationContext(String[] configLocations, ApplicationContext parent, List xmlPreprocessors) throws BeansException {
+ super(configLocations, false, null, xmlPreprocessors);
+ setValidating(false);
+ refresh();
+ }
+ }
+}
+
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/fault/CxfBcFaultTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/fault/CxfBcFaultTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/fault/CxfBcFaultTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/fault/CxfBcFaultTest.java Thu Jul 8 09:19:31 2010
@@ -21,14 +21,13 @@ import java.net.URL;
import javax.xml.namespace.QName;
import javax.xml.ws.Holder;
+import org.apache.servicemix.cxfbc.CxfBcSpringTestSupport;
import org.apache.servicemix.samples.wsdl_first.Person;
import org.apache.servicemix.samples.wsdl_first.PersonService;
import org.apache.servicemix.samples.wsdl_first.UnknownPersonFault;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcFaultTest extends SpringTestSupport {
+public class CxfBcFaultTest extends CxfBcSpringTestSupport {
public void testFault() throws Exception {
QName serviceName = new QName("http://servicemix.apache.org/samples/wsdl-first",
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/interceptors/CxfBcInterceptorTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/interceptors/CxfBcInterceptorTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/interceptors/CxfBcInterceptorTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/interceptors/CxfBcInterceptorTest.java Thu Jul 8 09:19:31 2010
@@ -22,13 +22,12 @@ import java.util.logging.Logger;
import javax.xml.namespace.QName;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.servicemix.cxfbc.CxfBcSpringTestSupport;
import org.apache.servicemix.cxfbc.interceptors.types.quote.Quote;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcInterceptorTest extends SpringTestSupport {
+public class CxfBcInterceptorTest extends CxfBcSpringTestSupport {
static final Logger LOG = LogUtils.getL7dLogger(CxfBcInterceptorTest.class);
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/mtom/CxfBCMtomJMSFlowTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/mtom/CxfBCMtomJMSFlowTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/mtom/CxfBCMtomJMSFlowTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/mtom/CxfBCMtomJMSFlowTest.java Thu Jul 8 09:19:31 2010
@@ -45,12 +45,11 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.testutil.common.ServerLauncher;
+import org.apache.servicemix.cxfbc.CxfBcSpringTestSupport;
import org.apache.servicemix.cxfbc.EmbededJMSBrokerLauncher;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBCMtomJMSFlowTest extends SpringTestSupport {
+public class CxfBCMtomJMSFlowTest extends CxfBcSpringTestSupport {
public static final QName MTOM_PORT = new QName(
"http://cxf.apache.org/mime", "TestMtomPort");
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/mtom/CxfBCMtomTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/mtom/CxfBCMtomTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/mtom/CxfBCMtomTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/mtom/CxfBCMtomTest.java Thu Jul 8 09:19:31 2010
@@ -41,11 +41,10 @@ import org.apache.cxf.mime.TestMtom;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.servicemix.cxfbc.CxfBcSpringTestSupport;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBCMtomTest extends SpringTestSupport {
+public class CxfBCMtomTest extends CxfBcSpringTestSupport {
public static final QName MTOM_PORT = new QName(
"http://cxf.apache.org/mime", "TestMtomPort");
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderAsyncSystemTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderAsyncSystemTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderAsyncSystemTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderAsyncSystemTest.java Thu Jul 8 09:19:31 2010
@@ -30,13 +30,12 @@ import org.apache.cxf.common.logging.Log
import org.apache.cxf.testutil.common.ServerLauncher;
import org.apache.servicemix.client.DefaultServiceMixClient;
+import org.apache.servicemix.cxfbc.CxfBcSpringTestSupport;
import org.apache.servicemix.cxfbc.EmbededJMSBrokerLauncher;
import org.apache.servicemix.cxfbc.MyJMSServer;
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
/*
@@ -45,7 +44,7 @@ import org.springframework.context.suppo
* jbi container allocate only one thread to the cxf bc, and use a outgoing chain TimeCompareInterceptor to illustrate
* the second invocation send out before the first one returns, which means the noblock cxf bc provide works.
*/
-public class CxfBCSEProviderAsyncSystemTest extends SpringTestSupport {
+public class CxfBCSEProviderAsyncSystemTest extends CxfBcSpringTestSupport {
private static final Logger LOG = LogUtils.getL7dLogger(CxfBCSEProviderAsyncSystemTest.class);
private static boolean serversStarted;
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/provider/CxfBCSEProviderSystemTest.java Thu Jul 8 09:19:31 2010
@@ -30,16 +30,15 @@ import org.apache.cxf.testutil.common.Se
import org.apache.servicemix.JbiConstants;
import org.apache.servicemix.client.DefaultServiceMixClient;
+import org.apache.servicemix.cxfbc.CxfBcSpringTestSupport;
import org.apache.servicemix.cxfbc.EmbededJMSBrokerLauncher;
import org.apache.servicemix.cxfbc.MyJMSServer;
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBCSEProviderSystemTest extends SpringTestSupport {
+public class CxfBCSEProviderSystemTest extends CxfBcSpringTestSupport {
private static final Logger LOG = LogUtils.getL7dLogger(CxfBCSEProviderSystemTest.class);
private static boolean serversStarted;
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcAddressingTest.java Thu Jul 8 09:19:31 2010
@@ -45,15 +45,14 @@ import org.apache.hello_world_soap_http.
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
import org.apache.hello_world_soap_http.SOAPService;
+import org.apache.servicemix.cxfbc.CxfBcSpringTestSupport;
import org.apache.servicemix.cxfbc.interceptors.CxfJbiConstants;
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
import static org.apache.cxf.ws.addressing.JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES;
-public class CxfBcAddressingTest extends SpringTestSupport implements VerificationCache {
+public class CxfBcAddressingTest extends CxfBcSpringTestSupport implements VerificationCache {
static final String INBOUND_KEY = "inbound";
static final String OUTBOUND_KEY = "outbound";
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcProviderAddressingTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcProviderAddressingTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcProviderAddressingTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/addressing/CxfBcProviderAddressingTest.java Thu Jul 8 09:19:31 2010
@@ -23,14 +23,13 @@ import javax.xml.namespace.QName;
import org.apache.cxf.testutil.common.ServerLauncher;
import org.apache.servicemix.client.DefaultServiceMixClient;
+import org.apache.servicemix.cxfbc.CxfBcSpringTestSupport;
import org.apache.servicemix.cxfbc.provider.MyServer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcProviderAddressingTest extends SpringTestSupport {
+public class CxfBcProviderAddressingTest extends CxfBcSpringTestSupport {
private DefaultServiceMixClient client;
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/policy/JBIServer.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/policy/JBIServer.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/policy/JBIServer.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/policy/JBIServer.java Thu Jul 8 09:19:31 2010
@@ -17,8 +17,8 @@
package org.apache.servicemix.cxfbc.ws.policy;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.servicemix.cxfbc.CxfBcSpringTestSupport;
import org.apache.servicemix.jbi.container.SpringJBIContainer;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
public class JBIServer extends AbstractBusTestServerBase {
@@ -37,7 +37,7 @@ public class JBIServer extends AbstractB
protected AbstractXmlApplicationContext createBeanFactory() {
// load cxf se and bc from spring config file
- return new ClassPathXmlApplicationContext(
+ return new CxfBcSpringTestSupport.ClassPathXmlApplicationContext(
"org/apache/servicemix/cxfbc/ws/policy/xbean.xml");
}
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBCRMTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBCRMTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBCRMTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBCRMTest.java Thu Jul 8 09:19:31 2010
@@ -29,13 +29,12 @@ import org.apache.cxf.greeter_control.Gr
import org.apache.cxf.greeter_control.GreeterService;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.servicemix.cxfbc.CxfBcSpringTestSupport;
import org.apache.servicemix.cxfbc.ws.policy.ConnectionHelper;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.core.io.ClassPathResource;
-public class CxfBCRMTest extends SpringTestSupport {
+public class CxfBCRMTest extends CxfBcSpringTestSupport {
private static final Logger LOG = LogUtils.getL7dLogger(CxfBCRMTest.class);
private Bus bus;
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/rm/CxfBcRMSequenceTest.java Thu Jul 8 09:19:31 2010
@@ -55,16 +55,15 @@ import org.apache.cxf.ws.rm.RMManager;
import org.apache.cxf.ws.rm.RMOutInterceptor;
import org.apache.cxf.ws.rm.RMProperties;
import org.apache.cxf.ws.rm.soap.RMSoapInterceptor;
+import org.apache.servicemix.cxfbc.CxfBcSpringTestSupport;
import org.apache.servicemix.cxfbc.ws.policy.ConnectionHelper;
import org.apache.servicemix.jbi.container.SpringJBIContainer;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.apache.xbean.spring.context.SpringXmlPreprocessor;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.core.io.ClassPathResource;
-public class CxfBcRMSequenceTest extends SpringTestSupport {
+public class CxfBcRMSequenceTest extends CxfBcSpringTestSupport {
private static final Logger LOG = LogUtils.getL7dLogger(CxfBcRMSequenceTest.class);
private static final String GREETMEONEWAY_ACTION = "http://cxf.apache.org/greeter_control/Greeter/greetMeOneWayRequest";
private static final String GREETME_ACTION = "http://cxf.apache.org/greeter_control/Greeter/greetMeRequest";
@@ -1418,7 +1417,7 @@ public class CxfBcRMSequenceTest extends
List<SpringXmlPreprocessor> preList = new ArrayList<SpringXmlPreprocessor>();
preList.add(new BusCfgSetXmlPreprocessor(busCfgFile));
return new ClassPathXmlApplicationContext(new String[] {"org/apache/servicemix/cxfbc/ws/rm/sequence.xml"},
- true, null, preList);
+ null, preList);
}
@Override
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBCSecurityTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBCSecurityTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBCSecurityTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBCSecurityTest.java Thu Jul 8 09:19:31 2010
@@ -29,12 +29,11 @@ import org.apache.cxf.interceptor.Loggin
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.testutil.common.ServerLauncher;
import org.apache.hello_world_soap_http.Greeter;
+import org.apache.servicemix.cxfbc.CxfBcSpringTestSupport;
import org.apache.servicemix.cxfbc.EmbededJMSBrokerLauncher;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBCSecurityTest extends SpringTestSupport {
+public class CxfBCSecurityTest extends CxfBcSpringTestSupport {
protected static boolean serversStarted;
private static final Logger LOG = LogUtils.getL7dLogger(CxfBCSecurityTest.class);
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcHttpsConsumerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcHttpsConsumerTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcHttpsConsumerTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcHttpsConsumerTest.java Thu Jul 8 09:19:31 2010
@@ -27,11 +27,10 @@ import org.apache.cxf.interceptor.Loggin
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.servicemix.cxfbc.CxfBcComponent;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.servicemix.cxfbc.CxfBcSpringTestSupport;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcHttpsConsumerTest extends SpringTestSupport {
+public class CxfBcHttpsConsumerTest extends CxfBcSpringTestSupport {
private static final java.net.URL WSDL_LOC;
static {
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderConsumerMtomSecurityTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderConsumerMtomSecurityTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderConsumerMtomSecurityTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderConsumerMtomSecurityTest.java Thu Jul 8 09:19:31 2010
@@ -45,11 +45,10 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.testutil.common.ServerLauncher;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.servicemix.cxfbc.CxfBcSpringTestSupport;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcProviderConsumerMtomSecurityTest extends SpringTestSupport {
+public class CxfBcProviderConsumerMtomSecurityTest extends CxfBcSpringTestSupport {
//public class CxfBcProviderConsumerMtomTest extends TestCase {
public static final QName MTOM_PORT = new QName(
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderHttpsTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderHttpsTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderHttpsTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderHttpsTest.java Thu Jul 8 09:19:31 2010
@@ -27,14 +27,13 @@ import javax.xml.namespace.QName;
import org.apache.cxf.testutil.common.ServerLauncher;
import org.apache.servicemix.client.DefaultServiceMixClient;
+import org.apache.servicemix.cxfbc.CxfBcSpringTestSupport;
import org.apache.servicemix.cxfse.CxfSeComponent;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcProviderHttpsTest extends SpringTestSupport {
+public class CxfBcProviderHttpsTest extends CxfBcSpringTestSupport {
private DefaultServiceMixClient client;
private InOut io;
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/CxfBcProviderSecurityTest.java Thu Jul 8 09:19:31 2010
@@ -27,14 +27,13 @@ import javax.xml.namespace.QName;
import org.apache.cxf.testutil.common.ServerLauncher;
import org.apache.servicemix.client.DefaultServiceMixClient;
+import org.apache.servicemix.cxfbc.CxfBcSpringTestSupport;
import org.apache.servicemix.cxfse.CxfSeComponent;
import org.apache.servicemix.jbi.jaxp.SourceTransformer;
import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.tck.SpringTestSupport;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
-public class CxfBcProviderSecurityTest extends SpringTestSupport {
+public class CxfBcProviderSecurityTest extends CxfBcSpringTestSupport {
private DefaultServiceMixClient client;
private InOut io;
Modified: servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/JAASServer.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/JAASServer.java?rev=961652&r1=961651&r2=961652&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/JAASServer.java (original)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/src/test/java/org/apache/servicemix/cxfbc/ws/security/JAASServer.java Thu Jul 8 09:19:31 2010
@@ -17,8 +17,8 @@
package org.apache.servicemix.cxfbc.ws.security;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.servicemix.cxfbc.CxfBcSpringTestSupport;
import org.apache.servicemix.jbi.container.SpringJBIContainer;
-import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractXmlApplicationContext;
public class JAASServer extends AbstractBusTestServerBase {
@@ -33,7 +33,7 @@ public class JAASServer extends Abstract
protected AbstractXmlApplicationContext createBeanFactory() {
// load cxf se and bc from spring config file
- return new ClassPathXmlApplicationContext(
+ return new CxfBcSpringTestSupport.ClassPathXmlApplicationContext(
"org/apache/servicemix/cxfbc/ws/security/xbean-jaas.xml");
}