Author: dkulp
Date: Thu May 26 19:04:43 2011
New Revision: 1128041
URL: http://svn.apache.org/viewvc?rev=1128041&view=rev
Log:
Merged revisions 1127694 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1127694 | dkulp | 2011-05-25 17:39:02 -0400 (Wed, 25 May 2011) | 1 line
Remove printlns from tests
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreWithInterface.java
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreWithInterface2.java
cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java?rev=1128041&r1=1128040&r2=1128041&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java
(original)
+++
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java
Thu May 26 19:04:43 2011
@@ -59,7 +59,7 @@ public class AtomBookStore {
public AtomBookStore() {
init();
- System.out.println("----books: " + books.size());
+ //System.out.println("----books: " + books.size());
}
@Context
@@ -153,7 +153,7 @@ public class AtomBookStore {
@Path("/books/entries/{bookId}/")
@Produces({"application/atom+xml", "application/json" })
public Entry getBookAsEntry(@PathParam("bookId") String id) throws
BookNotFoundFault {
- System.out.println("----invoking getBook with id: " + id);
+ //System.out.println("----invoking getBook with id: " + id);
Book book = books.get(Long.parseLong(id));
if (book != null) {
try {
@@ -171,7 +171,7 @@ public class AtomBookStore {
@Path("/books/subresources/{bookId}/")
public AtomBook getBook(@PathParam("bookId") String id) throws
BookNotFoundFault {
- System.out.println("----invoking getBook with id: " + id);
+ //System.out.println("----invoking getBook with id: " + id);
Book book = books.get(Long.parseLong(id));
if (book != null) {
try {
Modified:
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java?rev=1128041&r1=1128040&r2=1128041&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java
(original)
+++
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationStore.java
Thu May 26 19:04:43 2011
@@ -106,7 +106,7 @@ public class BookContinuationStore {
private void suspendInvocation(final String name, Continuation cont) {
- System.out.println("Suspending invocation for " + name);
+ //System.out.println("Suspending invocation for " + name);
try {
cont.suspend(500000);
@@ -129,7 +129,7 @@ public class BookContinuationStore {
private Continuation getContinuation(String name) {
- System.out.println("Getting continuation for " + name);
+ //System.out.println("Getting continuation for " + name);
synchronized (suspended) {
Continuation suspendedCont = suspended.remove(name);
Modified:
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreWithInterface.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreWithInterface.java?rev=1128041&r1=1128040&r2=1128041&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreWithInterface.java
(original)
+++
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreWithInterface.java
Thu May 26 19:04:43 2011
@@ -59,7 +59,7 @@ public class BookStoreWithInterface exte
}
public void preDestroy() {
- System.out.println("PreDestroy called");
+ //System.out.println("PreDestroy called");
}
public Book getThatBook(Long id, String s) throws BookNotFoundFault {
@@ -80,7 +80,7 @@ public class BookStoreWithInterface exte
}
private Book doGetBook(Long id) throws BookNotFoundFault {
- System.out.println("----invoking getBook with id: " + id);
+ //System.out.println("----invoking getBook with id: " + id);
Book book = books.get(id);
if (book != null) {
return book;
Modified:
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreWithInterface2.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreWithInterface2.java?rev=1128041&r1=1128040&r2=1128041&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreWithInterface2.java
(original)
+++
cxf/branches/2.3.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreWithInterface2.java
Thu May 26 19:04:43 2011
@@ -76,7 +76,7 @@ public class BookStoreWithInterface2 ext
}
private Book doGetBook(Long id) throws BookNotFoundFault {
- System.out.println("----invoking getBook with id: " + id);
+ //System.out.println("----invoking getBook with id: " + id);
Book book = books.get(id);
if (book != null) {
return book;
Modified:
cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java?rev=1128041&r1=1128040&r2=1128041&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
(original)
+++
cxf/branches/2.3.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
Thu May 26 19:04:43 2011
@@ -161,7 +161,6 @@ public class FailoverAddressOverrideTest
control = cs.getControlPort();
LOG.info("starting replicated target: " + address);
- System.out.println("starting replicated target: " + address);
assertTrue("Failed to start greeter", control.startGreeter(address));
targets.add(address);
}
