Modified: cxf/sandbox/oauth_1.0a/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java (original) +++ cxf/sandbox/oauth_1.0a/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ClientServerXmlBeansTest.java Tue Jul 27 20:46:55 2010 @@ -33,6 +33,7 @@ import org.apache.cxf.frontend.ClientPro import org.apache.cxf.interceptor.LoggingInInterceptor; import org.apache.cxf.interceptor.LoggingOutInterceptor; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; +import org.apache.cxf.testutil.common.TestUtil; import org.apache.helloWorldSoapHttp.xmlbeans.types.FaultDetailDocument; import org.apache.helloWorldSoapHttp.xmlbeans.types.FaultDetailDocument.FaultDetail; import org.apache.hello_world_soap_http.xmlbeans.GreetMeFault; @@ -45,9 +46,10 @@ import org.junit.Test; /** * */ -//@org.junit.Ignore("randomly fails on Hudson, but dkulp cannot reproduce yet") public class ClientServerXmlBeansTest extends AbstractBusClientServerTestBase { - + static final String WSDL_PORT = TestUtil.getPortNumber(Server.class); + static final String NOWSDL_PORT = TestUtil.getPortNumber(ServerNoWsdl.class); + private static final QName SERVICE_NAME = new QName("http://apache.org/hello_world_soap_http/xmlbeans";, "SOAPService"); @@ -68,6 +70,7 @@ public class ClientServerXmlBeansTest ex SOAPService ss = new SOAPService(wsdl, SERVICE_NAME); Greeter port = ss.getSoapPort(); + updateAddressPort(port, WSDL_PORT); String resp; ClientProxy.getClient(port).getInInterceptors().add(new LoggingInInterceptor()); ClientProxy.getClient(port).getOutInterceptors().add(new LoggingOutInterceptor()); @@ -115,7 +118,8 @@ public class ClientServerXmlBeansTest ex SOAPService ss = new SOAPService(wsdl, SERVICE_NAME); QName soapPort = new QName("http://apache.org/hello_world_soap_http/xmlbeans";, "SoapPort"); - ss.addPort(soapPort, SOAPBinding.SOAP11HTTP_BINDING, "http://localhost:9010/SoapContext/SoapPort";); + ss.addPort(soapPort, SOAPBinding.SOAP11HTTP_BINDING, "http://localhost:"; + + NOWSDL_PORT + "/SoapContext/SoapPort"); Greeter port = ss.getPort(soapPort, Greeter.class); String resp; ClientProxy.getClient(port).getInInterceptors().add(new LoggingInInterceptor());
Modified: cxf/sandbox/oauth_1.0a/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/Server.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/Server.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/Server.java (original) +++ cxf/sandbox/oauth_1.0a/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/Server.java Tue Jul 27 20:46:55 2010 @@ -26,8 +26,10 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; +import org.apache.cxf.testutil.common.TestUtil; public class Server extends AbstractBusTestServerBase { + static final String PORT = TestUtil.getPortNumber(Server.class); protected void run() { // set the configuration file @@ -35,10 +37,10 @@ public class Server extends AbstractBusT Bus bus = factory.createBus("org/apache/cxf/systest/xmlbeans/cxf.xml"); BusFactory.setDefaultBus(bus); setBus(bus); - Endpoint.publish("http://localhost:9000/SoapContext/SoapPort";, + Endpoint.publish("http://localhost:"; + PORT + "/SoapContext/SoapPort", new GreeterImpl()); - Endpoint.publish("http://localhost:9000/SOAPDocLitBareService/SoapPort";, + Endpoint.publish("http://localhost:"; + PORT + "/SOAPDocLitBareService/SoapPort", new PutLastTradePriceImpl()); } Modified: cxf/sandbox/oauth_1.0a/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ServerNoWsdl.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ServerNoWsdl.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ServerNoWsdl.java (original) +++ cxf/sandbox/oauth_1.0a/systests/databinding/src/test/java/org/apache/cxf/systest/xmlbeans/ServerNoWsdl.java Tue Jul 27 20:46:55 2010 @@ -26,8 +26,10 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; +import org.apache.cxf.testutil.common.TestUtil; public class ServerNoWsdl extends AbstractBusTestServerBase { + static final String PORT = TestUtil.getPortNumber(ServerNoWsdl.class); protected void run() { // set the configuration file @@ -36,11 +38,11 @@ public class ServerNoWsdl extends Abstra BusFactory.setDefaultBus(bus); setBus(bus); Object implementor = new GreeterImpl(); - String address = "http://localhost:9010/SoapContext/SoapPort";; + String address = "http://localhost:"; + PORT + "/SoapContext/SoapPort"; Endpoint.publish(address, implementor); implementor = new PutLastTradePriceImpl(); - Endpoint.publish("http://localhost:9010/SOAPDocLitBareService/SoapPort";, implementor); + Endpoint.publish("http://localhost:"; + PORT + "/SOAPDocLitBareService/SoapPort", implementor); } public static void main(String args[]) { Modified: cxf/sandbox/oauth_1.0a/systests/databinding/src/test/resources/aegisJaxWsBeans.xml URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/databinding/src/test/resources/aegisJaxWsBeans.xml?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/databinding/src/test/resources/aegisJaxWsBeans.xml (original) +++ cxf/sandbox/oauth_1.0a/systests/databinding/src/test/resources/aegisJaxWsBeans.xml Tue Jul 27 20:46:55 2010 @@ -37,7 +37,9 @@ http://cxf.apache.org/core http://cxf.ap <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" /> <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" /> - + + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> + <bean id="aegisBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding" scope="prototype" /> @@ -51,7 +53,7 @@ http://cxf.apache.org/core http://cxf.ap <bean id="impl" class="org.apache.cxf.systest.aegis.AegisJaxWsImpl" /> <jaxws:endpoint id="aegisRPCImpl" implementor="#impl" - address="http://localhost:9167/aegisJaxWs";> + address="http://localhost:${testutil.ports.AegisJaxWsTest}/aegisJaxWs";> <jaxws:serviceFactory> <ref bean='jaxws-and-aegis-service-factory' /> </jaxws:serviceFactory> @@ -66,7 +68,7 @@ http://cxf.apache.org/core http://cxf.ap class="org.apache.cxf.systest.aegis.ServerPasswordCallback"/> <jaxws:endpoint id="aegisRPCImplUN" implementor="#impl" - address="http://localhost:9167/aegisJaxWsUN";> + address="http://localhost:${testutil.ports.AegisJaxWsTest}/aegisJaxWsUN";> <jaxws:serviceFactory> <ref bean='jaxws-and-aegis-service-factory' /> </jaxws:serviceFactory> Modified: cxf/sandbox/oauth_1.0a/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml (original) +++ cxf/sandbox/oauth_1.0a/systests/databinding/src/test/resources/aegisSportsServiceBeans.xml Tue Jul 27 20:46:55 2010 @@ -37,10 +37,12 @@ http://cxf.apache.org/core http://cxf.ap <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" /> <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" /> + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> + <bean id="sportsImpl" class="org.apache.cxf.systest.aegis.SportsServiceImpl" /> - <simple:server id="sports-server" address="http://localhost:9002/sports"; + <simple:server id="sports-server" address="http://localhost:${testutil.ports.CharacterSchemaTest}/sports"; serviceClass="org.apache.cxf.systest.aegis.SportsService"> <simple:dataBinding> <bean Modified: cxf/sandbox/oauth_1.0a/systests/databinding/src/test/resources/extrajaxbclass.xml URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/databinding/src/test/resources/extrajaxbclass.xml?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/databinding/src/test/resources/extrajaxbclass.xml (original) +++ cxf/sandbox/oauth_1.0a/systests/databinding/src/test/resources/extrajaxbclass.xml Tue Jul 27 20:46:55 2010 @@ -33,9 +33,11 @@ under the License. <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" /> <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" /> + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <!-- Services --> - <jaxws:server id="testServer" serviceClass="org.apache.cxf.systest.jaxb.service.TestService" address="http://localhost:7081/service/TestService";> + <jaxws:server id="testServer" serviceClass="org.apache.cxf.systest.jaxb.service.TestService" + address="http://localhost:${testutil.ports.TestServiceTest}/service/TestService";> <jaxws:properties> <entry key="jaxb.additionalContextClasses"> @@ -58,7 +60,7 @@ under the License. <!-- Endpoint --> <jaxws:endpoint id="testEndpoint" implementor="org.apache.cxf.systest.jaxb.service.TestServiceImpl" - address="http://localhost:7081/service/TestEndpoint";> + address="http://localhost:${testutil.ports.TestServiceTest}/service/TestEndpoint";> <jaxws:properties> <entry key="jaxb.additionalContextClasses"> @@ -75,7 +77,7 @@ under the License. <!-- Client Proxy --> - <jaxws:client id="testClient" address="http://localhost:7081/service/TestService"; serviceClass="org.apache.cxf.systest.jaxb.service.TestService"> + <jaxws:client id="testClient" address="http://localhost:${testutil.ports.TestServiceTest}/service/TestService"; serviceClass="org.apache.cxf.systest.jaxb.service.TestService"> <jaxws:inInterceptors> <bean class="org.apache.cxf.interceptor.LoggingInInterceptor" /> </jaxws:inInterceptors> Modified: cxf/sandbox/oauth_1.0a/systests/databinding/src/test/resources/mtomTestBeans.xml URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/databinding/src/test/resources/mtomTestBeans.xml?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/databinding/src/test/resources/mtomTestBeans.xml (original) +++ cxf/sandbox/oauth_1.0a/systests/databinding/src/test/resources/mtomTestBeans.xml Tue Jul 27 20:46:55 2010 @@ -36,6 +36,8 @@ http://cxf.apache.org/core http://cxf.ap <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" /> <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" /> <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" /> + + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <cxf:bus> <cxf:features> @@ -46,7 +48,7 @@ http://cxf.apache.org/core http://cxf.ap <bean id="mtomImpl" class="org.apache.cxf.systest.aegis.mtom.fortest.MtomTestImpl" /> - <simple:server id="mtom-server" address="http://localhost:9002/mtom"; + <simple:server id="mtom-server" address="http://localhost:${testutil.ports.MtomTest}/mtom"; serviceClass="org.apache.cxf.systest.aegis.mtom.fortest.MtomTest"> <simple:dataBinding> <bean @@ -69,7 +71,7 @@ http://cxf.apache.org/core http://cxf.ap </simple:serviceFactory> </simple:server> - <simple:server id="mtom-xmime-server" address="http://localhost:9002/mtomXmime"; + <simple:server id="mtom-xmime-server" address="http://localhost:${testutil.ports.MtomTest}/mtomXmime"; serviceClass="org.apache.cxf.systest.aegis.mtom.fortest.MtomTest"> <simple:dataBinding> <bean Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/pom.xml URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/pom.xml?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/pom.xml (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/pom.xml Tue Jul 27 20:46:55 2010 @@ -67,21 +67,23 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> - <version>1.7.0</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> </dependency> <dependency> - <groupId>jetty</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1-6.0.2</version> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jsp-2.1</artifactId> + <version>${jetty.version}</version> </dependency> - <dependency> - <groupId>jetty</groupId> - <artifactId>jsp</artifactId> - <version>2.1-6.0.2</version> - </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> + <groupId>${servlet-api.group}</groupId> + <artifactId>${servlet-api.artifact}</artifactId> </dependency> <dependency> <groupId>org.apache.cxf</groupId> Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java Tue Jul 27 20:46:55 2010 @@ -23,27 +23,31 @@ import java.net.URISyntaxException; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.handler.DefaultHandler; -import org.mortbay.jetty.handler.HandlerCollection; -import org.mortbay.jetty.nio.SelectChannelConnector; -import org.mortbay.jetty.webapp.WebAppContext; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.handler.DefaultHandler; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.webapp.WebAppContext; public abstract class AbstractSpringServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(AbstractSpringServer.class); - private org.mortbay.jetty.Server server; + private org.eclipse.jetty.server.Server server; private String resourcePath; private String contextPath; private int port; protected AbstractSpringServer(String path) { - this(path, "/", 9080); + this(path, "/", Integer.parseInt(PORT)); } protected AbstractSpringServer(String path, int portNumber) { this(path, "/", portNumber); } + protected AbstractSpringServer(String path, String cPath) { + this(path, cPath, Integer.parseInt(PORT)); + } protected AbstractSpringServer(String path, String cPath, int portNumber) { resourcePath = path; @@ -54,7 +58,7 @@ public abstract class AbstractSpringServ protected void run() { System.out.println("Starting Server"); - server = new org.mortbay.jetty.Server(); + server = new org.eclipse.jetty.server.Server(); SelectChannelConnector connector = new SelectChannelConnector(); connector.setPort(port); Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java Tue Jul 27 20:46:55 2010 @@ -22,24 +22,24 @@ package org.apache.cxf.systest.jaxrs; import java.net.URISyntaxException; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.handler.DefaultHandler; -import org.mortbay.jetty.handler.HandlerCollection; -import org.mortbay.jetty.nio.SelectChannelConnector; -import org.mortbay.jetty.webapp.WebAppContext; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.handler.DefaultHandler; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.webapp.WebAppContext; public class AtomBookServer extends AbstractBusTestServerBase { - - private org.mortbay.jetty.Server server; + public static final String PORT = allocatePort(AtomBookServer.class); + private org.eclipse.jetty.server.Server server; protected void run() { System.out.println("Starting Server"); - server = new org.mortbay.jetty.Server(); + server = new org.eclipse.jetty.server.Server(); SelectChannelConnector connector = new SelectChannelConnector(); - connector.setPort(9080); + connector.setPort(Integer.parseInt(PORT)); server.setConnectors(new Connector[] {connector}); WebAppContext webappcontext = new WebAppContext(); Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Book.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Book.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Book.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/Book.java Tue Jul 27 20:46:55 2010 @@ -65,7 +65,14 @@ public class Book { @Produces("application/xml;charset=ISO-8859-1") public Chapter getChapter(@PathParam("chapterid")int chapterid) { return chapters.get(new Long(chapterid)); - } + } + + @GET + @Path("chapters/acceptencoding/{chapterid}/") + @Produces("application/xml") + public Chapter getChapterAcceptEncoding(@PathParam("chapterid")int chapterid) { + return chapters.get(new Long(chapterid)); + } @GET @Path("chapters/badencoding/{chapterid}/") Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationServer.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationServer.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationServer.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationServer.java Tue Jul 27 20:46:55 2010 @@ -24,13 +24,14 @@ import org.apache.cxf.jaxrs.lifecycle.Si import org.apache.cxf.testutil.common.AbstractBusTestServerBase; public class BookContinuationServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(BookContinuationServer.class); protected void run() { JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean(); sf.setResourceClasses(BookContinuationStore.class); sf.setResourceProvider(BookContinuationStore.class, new SingletonResourceProvider(new BookContinuationStore())); - sf.setAddress("http://localhost:9080/";); + sf.setAddress("http://localhost:"; + PORT + "/"); sf.create(); } Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java Tue Jul 27 20:46:55 2010 @@ -22,25 +22,26 @@ package org.apache.cxf.systest.jaxrs; import java.net.URISyntaxException; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.handler.DefaultHandler; -import org.mortbay.jetty.handler.HandlerCollection; -import org.mortbay.jetty.nio.SelectChannelConnector; -import org.mortbay.jetty.webapp.WebAppContext; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.handler.DefaultHandler; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.webapp.WebAppContext; public class BookDataBindingServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(BookDataBindingServer.class); - private org.mortbay.jetty.Server server; + private org.eclipse.jetty.server.Server server; protected void run() { System.out.println("Starting Server"); - server = new org.mortbay.jetty.Server(); + server = new org.eclipse.jetty.server.Server(); SelectChannelConnector connector = new SelectChannelConnector(); - connector.setPort(9080); + connector.setPort(Integer.parseInt(PORT)); server.setConnectors(new Connector[] {connector}); WebAppContext webappcontext = new WebAppContext(); Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer.java Tue Jul 27 20:46:55 2010 @@ -31,6 +31,7 @@ import org.apache.cxf.message.Message; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; public class BookServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(BookServer.class); protected void run() { JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean(); @@ -55,7 +56,7 @@ public class BookServer extends Abstract sf.setOutFaultInterceptors(outFaultInts); sf.setResourceProvider(BookStore.class, new SingletonResourceProvider(new BookStore(), true)); - sf.setAddress("http://localhost:9080/";); + sf.setAddress("http://localhost:"; + PORT + "/"); sf.create(); } Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java Tue Jul 27 20:46:55 2010 @@ -22,25 +22,26 @@ package org.apache.cxf.systest.jaxrs; import java.net.URISyntaxException; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.handler.DefaultHandler; -import org.mortbay.jetty.handler.HandlerCollection; -import org.mortbay.jetty.nio.SelectChannelConnector; -import org.mortbay.jetty.webapp.WebAppContext; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.handler.DefaultHandler; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.webapp.WebAppContext; public class BookServerProxySpring extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(BookServerProxySpring.class); - private org.mortbay.jetty.Server server; + private org.eclipse.jetty.server.Server server; protected void run() { System.out.println("Starting Server"); - server = new org.mortbay.jetty.Server(); + server = new org.eclipse.jetty.server.Server(); SelectChannelConnector connector = new SelectChannelConnector(); - connector.setPort(9080); + connector.setPort(Integer.parseInt(PORT)); server.setConnectors(new Connector[] {connector}); WebAppContext webappcontext = new WebAppContext(); Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java Tue Jul 27 20:46:55 2010 @@ -22,25 +22,26 @@ package org.apache.cxf.systest.jaxrs; import java.net.URISyntaxException; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.handler.DefaultHandler; -import org.mortbay.jetty.handler.HandlerCollection; -import org.mortbay.jetty.nio.SelectChannelConnector; -import org.mortbay.jetty.webapp.WebAppContext; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.handler.DefaultHandler; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.webapp.WebAppContext; public class BookServerRequestDispatch extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(BookServerRequestDispatch.class); - private org.mortbay.jetty.Server server; + private org.eclipse.jetty.server.Server server; protected void run() { System.out.println("Starting Server"); - server = new org.mortbay.jetty.Server(); + server = new org.eclipse.jetty.server.Server(); SelectChannelConnector connector = new SelectChannelConnector(); - connector.setPort(9080); + connector.setPort(Integer.parseInt(PORT)); server.setConnectors(new Connector[] {connector}); WebAppContext webappcontext = new WebAppContext(); Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedOutside.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedOutside.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedOutside.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedOutside.java Tue Jul 27 20:46:55 2010 @@ -23,19 +23,20 @@ import org.apache.cxf.jaxrs.JAXRSServerF import org.apache.cxf.testutil.common.AbstractBusTestServerBase; public class BookServerResourceCreatedOutside extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(BookServerResourceCreatedOutside.class); protected void run() { JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean(); BookStore bs = new BookStore(); sf.setServiceBeans(bs); - sf.setAddress("http://localhost:9080/";); - - sf.create(); + sf.setAddress("http://localhost:"; + PORT + "/"); + sf.create(); + } public static void main(String[] args) { try { - BookServer s = new BookServer(); + BookServerResourceCreatedOutside s = new BookServerResourceCreatedOutside(); s.start(); } catch (Exception ex) { ex.printStackTrace(); Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java Tue Jul 27 20:46:55 2010 @@ -22,25 +22,26 @@ package org.apache.cxf.systest.jaxrs; import java.net.URISyntaxException; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.handler.DefaultHandler; -import org.mortbay.jetty.handler.HandlerCollection; -import org.mortbay.jetty.nio.SelectChannelConnector; -import org.mortbay.jetty.webapp.WebAppContext; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.handler.DefaultHandler; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.webapp.WebAppContext; public class BookServerResourceCreatedSpring extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(BookServerResourceCreatedSpring.class); - private org.mortbay.jetty.Server server; + private org.eclipse.jetty.server.Server server; protected void run() { System.out.println("Starting Server"); - server = new org.mortbay.jetty.Server(); + server = new org.eclipse.jetty.server.Server(); SelectChannelConnector connector = new SelectChannelConnector(); - connector.setPort(9080); + connector.setPort(Integer.parseInt(PORT)); server.setConnectors(new Connector[] {connector}); WebAppContext webappcontext = new WebAppContext(); Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java Tue Jul 27 20:46:55 2010 @@ -22,25 +22,26 @@ package org.apache.cxf.systest.jaxrs; import java.net.URISyntaxException; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.handler.DefaultHandler; -import org.mortbay.jetty.handler.HandlerCollection; -import org.mortbay.jetty.nio.SelectChannelConnector; -import org.mortbay.jetty.webapp.WebAppContext; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.handler.DefaultHandler; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.webapp.WebAppContext; public class BookServerResourceCreatedSpringProviders extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(BookServerResourceCreatedSpringProviders.class); - private org.mortbay.jetty.Server server; + private org.eclipse.jetty.server.Server server; protected void run() { System.out.println("Starting Server"); - server = new org.mortbay.jetty.Server(); + server = new org.eclipse.jetty.server.Server(); SelectChannelConnector connector = new SelectChannelConnector(); - connector.setPort(9080); + connector.setPort(Integer.parseInt(PORT)); server.setConnectors(new Connector[] {connector}); WebAppContext webappcontext = new WebAppContext(); Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java Tue Jul 27 20:46:55 2010 @@ -22,25 +22,26 @@ package org.apache.cxf.systest.jaxrs; import java.net.URISyntaxException; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.handler.DefaultHandler; -import org.mortbay.jetty.handler.HandlerCollection; -import org.mortbay.jetty.nio.SelectChannelConnector; -import org.mortbay.jetty.webapp.WebAppContext; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.handler.DefaultHandler; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.webapp.WebAppContext; public class BookServerResourceJacksonSpringProviders extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(BookServerResourceJacksonSpringProviders.class); - private org.mortbay.jetty.Server server; + private org.eclipse.jetty.server.Server server; protected void run() { System.out.println("Starting Server"); - server = new org.mortbay.jetty.Server(); + server = new org.eclipse.jetty.server.Server(); SelectChannelConnector connector = new SelectChannelConnector(); - connector.setPort(9080); + connector.setPort(Integer.parseInt(PORT)); server.setConnectors(new Connector[] {connector}); WebAppContext webappcontext = new WebAppContext(); Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java Tue Jul 27 20:46:55 2010 @@ -22,25 +22,26 @@ package org.apache.cxf.systest.jaxrs; import java.net.URISyntaxException; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.handler.DefaultHandler; -import org.mortbay.jetty.handler.HandlerCollection; -import org.mortbay.jetty.nio.SelectChannelConnector; -import org.mortbay.jetty.webapp.WebAppContext; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.handler.DefaultHandler; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.webapp.WebAppContext; public class BookServerRestSoap extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(BookServerRestSoap.class); - private org.mortbay.jetty.Server server; + private org.eclipse.jetty.server.Server server; protected void run() { System.out.println("Starting Server"); - server = new org.mortbay.jetty.Server(); + server = new org.eclipse.jetty.server.Server(); SelectChannelConnector connector = new SelectChannelConnector(); - connector.setPort(9092); + connector.setPort(Integer.parseInt(PORT)); server.setConnectors(new Connector[] {connector}); WebAppContext webappcontext = new WebAppContext(); Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java Tue Jul 27 20:46:55 2010 @@ -22,25 +22,26 @@ package org.apache.cxf.systest.jaxrs; import java.net.URISyntaxException; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -import org.mortbay.jetty.Connector; -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.handler.DefaultHandler; -import org.mortbay.jetty.handler.HandlerCollection; -import org.mortbay.jetty.nio.SelectChannelConnector; -import org.mortbay.jetty.webapp.WebAppContext; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.handler.DefaultHandler; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.server.nio.SelectChannelConnector; +import org.eclipse.jetty.webapp.WebAppContext; public class BookServerSpring extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(BookServerSpring.class); - private org.mortbay.jetty.Server server; + private org.eclipse.jetty.server.Server server; protected void run() { System.out.println("Starting Server"); - server = new org.mortbay.jetty.Server(); + server = new org.eclipse.jetty.server.Server(); SelectChannelConnector connector = new SelectChannelConnector(); - connector.setPort(9080); + connector.setPort(Integer.parseInt(PORT)); server.setConnectors(new Connector[] {connector}); WebAppContext webappcontext = new WebAppContext(); Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java Tue Jul 27 20:46:55 2010 @@ -64,6 +64,7 @@ import javax.xml.bind.annotation.adapter import javax.xml.namespace.QName; import javax.xml.transform.dom.DOMSource; +import org.apache.cxf.annotations.GZIP; import org.apache.cxf.helpers.XMLUtils; import org.apache.cxf.jaxrs.ext.Oneway; import org.apache.cxf.jaxrs.ext.search.SearchCondition; @@ -71,6 +72,7 @@ import org.apache.cxf.jaxrs.ext.search.S import org.apache.cxf.phase.PhaseInterceptorChain; @Path("/bookstore") +...@gzip(threshold = 1) public class BookStore { private Map<Long, Book> books = new HashMap<Long, Book>(); @@ -422,6 +424,12 @@ public class BookStore { return new BookInfo(doGetBook("123")); } + @GET + @Path("/books/interface/adapter") + public BookInfoInterface getBookAdapter2() throws Exception { + return new BookInfo2(doGetBook("123")); + } + @PathParam("bookId") public void setBookId(String id) { currentBookId = id; @@ -530,7 +538,7 @@ public class BookStore { @Produces("application/xml") @Consumes("text/xml") public Book addBookCustomFailure(Book book, @Context HttpServletResponse response) { - response.setStatus(333); + response.setStatus(233); response.addHeader("CustomHeader", "CustomValue"); book.setId(888); return book; @@ -719,6 +727,13 @@ public class BookStore { cds.put(cd1.getId(), cd1); } + @XmlJavaTypeAdapter(BookInfoAdapter.class) + private static interface BookInfoInterface { + String getName(); + + long getId(); + } + static class BookInfo { private String name; private long id; @@ -751,6 +766,16 @@ public class BookStore { } } + static class BookInfo2 extends BookInfo implements BookInfoInterface { + public BookInfo2() { + + } + + public BookInfo2(Book b) { + super(b); + } + } + public static class BookInfoAdapter extends XmlAdapter<Book, BookInfo> { @Override Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java Tue Jul 27 20:46:55 2010 @@ -38,8 +38,11 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.UriInfo; +import org.apache.cxf.annotations.Logging; + @Path("/") @Produces("application/json") +...@logging public class BookStoreSpring { private Map<Long, Book> books = new HashMap<Long, Book>(); Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomOutFaultInterceptor.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomOutFaultInterceptor.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomOutFaultInterceptor.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/CustomOutFaultInterceptor.java Tue Jul 27 20:46:55 2010 @@ -48,8 +48,7 @@ public class CustomOutFaultInterceptor e if (ex == null) { throw new RuntimeException("Exception is expected"); } - Fault fault = (Fault)ex; - if (fault == null) { + if (!(ex instanceof Fault)) { throw new RuntimeException("Fault is expected"); } // deal with the actual exception : fault.getCause() Modified: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java?rev=979862&r1=979861&r2=979862&view=diff ============================================================================== --- cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java (original) +++ cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java Tue Jul 27 20:46:55 2010 @@ -43,7 +43,8 @@ import org.junit.BeforeClass; import org.junit.Test; public class JAXRSAtomBookTest extends AbstractBusClientServerTestBase { - + public static final String PORT = AtomBookServer.PORT; + private Abdera abdera = new Abdera(); @BeforeClass @@ -55,17 +56,17 @@ public class JAXRSAtomBookTest extends A @Test public void testGetBooks() throws Exception { String endpointAddress = - "http://localhost:9080/bookstore/bookstore/books/feed";; + "http://localhost:"; + PORT + "/bookstore/bookstore/books/feed"; Feed feed = getFeed(endpointAddress, null); - assertEquals("http://localhost:9080/bookstore/bookstore/books/feed";, + assertEquals("http://localhost:"; + PORT + "/bookstore/bookstore/books/feed", feed.getBaseUri().toString()); assertEquals("Collection of Books", feed.getTitle()); - getAndCompareJson("http://localhost:9080/bookstore/bookstore/books/feed";, + getAndCompareJson("http://localhost:"; + PORT + "/bookstore/bookstore/books/feed", "resources/expected_atom_books_json.txt", "application/json"); - getAndCompareJson("http://localhost:9080/bookstore/bookstore/books/jsonfeed";, + getAndCompareJson("http://localhost:"; + PORT + "/bookstore/bookstore/books/jsonfeed", "resources/expected_atom_books_jsonfeed.txt", "application/json, text/html, application/xml;q=0.9," + " application/xhtml+xml, image/png, image/jpeg, image/gif," @@ -75,25 +76,25 @@ public class JAXRSAtomBookTest extends A entry = addEntry(endpointAddress + "/relative"); endpointAddress = - "http://localhost:9080/bookstore/bookstore/books/subresources/123";; + "http://localhost:"; + PORT + "/bookstore/bookstore/books/subresources/123"; entry = getEntry(endpointAddress, null); assertEquals("CXF in Action", entry.getTitle()); - getAndCompareJson("http://localhost:9080/bookstore/bookstore/books/entries/123";, + getAndCompareJson("http://localhost:"; + PORT + "/bookstore/bookstore/books/entries/123", "resources/expected_atom_book_json.txt", "application/json"); - getAndCompareJson("http://localhost:9080/bookstore/bookstore/books/entries/123?_type="; + getAndCompareJson("http://localhost:"; + PORT + "/bookstore/bookstore/books/entries/123?_type=" + "application/json", "resources/expected_atom_book_json.txt", "*/*"); - getAndCompareJson("http://localhost:9080/bookstore/bookstore/books/entries/123?_type="; + getAndCompareJson("http://localhost:"; + PORT + "/bookstore/bookstore/books/entries/123?_type=" + "json", "resources/expected_atom_book_json.txt", "*/*"); // do the same using extension mappings - getAndCompareJson("http://localhost:9080/bookstore/bookstore/books/entries/123.json";, + getAndCompareJson("http://localhost:"; + PORT + "/bookstore/bookstore/books/entries/123.json", "resources/expected_atom_book_json.txt", "*/*"); @@ -131,20 +132,20 @@ public class JAXRSAtomBookTest extends A @Test public void testGetBooks2() throws Exception { String endpointAddress = - "http://localhost:9080/bookstore/sub/";; + "http://localhost:"; + PORT + "/bookstore/sub/"; Feed feed = getFeed(endpointAddress, null); - assertEquals("http://localhost:9080/bookstore/sub/";, + assertEquals("http://localhost:"; + PORT + "/bookstore/sub/", feed.getBaseUri().toString()); assertEquals("Collection of Books", feed.getTitle()); - getAndCompareJson("http://localhost:9080/bookstore/sub/books/entries/123.json";, + getAndCompareJson("http://localhost:"; + PORT + "/bookstore/sub/books/entries/123.json", "resources/expected_atom_book_json2.txt", "*/*"); } @Test public void testGetBooks3() throws Exception { - getAndCompareJson("http://localhost:9080/atom/atom/books/entries/123.json";, + getAndCompareJson("http://localhost:"; + PORT + "/atom/atom/books/entries/123.json", "resources/expected_atom_book_json3.txt", "*/*"); } @@ -152,9 +153,9 @@ public class JAXRSAtomBookTest extends A @Test public void testGetBooksWithCustomProvider() throws Exception { String endpointAddress = - "http://localhost:9080/bookstore/bookstore4/books/feed";; + "http://localhost:"; + PORT + "/bookstore/bookstore4/books/feed"; Feed feed = getFeed(endpointAddress, null); - assertEquals("http://localhost:9080/bookstore/bookstore4/books/feed";, + assertEquals("http://localhost:"; + PORT + "/bookstore/bookstore4/books/feed", feed.getBaseUri().toString()); assertEquals("Collection of Books", feed.getTitle()); } @@ -171,6 +172,7 @@ public class JAXRSAtomBookTest extends A String jsonContent = getStringFromInputStream(get.getResponseBodyAsStream()); String expected = getStringFromInputStream( getClass().getResourceAsStream(resourcePath)); + expected = expected.replaceAll("9080", PORT); JSONObject obj1 = new JSONObject(jsonContent); JSONObject obj2 = new JSONObject(expected); Propchange: cxf/sandbox/oauth_1.0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java ('svn:mergeinfo' removed)
