You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/05/22 23:20:46 UTC
svn commit: r1341635 - in /cxf/branches/2.5.x-fixes: ./
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/ systests...
Author: dkulp
Date: Tue May 22 21:20:44 2012
New Revision: 1341635
URL: http://svn.apache.org/viewvc?rev=1341635&view=rev
Log:
Merged revisions 1338376 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1338376 | dkulp | 2012-05-14 16:09:59 -0400 (Mon, 14 May 2012) | 2 lines
Start cleaning up some of the JAXRS tests to progress toward forkmode
once
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookNonSpringServer.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringBookTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSContinuationsTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushSpringTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultithreadedClientTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSOverlappingDestinationsTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/SimpleLoggingAspect.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/BookStoreSoapRestImpl.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerJaasSecurity.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringClass.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringInterface.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringNoAnnotations.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSimpleSecurity.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSimpleSecurityTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityClassTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityInterfaceTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityNoAnnotationsTest.java
cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/resources/jaxrs_logging_atompush/WEB-INF/beans.xml
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java Tue May 22 21:20:44 2012
@@ -30,24 +30,16 @@ import org.eclipse.jetty.server.nio.Sele
import org.eclipse.jetty.webapp.WebAppContext;
public abstract class AbstractSpringServer extends AbstractBusTestServerBase {
- public static final String PORT = allocatePort(AbstractSpringServer.class);
private org.eclipse.jetty.server.Server server;
private String resourcePath;
private String contextPath;
private int port;
- protected AbstractSpringServer(String path) {
- 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;
contextPath = cPath;
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java Tue May 22 21:20:44 2012
@@ -36,8 +36,6 @@ public class BookDataBindingServer exten
private org.eclipse.jetty.server.Server server;
protected void run() {
- System.out.println("Starting Server");
-
server = new org.eclipse.jetty.server.Server();
SelectChannelConnector connector = new SelectChannelConnector();
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookNonSpringServer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookNonSpringServer.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookNonSpringServer.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookNonSpringServer.java Tue May 22 21:20:44 2012
@@ -23,9 +23,10 @@ package org.apache.cxf.systest.jaxrs;
public class BookNonSpringServer extends AbstractSpringServer {
+ public static final int PORT = allocatePortAsInt(BookNonSpringServer.class);
public BookNonSpringServer() {
- super("/jaxrs_non_spring");
+ super("/jaxrs_non_spring", PORT);
}
public static void main(String args[]) {
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java Tue May 22 21:20:44 2012
@@ -36,8 +36,6 @@ public class BookServerProxySpring exten
private org.eclipse.jetty.server.Server server;
protected void run() {
- System.out.println("Starting Server");
-
server = new org.eclipse.jetty.server.Server();
SelectChannelConnector connector = new SelectChannelConnector();
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java Tue May 22 21:20:44 2012
@@ -36,8 +36,6 @@ public class BookServerRequestDispatch e
private org.eclipse.jetty.server.Server server;
protected void run() {
- System.out.println("Starting Server");
-
server = new org.eclipse.jetty.server.Server();
SelectChannelConnector connector = new SelectChannelConnector();
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java Tue May 22 21:20:44 2012
@@ -36,8 +36,6 @@ public class BookServerResourceCreatedSp
private org.eclipse.jetty.server.Server server;
protected void run() {
- System.out.println("Starting Server");
-
server = new org.eclipse.jetty.server.Server();
SelectChannelConnector connector = new SelectChannelConnector();
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java Tue May 22 21:20:44 2012
@@ -36,8 +36,6 @@ public class BookServerResourceCreatedSp
private org.eclipse.jetty.server.Server server;
protected void run() {
- System.out.println("Starting Server");
-
server = new org.eclipse.jetty.server.Server();
SelectChannelConnector connector = new SelectChannelConnector();
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java Tue May 22 21:20:44 2012
@@ -36,8 +36,6 @@ public class BookServerResourceJacksonSp
private org.eclipse.jetty.server.Server server;
protected void run() {
- System.out.println("Starting Server");
-
server = new org.eclipse.jetty.server.Server();
SelectChannelConnector connector = new SelectChannelConnector();
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java Tue May 22 21:20:44 2012
@@ -36,8 +36,6 @@ public class BookServerRestSoap extends
private org.eclipse.jetty.server.Server server;
protected void run() {
- System.out.println("Starting Server");
-
server = new org.eclipse.jetty.server.Server();
SelectChannelConnector connector = new SelectChannelConnector();
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java Tue May 22 21:20:44 2012
@@ -36,8 +36,6 @@ public class BookServerSpring extends Ab
private org.eclipse.jetty.server.Server server;
protected void run() {
- System.out.println("Starting Server");
-
server = new org.eclipse.jetty.server.Server();
SelectChannelConnector connector = new SelectChannelConnector();
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java Tue May 22 21:20:44 2012
@@ -74,7 +74,6 @@ import javax.xml.transform.dom.DOMSource
import org.apache.cxf.annotations.GZIP;
import org.apache.cxf.common.util.ProxyHelper;
-import org.apache.cxf.helpers.XMLUtils;
import org.apache.cxf.jaxrs.ext.Nullable;
import org.apache.cxf.jaxrs.ext.Oneway;
import org.apache.cxf.jaxrs.ext.search.SearchCondition;
@@ -852,7 +851,7 @@ public class BookStore {
@PUT
@Path("/bookswithdom/")
public DOMSource updateBook(DOMSource ds) {
- XMLUtils.printDOM(ds.getNode());
+ //XMLUtils.printDOM(ds.getNode());
return ds;
}
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreSpring.java Tue May 22 21:20:44 2012
@@ -60,7 +60,7 @@ public class BookStoreSpring {
public BookStoreSpring() {
init();
- System.out.println("----books: " + books.size());
+ //System.out.println("----books: " + books.size());
}
@@ -71,7 +71,7 @@ public class BookStoreSpring {
@PreDestroy
public void preDestroy() {
- System.out.println("PreDestroy called");
+ //System.out.println("PreDestroy called");
}
@GET
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAtomBookTest.java Tue May 22 21:20:44 2012
@@ -51,6 +51,7 @@ public class JAXRSAtomBookTest extends A
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
launchServer(AtomBookServer.class, true));
+ createStaticBus();
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java Tue May 22 21:20:44 2012
@@ -66,11 +66,12 @@ import org.junit.Test;
public class JAXRSClientServerBookTest extends AbstractBusClientServerTestBase {
public static final String PORT = BookServer.PORT;
public static final String PORT2 = allocatePort(JAXRSClientServerBookTest.class);
-
+
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
launchServer(BookServer.class, true));
+ createStaticBus();
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java Tue May 22 21:20:44 2012
@@ -38,12 +38,13 @@ import org.junit.BeforeClass;
import org.junit.Test;
public class JAXRSClientServerNonSpringBookTest extends AbstractBusClientServerTestBase {
- public static final String PORT = BookNonSpringServer.PORT;
+ public static final int PORT = BookNonSpringServer.PORT;
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
launchServer(BookNonSpringServer.class, true));
+ createStaticBus();
}
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerProxySpringBookTest.java Tue May 22 21:20:44 2012
@@ -38,7 +38,8 @@ public class JAXRSClientServerProxySprin
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookServerProxySpring.class));
+ launchServer(BookServerProxySpring.class, true));
+ createStaticBus();
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedOutsideBookTest.java Tue May 22 21:20:44 2012
@@ -39,7 +39,8 @@ public class JAXRSClientServerResourceCr
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookServerResourceCreatedOutside.class));
+ launchServer(BookServerResourceCreatedOutside.class, true));
+ createStaticBus();
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringBookTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringBookTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringBookTest.java Tue May 22 21:20:44 2012
@@ -37,6 +37,7 @@ public class JAXRSClientServerResourceCr
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
launchServer(BookServerResourceCreatedSpring.class, true));
+ createStaticBus();
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceCreatedSpringProviderTest.java Tue May 22 21:20:44 2012
@@ -64,7 +64,8 @@ public class JAXRSClientServerResourceCr
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookServerResourceCreatedSpringProviders.class));
+ launchServer(BookServerResourceCreatedSpringProviders.class, true));
+ createStaticBus();
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java Tue May 22 21:20:44 2012
@@ -38,7 +38,7 @@ public class JAXRSClientServerResourceJa
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookServerResourceJacksonSpringProviders.class));
+ launchServer(BookServerResourceJacksonSpringProviders.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java Tue May 22 21:20:44 2012
@@ -65,7 +65,7 @@ public class JAXRSClientServerSpringBook
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookServerSpring.class));
+ launchServer(BookServerSpring.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java Tue May 22 21:20:44 2012
@@ -96,6 +96,7 @@ public class JAXRSClientServerStreamingT
@BeforeClass
public static void startServers() throws Exception {
+ //keep out of process due to stack traces testing failures
assertTrue("server did not launch correctly",
launchServer(Server.class));
}
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java Tue May 22 21:20:44 2012
@@ -104,7 +104,7 @@ public class JAXRSClientServerUserResour
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(Server.class));
+ launchServer(Server.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSContinuationsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSContinuationsTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSContinuationsTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSContinuationsTest.java Tue May 22 21:20:44 2012
@@ -40,7 +40,7 @@ public class JAXRSContinuationsTest exte
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookContinuationServer.class));
+ launchServer(BookContinuationServer.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java Tue May 22 21:20:44 2012
@@ -47,7 +47,7 @@ public class JAXRSDataBindingTest extend
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookDataBindingServer.class));
+ launchServer(BookDataBindingServer.class, true));
}
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java Tue May 22 21:20:44 2012
@@ -54,7 +54,7 @@ import org.junit.Ignore;
import org.junit.Test;
public class JAXRSLoggingAtomPullSpringTest extends AbstractClientServerTestBase {
- public static final String PORT = SpringServer.PORT;
+ public static final int PORT = SpringServer.PORT;
private static JAXBContext context;
private int fakyLogger;
@@ -86,8 +86,9 @@ public class JAXRSLoggingAtomPullSpringT
@Ignore
public static class SpringServer extends AbstractSpringServer {
+ public static final int PORT = allocatePortAsInt(SpringServer.class);
public SpringServer() {
- super("/jaxrs_logging_atompull");
+ super("/jaxrs_logging_atompull", PORT);
}
}
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushSpringTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushSpringTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushSpringTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushSpringTest.java Tue May 22 21:20:44 2012
@@ -46,7 +46,7 @@ import org.junit.Ignore;
import org.junit.Test;
public class JAXRSLoggingAtomPushSpringTest extends AbstractClientServerTestBase {
- public static final String PORT = SpringServer.PORT;
+ public static final int PORT = SpringServer.PORT;
private JAXBContext context;
private int fakyLogger;
@@ -63,8 +63,9 @@ public class JAXRSLoggingAtomPushSpringT
@Ignore
public static class SpringServer extends AbstractSpringServer {
+ public static final int PORT = allocatePortAsInt(SpringServer.class);
public SpringServer() {
- super("/jaxrs_logging_atompush");
+ super("/jaxrs_logging_atompush", PORT);
}
}
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultithreadedClientTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultithreadedClientTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultithreadedClientTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultithreadedClientTest.java Tue May 22 21:20:44 2012
@@ -46,7 +46,7 @@ public class JAXRSMultithreadedClientTes
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookServer.class));
+ launchServer(BookServer.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSOverlappingDestinationsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSOverlappingDestinationsTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSOverlappingDestinationsTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSOverlappingDestinationsTest.java Tue May 22 21:20:44 2012
@@ -39,7 +39,7 @@ import org.junit.Ignore;
import org.junit.Test;
public class JAXRSOverlappingDestinationsTest extends AbstractBusClientServerTestBase {
- public static final String PORT = SpringServer.PORT;
+ public static final int PORT = SpringServer.PORT;
@BeforeClass
public static void startServers() throws Exception {
@@ -126,10 +126,10 @@ public class JAXRSOverlappingDestination
@Ignore
public static class SpringServer extends AbstractSpringServer {
- public static final String PORT = AbstractSpringServer.PORT;
+ public static final int PORT = allocatePortAsInt(SpringServer.class);
public SpringServer() {
- super("/jaxrs_many_destinations");
+ super("/jaxrs_many_destinations", PORT);
}
}
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java Tue May 22 21:20:44 2012
@@ -36,7 +36,7 @@ public class JAXRSRequestDispatcherTest
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookServerRequestDispatch.class));
+ launchServer(BookServerRequestDispatch.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java Tue May 22 21:20:44 2012
@@ -33,7 +33,7 @@ import org.junit.Ignore;
import org.junit.Test;
public class JAXRSUriInfoTest extends AbstractClientServerTestBase {
- public static final String PORT = SpringServer.PORT;
+ public static final int PORT = SpringServer.PORT;
@BeforeClass
public static void beforeClass() throws Exception {
// must be 'in-process' to communicate with inner class in single JVM
@@ -43,8 +43,9 @@ public class JAXRSUriInfoTest extends Ab
@Ignore
public static class SpringServer extends AbstractSpringServer {
+ public static final int PORT = allocatePortAsInt(SpringServer.class);
public SpringServer() {
- super("/jaxrs_uriinfo", "/app");
+ super("/jaxrs_uriinfo", "/app", PORT);
}
}
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/SimpleLoggingAspect.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/SimpleLoggingAspect.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/SimpleLoggingAspect.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/SimpleLoggingAspect.java Tue May 22 21:20:44 2012
@@ -19,14 +19,18 @@
package org.apache.cxf.systest.jaxrs;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
public class SimpleLoggingAspect {
+ PrintWriter writer = new PrintWriter(new StringWriter());
public void logBefore() {
- System.out.println("AOP in before action");
+ writer.println("AOP in before action");
}
public void logAfter() {
- System.out.println("AOP in after action");
+ writer.println("AOP in after action");
}
}
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java Tue May 22 21:20:44 2012
@@ -57,7 +57,7 @@ import org.junit.Test;
*
*/
public class CrossOriginSimpleTest extends AbstractBusClientServerTestBase {
- public static final String PORT = SpringServer.PORT;
+ public static final int PORT = SpringServer.PORT;
private WebClient configClient;
@BeforeClass
@@ -404,10 +404,10 @@ public class CrossOriginSimpleTest exten
@Ignore
public static class SpringServer extends AbstractSpringServer {
- public static final String PORT = AbstractSpringServer.PORT;
+ public static final int PORT = allocatePortAsInt(SpringServer.class);
public SpringServer() {
- super("/jaxrs_cors");
+ super("/jaxrs_cors", PORT);
}
}
}
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/BookStoreSoapRestImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/BookStoreSoapRestImpl.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/BookStoreSoapRestImpl.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/jaxws/BookStoreSoapRestImpl.java Tue May 22 21:20:44 2012
@@ -26,13 +26,11 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.jws.WebMethod;
-import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
-import javax.xml.ws.WebServiceContext;
import org.apache.cxf.annotations.SchemaValidation;
import org.apache.cxf.jaxrs.client.WebClient;
@@ -49,8 +47,6 @@ public class BookStoreSoapRestImpl imple
private Map<Long, Book> books = new HashMap<Long, Book>();
private boolean ignoreJaxrsClient;
@Resource
- private WebServiceContext jaxwsContext;
- @Resource
private MessageContext jaxrsContext;
@Resource(name = "restClient")
@@ -114,7 +110,6 @@ public class BookStoreSoapRestImpl imple
return webClient.getBook(id);
}
invocationInProcess = false;
- System.out.println(getContentType());
}
@@ -134,17 +129,6 @@ public class BookStoreSoapRestImpl imple
books.put(book.getId(), book);
}
- private String getContentType() {
-
- // TODO : it may be worth indeed to introduce a shared ServiceContext
- // such that users combining JAXWS and JAXRS won't have to write if/else code
- HttpServletRequest request = jaxrsContext.getHttpServletRequest();
- if (request == null) {
- request = (HttpServletRequest)jaxwsContext.getMessageContext().get(
- javax.xml.ws.handler.MessageContext.SERVLET_REQUEST);
- }
- return request.getContentType();
- }
@WebMethod(exclude = true)
public BookSubresource getBookSubresource(String id) {
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerJaasSecurity.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerJaasSecurity.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerJaasSecurity.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerJaasSecurity.java Tue May 22 21:20:44 2012
@@ -24,13 +24,14 @@ import org.apache.cxf.systest.jaxrs.Abst
public class BookServerJaasSecurity extends AbstractSpringServer {
+ public static final int PORT = allocatePortAsInt(BookServerJaasSecurity.class);
public BookServerJaasSecurity() {
- super("/jaxrs_jaas_security");
+ super("/jaxrs_jaas_security", PORT);
}
public BookServerJaasSecurity(String[] args) {
- super("/jaxrs_jaas_security");
+ super("/jaxrs_jaas_security", PORT);
}
public static void main(String args[]) {
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringClass.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringClass.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringClass.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringClass.java Tue May 22 21:20:44 2012
@@ -24,9 +24,10 @@ import org.apache.cxf.systest.jaxrs.Abst
public class BookServerSecuritySpringClass extends AbstractSpringServer {
+ public static final int PORT = allocatePortAsInt(BookServerSecuritySpringClass.class);
public BookServerSecuritySpringClass() {
- super("/jaxrs_security_cglib");
+ super("/jaxrs_security_cglib", PORT);
}
public static void main(String args[]) {
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringInterface.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringInterface.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringInterface.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringInterface.java Tue May 22 21:20:44 2012
@@ -23,9 +23,10 @@ import org.apache.cxf.systest.jaxrs.Abst
public class BookServerSecuritySpringInterface extends AbstractSpringServer {
+ public static final int PORT = allocatePortAsInt(BookServerSecuritySpringInterface.class);
public BookServerSecuritySpringInterface() {
- super("/jaxrs_security");
+ super("/jaxrs_security", PORT);
}
public static void main(String args[]) {
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringNoAnnotations.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringNoAnnotations.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringNoAnnotations.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringNoAnnotations.java Tue May 22 21:20:44 2012
@@ -24,9 +24,10 @@ import org.apache.cxf.systest.jaxrs.Abst
public class BookServerSecuritySpringNoAnnotations extends AbstractSpringServer {
+ public static final int PORT = allocatePortAsInt(BookServerSecuritySpringNoAnnotations.class);
public BookServerSecuritySpringNoAnnotations() {
- super("/jaxrs_security_no_annotations");
+ super("/jaxrs_security_no_annotations", PORT);
}
public static void main(String args[]) {
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSimpleSecurity.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSimpleSecurity.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSimpleSecurity.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSimpleSecurity.java Tue May 22 21:20:44 2012
@@ -28,9 +28,10 @@ import org.eclipse.jetty.security.LoginS
public class BookServerSimpleSecurity extends AbstractSpringServer {
+ public static final int PORT = allocatePortAsInt(BookServerSimpleSecurity.class);
public BookServerSimpleSecurity() {
- super("/jaxrs_simple_security");
+ super("/jaxrs_simple_security", PORT);
}
@Override
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java Tue May 22 21:20:44 2012
@@ -48,7 +48,7 @@ public class JAXRSHttpsBookTest extends
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookHttpsServer.class));
+ launchServer(BookHttpsServer.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSJaasSecurityTest.java Tue May 22 21:20:44 2012
@@ -30,7 +30,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
public class JAXRSJaasSecurityTest extends AbstractSpringSecurityTest {
- public static final String PORT = BookServerJaasSecurity.PORT;
+ public static final int PORT = BookServerJaasSecurity.PORT;
@BeforeClass
public static void startServers() throws Exception {
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSimpleSecurityTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSimpleSecurityTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSimpleSecurityTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSimpleSecurityTest.java Tue May 22 21:20:44 2012
@@ -23,7 +23,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
public class JAXRSSimpleSecurityTest extends AbstractSpringSecurityTest {
- public static final String PORT = BookServerSimpleSecurity.PORT;
+ public static final int PORT = BookServerSimpleSecurity.PORT;
@BeforeClass
public static void startServers() throws Exception {
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityClassTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityClassTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityClassTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityClassTest.java Tue May 22 21:20:44 2012
@@ -33,12 +33,12 @@ import org.junit.BeforeClass;
import org.junit.Test;
public class JAXRSSpringSecurityClassTest extends AbstractSpringSecurityTest {
- public static final String PORT = BookServerSecuritySpringClass.PORT;
+ public static final int PORT = BookServerSecuritySpringClass.PORT;
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookServerSecuritySpringClass.class));
+ launchServer(BookServerSecuritySpringClass.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityInterfaceTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityInterfaceTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityInterfaceTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityInterfaceTest.java Tue May 22 21:20:44 2012
@@ -30,7 +30,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
public class JAXRSSpringSecurityInterfaceTest extends AbstractSpringSecurityTest {
- public static final String PORT = BookServerSecuritySpringInterface.PORT;
+ public static final int PORT = BookServerSecuritySpringInterface.PORT;
@BeforeClass
public static void startServers() throws Exception {
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityNoAnnotationsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityNoAnnotationsTest.java?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityNoAnnotationsTest.java (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSSpringSecurityNoAnnotationsTest.java Tue May 22 21:20:44 2012
@@ -23,12 +23,12 @@ import org.junit.BeforeClass;
import org.junit.Test;
public class JAXRSSpringSecurityNoAnnotationsTest extends AbstractSpringSecurityTest {
- public static final String PORT = BookServerSecuritySpringNoAnnotations.PORT;
+ public static final int PORT = BookServerSecuritySpringNoAnnotations.PORT;
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookServerSecuritySpringNoAnnotations.class));
+ launchServer(BookServerSecuritySpringNoAnnotations.class, true));
}
@Test
Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/resources/jaxrs_logging_atompush/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/resources/jaxrs_logging_atompush/WEB-INF/beans.xml?rev=1341635&r1=1341634&r2=1341635&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/resources/jaxrs_logging_atompush/WEB-INF/beans.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/resources/jaxrs_logging_atompush/WEB-INF/beans.xml Tue May 22 21:20:44 2012
@@ -71,7 +71,7 @@ http://www.springframework.org/schema/ut
<bean id="webClient" class="org.apache.cxf.jaxrs.client.WebClient"
factory-method="create">
- <constructor-arg type="java.lang.String" value="http://localhost:${testutil.ports.AbstractSpringServer}/root/feeds" />
+ <constructor-arg type="java.lang.String" value="http://localhost:${testutil.ports.SpringServer}/root/feeds" />
<constructor-arg ref="feedProvider" />
</bean>
@@ -82,7 +82,7 @@ factory-method="create">
value="
org.apache.cxf.systest.jaxrs.JAXRSLoggingAtomPushSpringTest$Resource2:ALL,
namedLogger:WARN" />
- <property name="url" value="http://localhost:${testutil.ports.AbstractSpringServer}/batch/feeds"/>
+ <property name="url" value="http://localhost:${testutil.ports.SpringServer}/batch/feeds"/>
</bean>
<bean class="org.apache.cxf.management.web.logging.atom.AtomPushBean"
@@ -103,7 +103,7 @@ factory-method="create">
<bean id="webClient3" class="org.apache.cxf.jaxrs.client.WebClient"
factory-method="create">
- <constructor-arg type="java.lang.String" value="http://localhost:${testutil.ports.AbstractSpringServer}/entries/entries" />
+ <constructor-arg type="java.lang.String" value="http://localhost:${testutil.ports.SpringServer}/entries/entries" />
<constructor-arg ref="entryProvider" />
</bean>
@@ -116,7 +116,7 @@ factory-method="create">
value="
org.apache.cxf.systest.jaxrs.JAXRSLoggingAtomPushSpringTest$Resource4:ALL,
namedLogger:WARN" />
- <property name="url" value="http://localhost:${testutil.ports.AbstractSpringServer}/entriesMany/entries"/>
+ <property name="url" value="http://localhost:${testutil.ports.SpringServer}/entriesMany/entries"/>
</bean>
<bean class="org.apache.cxf.management.web.logging.atom.AtomPushBean"
@@ -127,7 +127,7 @@ factory-method="create">
value="
org.apache.cxf.systest.jaxrs.JAXRSLoggingAtomPushSpringTest$Resource5:ALL,
namedLogger:WARN" />
- <property name="url" value="http://localhost:${testutil.ports.AbstractSpringServer}/extensions/feeds"/>
+ <property name="url" value="http://localhost:${testutil.ports.SpringServer}/extensions/feeds"/>
</bean>
<util:list id="feedProvider">
@@ -153,7 +153,7 @@ factory-method="create">
<bean class="org.apache.cxf.management.web.logging.atom.AtomPushBean"
init-method="init">
- <property name="url" value="http://localhost:${testutil.ports.AbstractSpringServer}/feed" />
+ <property name="url" value="http://localhost:${testutil.ports.SpringServer}/feed" />
<property name="level" value="ALL" />
</bean>