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

[olamy]

Author: olamy
Date: Wed Jun 15 11:54:15 2011
New Revision: 1136005

URL: http://svn.apache.org/viewvc?rev=1136005&view=rev
Log:
cleanup archivaConfiguration before new test

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/RepositoryServletProxiedPluginSnapshotPolicyTest.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=1136005&r1=1136004&r2=1136005&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 
11:54:15 2011
@@ -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>

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java?rev=1136005&r1=1136004&r2=1136005&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletProxiedPluginSnapshotPolicyTest.java
 Wed Jun 15 11:54:15 2011
@@ -24,10 +24,12 @@ import com.meterware.httpunit.HttpUnitOp
 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 RepositoryServletProxiedPlu
             managedFile.setLastModified( remoteFile.lastModified() + 
deltaManagedToRemoteTimestamp );
         }
 
+        archivaConfiguration.getConfiguration().setProxyConnectors( new 
ArrayList<ProxyConnectorConfiguration>( 0 ) );
+
         setupSnapshotConnector( REPOID_INTERNAL, remoteSnapshots, 
snapshotsPolicy );
         saveConfiguration();