svn commit: r1136035 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webdav: pom.xml src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java

[olamy]

Author: olamy
Date: Wed Jun 15 13:37:52 2011
New Revision: 1136035

URL: http://svn.apache.org/viewvc?rev=1136035&view=rev
Log:
back to forkMode once for webdav module : faster build

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
    
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml?rev=1136035&r1=1136034&r2=1136035&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml Wed Jun 15 
13:37:52 2011
@@ -30,7 +30,7 @@
   <name>Archiva Web :: WebDAV</name>
 
   <properties>
-    <webdav.forkMode>always</webdav.forkMode>
+    <webdav.forkMode>once</webdav.forkMode>
   </properties>
 
   <dependencies>

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java?rev=1136035&r1=1136034&r2=1136035&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java
 Wed Jun 15 13:37:52 2011
@@ -23,14 +23,15 @@ import com.meterware.httpunit.GetMethodW
 import com.meterware.httpunit.HttpUnitOptions;
 import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
-
+import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
 import org.apache.maven.archiva.policies.ReleasesPolicy;
 import org.junit.Test;
 
 import java.io.File;
+import java.util.ArrayList;
 
 /**
- * RepositoryServlet Tests, Proxied, Get of Release Artifacts, with varying 
policy settings. 
+ * RepositoryServlet Tests, Proxied, Get of Release Artifacts, with varying 
policy settings.
  *
  * @version $Id$
  */
@@ -175,6 +176,8 @@ public class RepositoryServletProxiedRel
             managedFile.setLastModified( remoteFile.lastModified() + 
deltaManagedToRemoteTimestamp );
         }
 
+        archivaConfiguration.getConfiguration().setProxyConnectors( new 
ArrayList<ProxyConnectorConfiguration>() );
+
         setupReleaseConnector( REPOID_INTERNAL, remoteCentral, releasePolicy );
         saveConfiguration();
 
@@ -192,7 +195,7 @@ public class RepositoryServletProxiedRel
             case EXPECT_MANAGED_CONTENTS:
                 assertResponseOK( response );
                 assertTrue( "Invalid Test Case: Can't expect managed contents 
with "
-                    + "test that doesn't have a managed copy in the first 
place.", hasManagedCopy );
+                                + "test that doesn't have a managed copy in 
the first place.", hasManagedCopy );
                 assertEquals( "Expected managed file contents", 
expectedManagedContents, response.getText() );
                 break;
             case EXPECT_REMOTE_CONTENTS: