You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2011/06/20 21:04:42 UTC
svn commit: r1137747 - in /maven/wagon/trunk: wagon-provider-test/
wagon-provider-test/src/main/java/org/apache/maven/wagon/
wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/
wagon-providers/wagon-http-shared4/src/test...
Author: struberg
Date: Mon Jun 20 19:04:41 2011
New Revision: 1137747
URL: http://svn.apache.org/viewvc?rev=1137747&view=rev
Log:
WAGON-336 remove System.out.printlns from WAGON
happened mostly in tests, but occasionally also in real wagons!
Modified:
maven/wagon/trunk/wagon-provider-test/pom.xml
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
maven/wagon/trunk/wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java
maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java
maven/wagon/trunk/wagon-providers/wagon-http/pom.xml
maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/WaitForeverServlet.java
maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/GetWagonTests.java
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/WagonTestCaseConfigurator.java
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/AuthSnoopFilter.java
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/LatencyServlet.java
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ProxyConnectionVerifierFilter.java
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java
maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java
Modified: maven/wagon/trunk/wagon-provider-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/pom.xml?rev=1137747&r1=1137746&r2=1137747&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-test/pom.xml (original)
+++ maven/wagon/trunk/wagon-provider-test/pom.xml Mon Jun 20 19:04:41 2011
@@ -54,5 +54,6 @@ under the License.
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</dependency>
+
</dependencies>
</project>
Modified: maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java?rev=1137747&r1=1137746&r2=1137747&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java (original)
+++ maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java Mon Jun 20 19:04:41 2011
@@ -22,16 +22,10 @@ package org.apache.maven.wagon;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.apache.maven.wagon.authentication.AuthenticationException;
-import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.observers.ChecksumObserver;
import org.apache.maven.wagon.resource.Resource;
import org.codehaus.plexus.util.FileUtils;
@@ -44,8 +38,6 @@ import org.codehaus.plexus.util.IOUtil;
public abstract class StreamingWagonTestCase
extends WagonTestCase
{
- private static Logger logger = Logger.getLogger( StreamingWagonTestCase.class.getName() );
-
public void testStreamingWagon()
throws Exception
{
@@ -262,7 +254,7 @@ public abstract class StreamingWagonTest
}
catch( Exception e )
{
- logger.log( Level.SEVERE, "error while putting resources to the FTP Server", e );
+ logger.error( "error while putting resources to the FTP Server", e );
}
finally
{
@@ -298,7 +290,7 @@ public abstract class StreamingWagonTest
}
catch( Exception e )
{
- logger.log( Level.SEVERE, "error while reading resources from the FTP Server", e );
+ logger.error( "error while reading resources from the FTP Server", e );
}
finally
{
Modified: maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java?rev=1137747&r1=1137746&r2=1137747&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java (original)
+++ maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java Mon Jun 20 19:04:41 2011
@@ -19,6 +19,15 @@ package org.apache.maven.wagon;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.log4j.Logger;
import org.apache.maven.wagon.authentication.AuthenticationException;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.authorization.AuthorizationException;
@@ -34,14 +43,6 @@ import org.codehaus.plexus.util.FileUtil
import org.easymock.AbstractMatcher;
import org.easymock.MockControl;
-import java.io.File;
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
@@ -49,6 +50,9 @@ import java.util.List;
public abstract class WagonTestCase
extends PlexusTestCase
{
+ protected static Logger logger = Logger.getLogger( WagonTestCase.class );
+
+
static final class ProgressArgumentMatcher
extends AbstractMatcher
{
@@ -226,7 +230,7 @@ public abstract class WagonTestCase
protected void message( String message )
{
- System.out.println( message );
+ logger.info( message );
}
// ----------------------------------------------------------------------
Modified: maven/wagon/trunk/wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java?rev=1137747&r1=1137746&r2=1137747&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http-shared/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java Mon Jun 20 19:04:41 2011
@@ -26,6 +26,7 @@ import java.util.List;
import junit.framework.TestCase;
+import org.apache.log4j.Logger;
import org.apache.maven.wagon.TransferFailedException;
/**
@@ -34,6 +35,8 @@ import org.apache.maven.wagon.TransferFa
public class HtmlFileListParserTest
extends TestCase
{
+ private static Logger logger = Logger.getLogger( HtmlFileListParserTest.class );
+
private void assertContainsExpected( List/*<String>*/links, String[] expected )
{
if ( expected.length != links.size() )
@@ -42,7 +45,7 @@ public class HtmlFileListParserTest
for ( Iterator iterator = links.iterator(); iterator.hasNext(); )
{
String link = (String) iterator.next();
- System.out.println( " \"" + link + "\", " );
+ logger.info( " \"" + link + "\", " );
}
assertEquals( "Links to Expected size", expected.length, links.size() );
}
@@ -76,7 +79,7 @@ public class HtmlFileListParserTest
Iterator it = files.iterator();
while ( it.hasNext() )
{
- System.out.println( "File: '" + it.next() + "'" );
+ logger.info( "File: '" + it.next() + "'" );
}
}
Modified: maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java?rev=1137747&r1=1137746&r2=1137747&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http-shared4/src/test/java/org/apache/maven/wagon/shared/http/HtmlFileListParserTest.java Mon Jun 20 19:04:41 2011
@@ -25,7 +25,7 @@ import java.util.Iterator;
import java.util.List;
import junit.framework.TestCase;
-
+import org.apache.log4j.Logger;
import org.apache.maven.wagon.TransferFailedException;
/**
@@ -34,6 +34,8 @@ import org.apache.maven.wagon.TransferFa
public class HtmlFileListParserTest
extends TestCase
{
+ private static Logger logger = Logger.getLogger( HtmlFileListParserTest.class );
+
private void assertContainsExpected( List/*<String>*/links, String[] expected )
{
if ( expected.length != links.size() )
@@ -42,7 +44,7 @@ public class HtmlFileListParserTest
for ( Iterator iterator = links.iterator(); iterator.hasNext(); )
{
String link = (String) iterator.next();
- System.out.println( " \"" + link + "\", " );
+ logger.info( " \"" + link + "\", " );
}
assertEquals( "Links to Expected size", expected.length, links.size() );
}
@@ -76,7 +78,7 @@ public class HtmlFileListParserTest
Iterator it = files.iterator();
while ( it.hasNext() )
{
- System.out.println( "File: '" + it.next() + "'" );
+ logger.info( "File: '" + it.next() + "'" );
}
}
Modified: maven/wagon/trunk/wagon-providers/wagon-http/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http/pom.xml?rev=1137747&r1=1137746&r2=1137747&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http/pom.xml Mon Jun 20 19:04:41 2011
@@ -47,6 +47,7 @@ under the License.
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+
</dependencies>
<!-- I believe we can shade this in Maven itself
Modified: maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/WaitForeverServlet.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/WaitForeverServlet.java?rev=1137747&r1=1137746&r2=1137747&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/WaitForeverServlet.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/WaitForeverServlet.java Mon Jun 20 19:04:41 2011
@@ -18,12 +18,15 @@ package org.apache.maven.wagon.providers
* specific language governing permissions and limitations
* under the License.
*/
-
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
-import java.io.IOException;
+
+import org.apache.log4j.Logger;
/**
* User: jdumay
@@ -31,10 +34,13 @@ import java.io.IOException;
* Time: 17:25:27
*/
public class WaitForeverServlet extends HttpServlet {
+
+ private static Logger logger = Logger.getLogger( WaitForeverServlet.class );
+
public void service(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException
{
- System.out.println( "Calling WaitForeverServlet" );
+ logger.info( "Calling WaitForeverServlet" );
try
{
Thread.sleep( 2000 );
Modified: maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java?rev=1137747&r1=1137746&r2=1137747&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java Mon Jun 20 19:04:41 2011
@@ -19,6 +19,15 @@ package org.apache.maven.wagon.providers
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.Stack;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
@@ -41,18 +50,10 @@ import org.apache.maven.wagon.TransferFa
import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.events.TransferEvent;
import org.apache.maven.wagon.resource.Resource;
+
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import java.util.Stack;
-
/**
* Wagon provider to get and put files from and to SCM systems, using Maven-SCM as underlying transport.
* <p/>
@@ -648,7 +649,6 @@ public class ScmWagon
{
ScmFile f = (ScmFile) it.next();
files.add( f.getPath() );
- System.out.println( "LIST FILE: " + f + " (path=" + f.getPath() + ")" );
}
return files;
Modified: maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/GetWagonTests.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/GetWagonTests.java?rev=1137747&r1=1137746&r2=1137747&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/GetWagonTests.java (original)
+++ maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/GetWagonTests.java Mon Jun 20 19:04:41 2011
@@ -42,6 +42,7 @@ import javax.servlet.Servlet;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
+import java.util.logging.Logger;
import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.fail;
@@ -128,7 +129,7 @@ public class GetWagonTests
if ( getWagon() instanceof StreamWagon )
{
- System.out.println( "Connection timeout is: " + ( (StreamWagon) getWagon() ).getTimeout() );
+ logger.info("Connection timeout is: " + ((StreamWagon) getWagon()).getTimeout());
}
File target = newTempFile();
@@ -173,7 +174,7 @@ public class GetWagonTests
try
{
- System.out.println( "Waiting 60 seconds for wagon timeout." );
+ logger.info( "Waiting 60 seconds for wagon timeout." );
t.join( 30000 );
}
catch ( InterruptedException e )
@@ -181,7 +182,7 @@ public class GetWagonTests
e.printStackTrace();
}
- System.out.println( "Interrupting thread." );
+ logger.info( "Interrupting thread." );
t.interrupt();
assertTrue( "TransferFailedException should have been thrown.", holder.getValue() );
@@ -510,7 +511,7 @@ public class GetWagonTests
if ( getWagon() instanceof StreamWagon )
{
- System.out.println( "Connection timeout is: " + ( (StreamWagon) getWagon() ).getTimeout() );
+ logger.info( "Connection timeout is: " + ( (StreamWagon) getWagon() ).getTimeout() );
}
File target = newTempFile();
Modified: maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java?rev=1137747&r1=1137746&r2=1137747&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java (original)
+++ maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/HttpWagonTests.java Mon Jun 20 19:04:41 2011
@@ -19,6 +19,12 @@ package org.apache.maven.wagon.tck.http;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.authentication.AuthenticationException;
@@ -35,12 +41,6 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
import static org.apache.maven.wagon.tck.http.util.TestUtil.getResource;
public abstract class HttpWagonTests
@@ -64,6 +64,8 @@ public abstract class HttpWagonTests
private final Set<Object> notificationTargets = new HashSet<Object>();
+ protected static Logger logger = Logger.getLogger( HttpWagonTests.class );
+
@Before
public void beforeEach()
throws Exception
@@ -214,8 +216,8 @@ public abstract class HttpWagonTests
if ( testCaseId == null || !configurator.isSupported( testCaseId ) )
{
- System.out.println( "Cannot run test: " + testCaseId
- + ". Wagon under test does not support this test case." );
+ logger.error( "Cannot run test: " + testCaseId
+ + ". Wagon under test does not support this test case." );
return false;
}
@@ -249,8 +251,8 @@ public abstract class HttpWagonTests
if ( testCaseId == null || !configurator.configureWagonForTest( wagon, testCaseId ) )
{
- System.out.println( "Cannot run test: " + testCaseId
- + ". Wagon under test does not support this test case." );
+ logger.error( "Cannot run test: " + testCaseId
+ + ". Wagon under test does not support this test case." );
return false;
}
Modified: maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/WagonTestCaseConfigurator.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/WagonTestCaseConfigurator.java?rev=1137747&r1=1137746&r2=1137747&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/WagonTestCaseConfigurator.java (original)
+++ maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/WagonTestCaseConfigurator.java Mon Jun 20 19:04:41 2011
@@ -19,10 +19,11 @@ package org.apache.maven.wagon.tck.http;
* under the License.
*/
+import org.apache.log4j.Logger;
import org.apache.maven.wagon.Wagon;
-import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
import org.codehaus.plexus.component.configurator.ComponentConfigurator;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
@@ -44,6 +45,8 @@ public class WagonTestCaseConfigurator
private String wagonHint;
+ private static Logger logger = Logger.getLogger( WagonTestCaseConfigurator.class );
+
public boolean isSupported( final String useCaseId )
{
if ( useCaseConfigs != null )
@@ -52,7 +55,7 @@ public class WagonTestCaseConfigurator
if ( config != null && config.getChild( UNSUPPORTED_ELEMENT, false ) != null )
{
- System.out.println( "Test case '" + useCaseId + "' is marked as unsupported by this wagon." );
+ logger.info( "Test case '" + useCaseId + "' is marked as unsupported by this wagon." );
return false;
}
}
@@ -71,23 +74,23 @@ public class WagonTestCaseConfigurator
{
if ( config.getChild( UNSUPPORTED_ELEMENT, false ) != null )
{
- System.out.println( "Test case '" + useCaseId + "' is marked as unsupported by this wagon." );
+ logger.error( "Test case '" + useCaseId + "' is marked as unsupported by this wagon." );
return false;
}
else
{
- System.out.println( "Configuring wagon for test case: " + useCaseId + " with:\n\n" + config );
+ logger.info( "Configuring wagon for test case: " + useCaseId + " with:\n\n" + config );
configurator.configureComponent( wagon, useCaseConfigs.getChild( useCaseId, false ), realm );
}
}
else
{
- System.out.println( "No wagon configuration found for test case: " + useCaseId );
+ logger.info( "No wagon configuration found for test case: " + useCaseId );
}
}
else
{
- System.out.println( "No test case configurations found." );
+ logger.info( "No test case configurations found." );
}
return true;
Modified: maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/AuthSnoopFilter.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/AuthSnoopFilter.java?rev=1137747&r1=1137746&r2=1137747&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/AuthSnoopFilter.java (original)
+++ maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/AuthSnoopFilter.java Mon Jun 20 19:04:41 2011
@@ -19,8 +19,6 @@ package org.apache.maven.wagon.tck.http.
* under the License.
*/
-import org.apache.commons.codec.binary.Base64;
-
import java.io.IOException;
import javax.servlet.Filter;
@@ -31,9 +29,13 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
+
public class AuthSnoopFilter
implements Filter
{
+ private static Logger logger = Logger.getLogger( AuthSnoopFilter.class );
public void destroy()
{
@@ -47,13 +49,13 @@ public class AuthSnoopFilter
if ( authHeader != null )
{
- System.out.println( "Authorization: " + authHeader );
+ logger.info( "Authorization: " + authHeader );
String data = authHeader.substring( "BASIC ".length() );
String decoded = new String( Base64.decodeBase64( data ) );
- System.out.println( decoded );
+ logger.info( decoded );
String[] creds = decoded.split( ":" );
- System.out.println( "User: " + creds[0] + "\nPassword: " + creds[1] );
+ logger.info( "User: " + creds[0] + "\nPassword: " + creds[1] );
}
}
Modified: maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/LatencyServlet.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/LatencyServlet.java?rev=1137747&r1=1137746&r2=1137747&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/LatencyServlet.java (original)
+++ maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/LatencyServlet.java Mon Jun 20 19:04:41 2011
@@ -19,8 +19,6 @@ package org.apache.maven.wagon.tck.http.
* under the License.
*/
-import org.codehaus.plexus.util.IOUtil;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -31,9 +29,14 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.log4j.Logger;
+import org.codehaus.plexus.util.IOUtil;
+
public class LatencyServlet
extends HttpServlet
{
+ private static Logger logger = Logger.getLogger(LatencyServlet.class);
+
private static final long serialVersionUID = 1L;
@@ -52,7 +55,7 @@ public class LatencyServlet
{
if ( latencyMs < 0 )
{
- System.out.println( "Starting infinite wait." );
+ logger.info( "Starting infinite wait." );
synchronized ( this )
{
try
@@ -82,7 +85,7 @@ public class LatencyServlet
in = new FileInputStream( f );
OutputStream out = resp.getOutputStream();
- System.out.println( "Starting high-latency transfer. This should take about "
+ logger.info( "Starting high-latency transfer. This should take about "
+ ( ( f.length() / BUFFER_SIZE * latencyMs / 1000 ) + ( latencyMs / 1000 ) ) + " seconds." );
int read = -1;
@@ -98,7 +101,7 @@ public class LatencyServlet
e.printStackTrace();
}
- System.out.println( "Writing bytes " + total + "-" + ( total + read - 1 ) + " of " + f.length()
+ logger.info( "Writing bytes " + total + "-" + ( total + read - 1 ) + " of " + f.length()
+ ". Elapsed time so far: " + ( ( System.currentTimeMillis() - start ) / 1000 ) + " seconds" );
out.write( buf, 0, read );
@@ -111,7 +114,7 @@ public class LatencyServlet
IOUtil.close( in );
}
- System.out.println( "High-latency transfer done in " + ( System.currentTimeMillis() - start ) + "ms" );
+ logger.info( "High-latency transfer done in " + ( System.currentTimeMillis() - start ) + "ms" );
}
}
Modified: maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ProxyConnectionVerifierFilter.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ProxyConnectionVerifierFilter.java?rev=1137747&r1=1137746&r2=1137747&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ProxyConnectionVerifierFilter.java (original)
+++ maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ProxyConnectionVerifierFilter.java Mon Jun 20 19:04:41 2011
@@ -31,9 +31,12 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
+import org.apache.log4j.Logger;
+
public class ProxyConnectionVerifierFilter
implements Filter
{
+ private static Logger logger = Logger.getLogger( ProxyConnectionVerifierFilter.class );
public void destroy()
{
@@ -59,7 +62,7 @@ public class ProxyConnectionVerifierFilt
{
for ( String val : Collections.list( vEn ) )
{
- System.out.println( key + ": " + val );
+ logger.info( key + ": " + val );
}
}
}
Modified: maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java?rev=1137747&r1=1137746&r2=1137747&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java (original)
+++ maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java Mon Jun 20 19:04:41 2011
@@ -19,6 +19,14 @@ package org.apache.maven.wagon.tck.http.
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+import javax.servlet.Filter;
+import javax.servlet.Servlet;
+
+import org.apache.log4j.Logger;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Handler;
import org.mortbay.jetty.Server;
@@ -36,18 +44,13 @@ import org.mortbay.jetty.servlet.FilterM
import org.mortbay.jetty.servlet.ServletHolder;
import org.mortbay.jetty.servlet.SessionHandler;
import org.mortbay.jetty.webapp.WebAppContext;
-
-import javax.servlet.Filter;
-import javax.servlet.Servlet;
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.logging.Logger;
-
import static org.apache.maven.wagon.tck.http.util.TestUtil.getResource;
public class ServerFixture
{
+ private static Logger logger = Logger.getLogger( ServerFixture.class );
+
+
public static final String SERVER_ROOT_RESOURCE_PATH = "default-server-root";
// it seems that some JDKs have a problem if you use different key stores
@@ -118,7 +121,7 @@ public class ServerFixture
webappContext.setContextPath( "/" );
File base = getResource( SERVER_ROOT_RESOURCE_PATH );
- System.out.println( "docroot: " + base );
+ logger.info( "docroot: " + base );
webappContext.setWar( base.getAbsolutePath() );
webappContext.addHandler( securityHandler );
Modified: maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java?rev=1137747&r1=1137746&r2=1137747&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java (original)
+++ maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/util/TestUtil.java Mon Jun 20 19:04:41 2011
@@ -19,8 +19,6 @@ package org.apache.maven.wagon.tck.http.
* under the License.
*/
-import org.codehaus.plexus.util.IOUtil;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -34,8 +32,13 @@ import java.util.Map;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
+import org.apache.log4j.Logger;
+import org.codehaus.plexus.util.IOUtil;
+
public final class TestUtil
{
+ private static Logger logger = Logger.getLogger(TestUtil.class);
+
private static final Map<String, File> bases = new HashMap<String, File>();
@@ -70,7 +73,7 @@ public final class TestUtil
base = new File( "target/tck-resources/" + urlFile.getName() );
base.getParentFile().mkdirs();
- System.out.println( "unpacking test resources in jar: " + url );
+ logger.info("unpacking test resources in jar: " + url);
JarFile jf = null;
try
{