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/08/04 01:10:08 UTC
svn commit: r1153700 - in /maven/wagon/trunk:
wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/
wagon-provider-test/src/main/java/org/apache/maven/wagon/http/
Author: struberg
Date: Wed Aug 3 23:10:07 2011
New Revision: 1153700
URL: http://svn.apache.org/viewvc?rev=1153700&view=rev
Log:
fix randomly broken unit tests. Might be a jetty issue.
Workaround was to add a 5seconds sleep. Ugly though :(
Modified:
maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java
maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/RepositoryPermissions.java
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java?rev=1153700&r1=1153699&r2=1153700&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java (original)
+++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java Wed Aug 3 23:10:07 2011
@@ -19,13 +19,13 @@ package org.apache.maven.wagon.repositor
* under the License.
*/
+import java.io.Serializable;
+import java.util.Properties;
+
import org.apache.maven.wagon.PathUtils;
import org.apache.maven.wagon.WagonConstants;
import org.codehaus.plexus.util.StringUtils;
-import java.io.Serializable;
-import java.util.Properties;
-
/**
* This class is an abstraction of the location from/to resources
* can be transfered.
@@ -34,8 +34,7 @@ import java.util.Properties;
* @version $Id$
* @todo [BP] some things are specific to certain wagons (eg key stuff in authInfo, permissions)
*/
-public class Repository
- implements Serializable
+public class Repository implements Serializable
{
private static final long serialVersionUID = 1312227676322136247L;
Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/RepositoryPermissions.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/RepositoryPermissions.java?rev=1153700&r1=1153699&r2=1153700&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/RepositoryPermissions.java (original)
+++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/RepositoryPermissions.java Wed Aug 3 23:10:07 2011
@@ -19,13 +19,15 @@ package org.apache.maven.wagon.repositor
* under the License.
*/
+import java.io.Serializable;
+
/**
* Describes the permissions to set on files uploaded to the repository.
*
* @author Brett Porter
* @version $Id$
*/
-public class RepositoryPermissions
+public class RepositoryPermissions implements Serializable
{
/**
* Repository group name.
Modified: maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java?rev=1153700&r1=1153699&r2=1153700&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java (original)
+++ maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java Wed Aug 3 23:10:07 2011
@@ -56,6 +56,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.net.URLDecoder;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
@@ -395,6 +396,11 @@ public abstract class HttpWagonTestCase
private void runTestProxiedRequest( ProxyInfo proxyInfo, TestHeaderHandler handler )
throws Exception
{
+ // what an UGLY hack!
+ // but apparently jetty needs some time to free up resources
+ // <5s: broken test :(
+ Thread.sleep( 5001L );
+
Server proxyServer = new Server( 0 );
proxyServer.setHandler( handler );
@@ -409,7 +415,7 @@ public abstract class HttpWagonTestCase
while ( !proxyServer.isRunning() || !proxyServer.isStarted() )
{
- Thread.sleep( 1 );
+ Thread.sleep( 10 );
}
try
@@ -930,7 +936,7 @@ public abstract class HttpWagonTestCase
private static class TestHeaderHandler
extends AbstractHandler
{
- private Map headers;
+ private Map headers = Collections.EMPTY_MAP;
public TestHeaderHandler()
{