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 2011/07/29 15:14:48 UTC
svn commit: r1152206 - in /cxf/branches/2.4.x-fixes: ./
rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/
Author: dkulp
Date: Fri Jul 29 13:14:47 2011
New Revision: 1152206
URL: http://svn.apache.org/viewvc?rev=1152206&view=rev
Log:
Merged revisions 1151934 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1151934 | dkulp | 2011-07-28 13:15:19 -0400 (Thu, 28 Jul 2011) | 1 line
Remove some printlns in the tests
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngine.java
cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java
cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java
cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngine.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngine.java?rev=1152206&r1=1152205&r2=1152206&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngine.java (original)
+++ cxf/branches/2.4.x-fixes/rt/management-web/src/main/java/org/apache/cxf/management/web/logging/atom/AtomPushEngine.java Fri Jul 29 13:14:47 2011
@@ -101,15 +101,15 @@ final class AtomPushEngine {
private boolean isValid() {
if (deliverer == null) {
// TODO report cause
- System.err.println("deliverer is not set");
+ ///System.err.println("deliverer is not set");
return false;
}
if (converter == null) {
- System.err.println("converter is not set");
+ //System.err.println("converter is not set");
return false;
}
if (executor.isShutdown()) {
- System.err.println("engine shutdown");
+ //System.err.println("engine shutdown");
return false;
}
return true;
Modified: cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java?rev=1152206&r1=1152205&r2=1152206&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java (original)
+++ cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java Fri Jul 29 13:14:47 2011
@@ -55,8 +55,6 @@ public abstract class AbstractSpringServ
}
protected void run() {
- System.out.println("Starting Server");
-
server = new org.eclipse.jetty.server.Server();
SelectChannelConnector connector = new SelectChannelConnector();
Modified: cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java?rev=1152206&r1=1152205&r2=1152206&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java (original)
+++ cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java Fri Jul 29 13:14:47 2011
@@ -34,8 +34,6 @@ public class AtomBookServer extends Abst
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.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=1152206&r1=1152205&r2=1152206&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java (original)
+++ cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java Fri Jul 29 13:14:47 2011
@@ -105,12 +105,12 @@ public class BookStore {
@PostConstruct
public void postConstruct() {
- System.out.println("PostConstruct called");
+ //System.out.println("PostConstruct called");
}
@PreDestroy
public void preDestroy() {
- System.out.println("PreDestroy called");
+ //System.out.println("PreDestroy called");
}
@GET
@@ -126,7 +126,7 @@ public class BookStore {
@Path("emptypost")
public void emptypost() {
String uri = ui.getAbsolutePath().toString();
- System.out.println(uri);
+ //System.out.println(uri);
if (uri.endsWith("/")) {
throw new WebApplicationException(400);
}