cleanup archivaConfiguration before new test

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1136005 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 ff95ddcf5dbbcc15df5aa780529f6c0f5c41084c..3301ea68527ff1638d6fc5b01aa54fc67c3ef47d 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -29,6 +29,10 @@
   <artifactId>archiva-webdav</artifactId>
   <name>Archiva Web :: WebDAV</name>
 
+  <properties>
+    <webdav.forkMode>always</webdav.forkMode>
+  </properties>
+
   <dependencies>
     <!-- TODO: remove this hardcoding through a better event mechanism -->
     <dependency>
@@ -159,7 +163,7 @@
           <systemPropertyVariables>
             <appserver.base>${basedir}/target/appserver-base</appserver.base>
           </systemPropertyVariables>
-          <forkMode>always</forkMode>
+          <forkMode>${webdav.forkMode}</forkMode>
         </configuration>
       </plugin>
     </plugins>

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java
index d83bf35de6df2e87b9feb03ee3a069e5f2be3b22..efa3902546ef700a8d37f017d1083815a61c1922 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java
@@ -24,10 +24,12 @@ 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.SnapshotsPolicy;
 import org.junit.Test;
 
 import java.io.File;
+import java.util.ArrayList;
 
 /**
  * RepositoryServlet Tests, Proxied, Get of Timestamped Snapshot Artifacts, with varying policy settings. 
@@ -178,6 +180,8 @@ public class RepositoryServletProxiedPluginSnapshotPolicyTest
             managedFile.setLastModified( remoteFile.lastModified() + deltaManagedToRemoteTimestamp );
         }
 
+        archivaConfiguration.getConfiguration().setProxyConnectors( new ArrayList<ProxyConnectorConfiguration>( 0 ) );
+
         setupSnapshotConnector( REPOID_INTERNAL, remoteSnapshots, snapshotsPolicy );
         saveConfiguration();