aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2011-06-15 13:37:52 +0000
committerOlivier Lamy <olamy@apache.org>2011-06-15 13:37:52 +0000
commitaefe91d87c51a1261b0b04d522c250f2a13a6d24 (patch)
tree23bead1e8d12b960d58d1a1dced9df338cd31f52
parent26665cb8eac7b7fb94bfd468784d8f6d2cae1526 (diff)
downloadarchiva-aefe91d87c51a1261b0b04d522c250f2a13a6d24.tar.gz
archiva-aefe91d87c51a1261b0b04d522c250f2a13a6d24.zip
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
-rw-r--r--archiva-modules/archiva-web/archiva-webdav/pom.xml2
-rw-r--r--archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedReleasePolicyTest.java9
2 files changed, 7 insertions, 4 deletions
diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index 3301ea685..0d3c86388 100644
--- 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 965b3559e..11c7e4b90 100644
--- 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: