back to forkMode once for webdav module : faster build

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1136035 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index 3301ea68527ff1638d6fc5b01aa54fc67c3ef47d..0d3c8638879581a9318d2ce8fd70c61f72a5a591 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -30,7 +30,7 @@
   <name>Archiva Web :: WebDAV</name>
 
   <properties>
-    <webdav.forkMode>always</webdav.forkMode>
+    <webdav.forkMode>once</webdav.forkMode>
   </properties>
 
   <dependencies>

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java
index 965b3559e90e460220e8768bf2cf551a1731d0f2..11c7e4b90e19536432ec9b9d0a903d1edf83476d 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java
@@ -23,14 +23,15 @@ import com.meterware.httpunit.GetMethodWebRequest;
 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 RepositoryServletProxiedReleasePolicyTest
             managedFile.setLastModified( remoteFile.lastModified() + deltaManagedToRemoteTimestamp );
         }
 
+        archivaConfiguration.getConfiguration().setProxyConnectors( new ArrayList<ProxyConnectorConfiguration>() );
+
         setupReleaseConnector( REPOID_INTERNAL, remoteCentral, releasePolicy );
         saveConfiguration();
 
@@ -192,7 +195,7 @@ public class RepositoryServletProxiedReleasePolicyTest
             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: