You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/05/20 22:08:14 UTC
svn commit: r1125538 [2/2] - in /archiva/trunk: ./
archiva-modules/archiva-base/archiva-configuration/
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/
archiva-modules/archiva-base/archiva-configu...
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml?rev=1125538&r1=1125537&r2=1125538&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml Fri May 20 20:08:12 2011
@@ -19,8 +19,15 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+
+ <context:property-placeholder system-properties-mode="FALLBACK"/>
+ <context:annotation-config/>
+ <context:component-scan base-package="org.apache.maven.archiva.policies"/>
<bean id="urlFailureCache"
class="org.apache.maven.archiva.policies.urlcache.DefaultUrlFailureCache" lazy-init="true">
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java?rev=1125538&r1=1125537&r2=1125538&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java Fri May 20 20:08:12 2011
@@ -19,24 +19,40 @@ package org.apache.maven.archiva.policie
* under the License.
*/
+import junit.framework.TestCase;
+import org.apache.maven.archiva.policies.urlcache.UrlFailureCache;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import javax.inject.Inject;
+import javax.inject.Named;
import java.io.File;
import java.util.Properties;
-import org.apache.maven.archiva.policies.urlcache.UrlFailureCache;
-import org.codehaus.plexus.spring.PlexusInSpringTestCase;
-
/**
* CachedFailuresPolicyTest
*
* @version $Id$
*/
+@RunWith( value = SpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
public class CachedFailuresPolicyTest
- extends PlexusInSpringTestCase
+ extends TestCase
{
+
+
+ @Inject
+ private UrlFailureCache urlFailureCache;
+
+ @Inject @Named(value="preDownloadPolicy#cache-failures")
+ DownloadPolicy downloadPolicy;
+
private DownloadPolicy lookupPolicy()
throws Exception
{
- return (DownloadPolicy) lookup( PreDownloadPolicy.class, "cache-failures" );
+ return downloadPolicy;
}
private File getFile()
@@ -51,6 +67,7 @@ public class CachedFailuresPolicyTest
return request;
}
+ @Test
public void testPolicyNo()
throws Exception
{
@@ -63,9 +80,13 @@ public class CachedFailuresPolicyTest
policy.applyPolicy( CachedFailuresPolicy.NO, request, localFile );
}
+ @Test
public void testPolicyYesNotInCache()
throws Exception
{
+
+ //CacheManager.getInstance().clearAll();
+
DownloadPolicy policy = lookupPolicy();
File localFile = getFile();
Properties request = createRequest();
@@ -75,6 +96,7 @@ public class CachedFailuresPolicyTest
policy.applyPolicy( CachedFailuresPolicy.YES, request, localFile );
}
+ @Test
public void testPolicyYesInCache()
throws Exception
{
@@ -84,7 +106,7 @@ public class CachedFailuresPolicyTest
String url = "http://a.bad.hostname.maven.org/path/to/resource.txt";
- UrlFailureCache urlFailureCache = (UrlFailureCache) lookup( "urlFailureCache" );
+
urlFailureCache.cacheFailure( url );
request.setProperty( "url", url );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java?rev=1125538&r1=1125537&r2=1125538&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java Fri May 20 20:08:12 2011
@@ -19,134 +19,171 @@ package org.apache.maven.archiva.policie
* under the License.
*/
+import junit.framework.TestCase;
+import org.apache.commons.io.FileUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import javax.inject.Inject;
+import javax.inject.Named;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.util.Properties;
-import org.apache.commons.io.FileUtils;
-import org.codehaus.plexus.spring.PlexusInSpringTestCase;
-
/**
* ChecksumPolicyTest
*
* @version $Id$
*/
+@RunWith( value = SpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
public class ChecksumPolicyTest
- extends PlexusInSpringTestCase
+ extends TestCase
{
private static final String GOOD = "good";
private static final String BAD = "bad";
+ @Inject
+ @Named(value="postDownloadPolicy#checksum")
+ PostDownloadPolicy downloadPolicy;
+
+ private PostDownloadPolicy lookupPolicy()
+ throws Exception
+ {
+ return downloadPolicy;
+ }
+
+ @Test
public void testFailOnFileOnly()
throws Exception
{
assertFailSetting( false, null, null );
}
+ @Test
public void testFailOnFileWithBadMd5AndBadSha1()
throws Exception
{
assertFailSetting( false, BAD, BAD );
}
+ @Test
public void testFailOnFileWithBadMd5AndGoodSha1()
throws Exception
{
assertFailSetting( false, BAD, GOOD );
}
+ @Test
public void testFailOnFileWithBadMd5Only()
throws Exception
{
assertFailSetting( false, BAD, null );
}
+ @Test
public void testFailOnFileWithBadSha1Only()
throws Exception
{
assertFailSetting( false, null, BAD );
}
+ @Test
public void testFailOnFileWithGoodMd5AndBadSha1()
throws Exception
{
assertFailSetting( false, GOOD, BAD );
}
+ @Test
public void testFailOnFileWithGoodMd5AndGoodSha1()
throws Exception
{
assertFailSetting( true, GOOD, GOOD );
}
+ @Test
public void testFailOnFileWithGoodMd5Only()
throws Exception
{
assertFailSetting( true, GOOD, null );
}
+ @Test
public void testFailOnFileWithGoodSha1Only()
throws Exception
{
assertFailSetting( true, null, GOOD );
}
+ @Test
public void testFixOnFileOnly()
throws Exception
{
assertFixSetting( true, null, null );
}
+ @Test
public void testFixOnFileWithBadMd5AndBadSha1()
throws Exception
{
assertFixSetting( true, BAD, BAD );
}
+ @Test
public void testFixOnFileWithBadMd5AndGoodSha1()
throws Exception
{
assertFixSetting( true, BAD, GOOD );
}
+ @Test
public void testFixOnFileWithBadMd5Only()
throws Exception
{
assertFixSetting( true, BAD, null );
}
+ @Test
public void testFixOnFileWithBadSha1Only()
throws Exception
{
assertFixSetting( true, null, BAD );
}
+ @Test
public void testFixOnFileWithGoodMd5AndBadSha1()
throws Exception
{
assertFixSetting( true, GOOD, BAD );
}
+ @Test
public void testFixOnFileWithGoodMd5AndGoodSha1()
throws Exception
{
assertFixSetting( true, GOOD, GOOD );
}
+ @Test
public void testFixOnFileWithGoodMd5Only()
throws Exception
{
assertFixSetting( true, GOOD, null );
}
+ @Test
public void testFixOnFileWithGoodSha1Only()
throws Exception
{
assertFixSetting( true, null, GOOD );
}
+ @Test
public void testIgnore()
throws Exception
{
@@ -320,12 +357,22 @@ public class ChecksumPolicyTest
return localFile;
}
- private PostDownloadPolicy lookupPolicy()
- throws Exception
+
+
+ public static String getBasedir()
+ {
+ String basedir = System.getProperty( "basedir" );
+ if ( basedir == null )
+ {
+ basedir = new File( "" ).getAbsolutePath();
+ }
+
+ return basedir;
+ }
+
+ public static File getTestFile( String path )
{
- PostDownloadPolicy policy = (PostDownloadPolicy) lookup( PostDownloadPolicy.class.getName(), "checksum" );
- assertNotNull( policy );
- return policy;
+ return new File( getBasedir(), path );
}
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ReleasePolicyTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ReleasePolicyTest.java?rev=1125538&r1=1125537&r2=1125538&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ReleasePolicyTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ReleasePolicyTest.java Fri May 20 20:08:12 2011
@@ -19,9 +19,16 @@ package org.apache.maven.archiva.policie
* under the License.
*/
+import junit.framework.TestCase;
import org.apache.commons.io.FileUtils;
-import org.codehaus.plexus.spring.PlexusInSpringTestCase;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import javax.inject.Inject;
+import javax.inject.Named;
import java.io.File;
import java.util.Properties;
@@ -30,8 +37,10 @@ import java.util.Properties;
*
* @version $Id$
*/
+@RunWith( value = SpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
public class ReleasePolicyTest
- extends PlexusInSpringTestCase
+ extends TestCase
{
private static final String PATH_VERSION_METADATA = "org/apache/archiva/archiva-testable/1.0-SNAPSHOT/maven-metadata.xml";
@@ -63,6 +72,17 @@ public class ReleasePolicyTest
private long generatedLocalFileUpdateDelta = 0;
+
+ @Inject @Named(value = "preDownloadPolicy#releases")
+ PreDownloadPolicy preDownloadPolicy;
+
+ private PreDownloadPolicy lookupPolicy()
+ throws Exception
+ {
+ return preDownloadPolicy;
+ }
+
+ @Test
public void testReleasePolicyDailyProjectMetadata()
throws Exception
{
@@ -79,6 +99,7 @@ public class ReleasePolicyTest
assertReleasesPolicy( ReleasesPolicy.DAILY, PATH_PROJECT_METADATA, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyDailyReleaseArtifact()
throws Exception
{
@@ -94,6 +115,7 @@ public class ReleasePolicyTest
assertReleasesPolicyViolation( ReleasesPolicy.DAILY, PATH_RELEASE_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyDailySnapshotArtifact()
throws Exception
{
@@ -109,6 +131,7 @@ public class ReleasePolicyTest
assertReleasesPolicy( ReleasesPolicy.DAILY, PATH_SNAPSHOT_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyDailyVersionedMetadata()
throws Exception
{
@@ -125,6 +148,7 @@ public class ReleasePolicyTest
assertReleasesPolicy( ReleasesPolicy.DAILY, PATH_VERSION_METADATA, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyRejectProjectMetadata()
throws Exception
{
@@ -133,6 +157,7 @@ public class ReleasePolicyTest
assertReleasesPolicy( ReleasesPolicy.NEVER, PATH_PROJECT_METADATA, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyRejectReleaseArtifact()
throws Exception
{
@@ -140,6 +165,7 @@ public class ReleasePolicyTest
assertReleasesPolicyViolation( ReleasesPolicy.NEVER, PATH_RELEASE_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyRejectSnapshotArtifact()
throws Exception
{
@@ -147,6 +173,7 @@ public class ReleasePolicyTest
assertReleasesPolicy( ReleasesPolicy.NEVER, PATH_SNAPSHOT_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyRejectVersionedMetadata()
throws Exception
{
@@ -155,6 +182,7 @@ public class ReleasePolicyTest
assertReleasesPolicy( ReleasesPolicy.NEVER, PATH_VERSION_METADATA, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyHourlyProjectMetadata()
throws Exception
{
@@ -171,6 +199,7 @@ public class ReleasePolicyTest
assertReleasesPolicy( ReleasesPolicy.HOURLY, PATH_PROJECT_METADATA, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyHourlyReleaseArtifact()
throws Exception
{
@@ -186,6 +215,7 @@ public class ReleasePolicyTest
assertReleasesPolicyViolation( ReleasesPolicy.HOURLY, PATH_RELEASE_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyHourlySnapshotArtifact()
throws Exception
{
@@ -201,6 +231,7 @@ public class ReleasePolicyTest
assertReleasesPolicy( ReleasesPolicy.HOURLY, PATH_SNAPSHOT_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyHourlyVersionedMetadata()
throws Exception
{
@@ -217,6 +248,7 @@ public class ReleasePolicyTest
assertReleasesPolicy( ReleasesPolicy.HOURLY, PATH_VERSION_METADATA, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyAlwaysProjectMetadata()
throws Exception
{
@@ -225,6 +257,7 @@ public class ReleasePolicyTest
assertReleasesPolicy( ReleasesPolicy.ALWAYS, PATH_PROJECT_METADATA, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyAlwaysReleaseArtifact()
throws Exception
{
@@ -232,6 +265,7 @@ public class ReleasePolicyTest
assertReleasesPolicy( ReleasesPolicy.ALWAYS, PATH_RELEASE_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyAlwaysSnapshotArtifact()
throws Exception
{
@@ -239,6 +273,7 @@ public class ReleasePolicyTest
assertReleasesPolicy( ReleasesPolicy.ALWAYS, PATH_SNAPSHOT_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyAlwaysVersionedMetadata()
throws Exception
{
@@ -247,6 +282,7 @@ public class ReleasePolicyTest
assertReleasesPolicy( ReleasesPolicy.ALWAYS, PATH_VERSION_METADATA, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyOnceProjectMetadata()
throws Exception
{
@@ -255,6 +291,7 @@ public class ReleasePolicyTest
assertReleasesPolicy( ReleasesPolicy.ONCE, PATH_PROJECT_METADATA, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyOnceReleaseArtifact()
throws Exception
{
@@ -262,6 +299,7 @@ public class ReleasePolicyTest
assertReleasesPolicyViolation( ReleasesPolicy.ONCE, PATH_RELEASE_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyOnceSnapshotArtifact()
throws Exception
{
@@ -269,6 +307,7 @@ public class ReleasePolicyTest
assertReleasesPolicy( ReleasesPolicy.ONCE, PATH_SNAPSHOT_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testReleasePolicyOnceVersionedMetadata()
throws Exception
{
@@ -294,7 +333,7 @@ public class ReleasePolicyTest
request.setProperty( "version", "2.0" );
}
- File targetDir = getTestFile( "target/test-policy/" );
+ File targetDir = ChecksumPolicyTest.getTestFile( "target/test-policy/" );
File localFile = new File( targetDir, path );
if ( localFile.exists() )
@@ -326,16 +365,10 @@ public class ReleasePolicyTest
}
}
- private PreDownloadPolicy lookupPolicy()
- throws Exception
- {
- PreDownloadPolicy policy = (PreDownloadPolicy) lookup( PreDownloadPolicy.class.getName(), "releases" );
- assertNotNull( policy );
- return policy;
- }
- @Override
- protected void setUp()
+
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/SnapshotsPolicyTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/SnapshotsPolicyTest.java?rev=1125538&r1=1125537&r2=1125538&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/SnapshotsPolicyTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/SnapshotsPolicyTest.java Fri May 20 20:08:12 2011
@@ -19,19 +19,28 @@ package org.apache.maven.archiva.policie
* under the License.
*/
+import junit.framework.TestCase;
+import org.apache.commons.io.FileUtils;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import javax.inject.Inject;
+import javax.inject.Named;
import java.io.File;
import java.util.Properties;
-import org.apache.commons.io.FileUtils;
-import org.codehaus.plexus.spring.PlexusInSpringTestCase;
-
/**
* SnapshotsPolicyTest
*
* @version $Id$
*/
+@RunWith( value = SpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
public class SnapshotsPolicyTest
- extends PlexusInSpringTestCase
+ extends TestCase
{
private static final String PATH_VERSION_METADATA = "org/apache/archiva/archiva-testable/1.0-SNAPSHOT/maven-metadata.xml";
@@ -63,6 +72,17 @@ public class SnapshotsPolicyTest
private long generatedLocalFileUpdateDelta = 0;
+
+ @Inject @Named(value="preDownloadPolicy#snapshots")
+ PreDownloadPolicy policy;
+
+ private PreDownloadPolicy lookupPolicy()
+ throws Exception
+ {
+ return policy;
+ }
+
+ @Test
public void testSnapshotPolicyDailyProjectMetadata()
throws Exception
{
@@ -79,6 +99,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicy( SnapshotsPolicy.DAILY, PATH_PROJECT_METADATA, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyDailyReleaseArtifact()
throws Exception
{
@@ -94,6 +115,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicy( SnapshotsPolicy.DAILY, PATH_RELEASE_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyDailySnapshotArtifact()
throws Exception
{
@@ -109,6 +131,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicyViolation( SnapshotsPolicy.DAILY, PATH_SNAPSHOT_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyDailyVersionedMetadata()
throws Exception
{
@@ -125,6 +148,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicy( SnapshotsPolicy.DAILY, PATH_VERSION_METADATA, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyRejectProjectMetadata()
throws Exception
{
@@ -133,6 +157,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicy( SnapshotsPolicy.NEVER, PATH_PROJECT_METADATA, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyRejectReleaseArtifact()
throws Exception
{
@@ -140,6 +165,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicy( SnapshotsPolicy.NEVER, PATH_RELEASE_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyRejectSnapshotArtifact()
throws Exception
{
@@ -147,6 +173,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicyViolation( SnapshotsPolicy.NEVER, PATH_SNAPSHOT_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyRejectVersionedMetadata()
throws Exception
{
@@ -155,6 +182,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicy( SnapshotsPolicy.NEVER, PATH_VERSION_METADATA, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyHourlyProjectMetadata()
throws Exception
{
@@ -171,6 +199,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicy( SnapshotsPolicy.HOURLY, PATH_PROJECT_METADATA, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyHourlyReleaseArtifact()
throws Exception
{
@@ -186,6 +215,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicy( SnapshotsPolicy.HOURLY, PATH_RELEASE_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyHourlySnapshotArtifact()
throws Exception
{
@@ -201,6 +231,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicyViolation( SnapshotsPolicy.HOURLY, PATH_SNAPSHOT_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyHourlyVersionedMetadata()
throws Exception
{
@@ -217,6 +248,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicy( SnapshotsPolicy.HOURLY, PATH_VERSION_METADATA, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyAlwaysProjectMetadata()
throws Exception
{
@@ -225,6 +257,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicy( SnapshotsPolicy.ALWAYS, PATH_PROJECT_METADATA, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyAlwaysReleaseArtifact()
throws Exception
{
@@ -232,6 +265,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicy( SnapshotsPolicy.ALWAYS, PATH_RELEASE_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyAlwaysSnapshotArtifact()
throws Exception
{
@@ -239,6 +273,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicy( SnapshotsPolicy.ALWAYS, PATH_SNAPSHOT_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyAlwaysVersionedMetadata()
throws Exception
{
@@ -247,6 +282,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicy( SnapshotsPolicy.ALWAYS, PATH_VERSION_METADATA, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyOnceProjectMetadata()
throws Exception
{
@@ -255,6 +291,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicy( SnapshotsPolicy.ONCE, PATH_PROJECT_METADATA, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyOnceReleaseArtifact()
throws Exception
{
@@ -262,6 +299,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicy( SnapshotsPolicy.ONCE, PATH_RELEASE_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyOnceSnapshotArtifact()
throws Exception
{
@@ -269,6 +307,7 @@ public class SnapshotsPolicyTest
assertSnapshotPolicyViolation( SnapshotsPolicy.ONCE, PATH_SNAPSHOT_ARTIFACT, WITH_LOCAL );
}
+ @Test
public void testSnapshotPolicyOnceVersionedMetadata()
throws Exception
{
@@ -294,7 +333,7 @@ public class SnapshotsPolicyTest
request.setProperty( "version", "2.0" );
}
- File targetDir = getTestFile( "target/test-policy/" );
+ File targetDir = ChecksumPolicyTest.getTestFile( "target/test-policy/" );
File localFile = new File( targetDir, path );
if ( localFile.exists() )
@@ -326,16 +365,11 @@ public class SnapshotsPolicyTest
}
}
- private PreDownloadPolicy lookupPolicy()
- throws Exception
- {
- PreDownloadPolicy policy = (PreDownloadPolicy) lookup( PreDownloadPolicy.class.getName(), "snapshots" );
- assertNotNull( policy );
- return policy;
- }
+
@Override
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
Added: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml?rev=1125538&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml (added)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml Fri May 20 20:08:12 2011
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd"
+ default-lazy-init="true">
+
+ <context:property-placeholder system-properties-mode="OVERRIDE"/>
+
+ <bean name="url-failures-cache" class="org.codehaus.plexus.cache.ehcache.EhcacheCache">
+ <property name="diskExpiryThreadIntervalSeconds" value="600"/>
+ <property name="diskPersistent" value="false"/>
+ <property name="eternal" value="false"/>
+ <property name="maxElementsInMemory" value="1000"/>
+ <property name="memoryEvictionPolicy" value="LRU"/>
+ <property name="name" value="cache"/>
+ <property name="overflowToDisk" value="false"/>
+ <property name="timeToIdleSeconds" value="2700"/>
+ <property name="timeToLiveSeconds" value="1800"/>
+ </bean>
+
+</beans>
\ No newline at end of file
Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java?rev=1125538&r1=1125537&r2=1125538&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/MockConfiguration.java Fri May 20 20:08:12 2011
@@ -101,4 +101,9 @@ public class MockConfiguration
{
return false;
}
+
+ public void reload()
+ {
+ // no op
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/MockConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/MockConfiguration.java?rev=1125538&r1=1125537&r2=1125538&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/MockConfiguration.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/MockConfiguration.java Fri May 20 20:08:12 2011
@@ -101,4 +101,9 @@ public class MockConfiguration
{
return false;
}
+
+ public void reload()
+ {
+ // no op
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java?rev=1125538&r1=1125537&r2=1125538&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java Fri May 20 20:08:12 2011
@@ -61,4 +61,9 @@ public class TestConfiguration
{
throw new UnsupportedOperationException();
}
+
+ public void reload()
+ {
+ // no op
+ }
}
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java?rev=1125538&r1=1125537&r2=1125538&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java Fri May 20 20:08:12 2011
@@ -61,4 +61,9 @@ public class TestConfiguration
{
throw new UnsupportedOperationException();
}
+
+ public void reload()
+ {
+ // no op
+ }
}
Modified: archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/configuration/StubConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/configuration/StubConfiguration.java?rev=1125538&r1=1125537&r2=1125538&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/configuration/StubConfiguration.java (original)
+++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/java/org/apache/archiva/configuration/StubConfiguration.java Fri May 20 20:08:12 2011
@@ -61,4 +61,9 @@ public class StubConfiguration
{
throw new UnsupportedOperationException();
}
+
+ public void reload()
+ {
+ // no op
+ }
}
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1125538&r1=1125537&r2=1125538&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Fri May 20 20:08:12 2011
@@ -553,6 +553,11 @@
</dependency>
<dependency>
<groupId>org.codehaus.redback.components</groupId>
+ <artifactId>spring-utils</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.redback.components</groupId>
<artifactId>plexus-spring</artifactId>
<version>1.3-SNAPSHOT</version>
<exclusions>
@@ -573,6 +578,38 @@
<version>1.4</version>
</dependency>
<dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ </exclusion>
+ <!-- targeting JDK 1.5, xml parser/apis not needed -->
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2</version>
@@ -1162,6 +1199,17 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.0</version>