You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/04/13 17:48:29 UTC
svn commit: r528532 - in
/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies:
./ src/main/java/org/apache/maven/archiva/policies/
src/main/java/org/apache/maven/archiva/policies/urlcache/
src/main/resources/META-INF/ sr...
Author: joakime
Date: Fri Apr 13 08:48:27 2007
New Revision: 528532
URL: http://svn.apache.org/viewvc?view=rev&rev=528532
Log:
* Adding CachedFailuresPolicy.
* Adding UrlFailureCache component.
* Adding unit tests for cache-failures and checksum policies.
Added:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java (with props)
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/urlcache/
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/urlcache/DefaultUrlFailureCache.java (with props)
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/urlcache/UrlFailureCache.java (with props)
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/resources/META-INF/
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/resources/META-INF/plexus/
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/resources/META-INF/plexus/components.xml (with props)
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java (with props)
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java (with props)
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar (with props)
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.md5-bad
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.md5-good
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.sha1-bad
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.sha1-good
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/log4j.xml (with props)
Modified:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/pom.xml
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/DownloadPolicy.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java
Modified: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/pom.xml?view=diff&rev=528532&r1=528531&r2=528532
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/pom.xml (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/pom.xml Fri Apr 13 08:48:27 2007
@@ -42,6 +42,11 @@
<artifactId>plexus-digest</artifactId>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus.cache</groupId>
+ <artifactId>plexus-cache-ehcache</artifactId>
+ <version>1.0-alpha-2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
<version>1.2_Java1.3</version>
@@ -60,4 +65,26 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>merge</id>
+ <goals>
+ <goal>merge-descriptors</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>${basedir}/src/main/resources/META-INF/plexus/components.xml</descriptor>
+ <descriptor>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java?view=auto&rev=528532
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java (added)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java Fri Apr 13 08:48:27 2007
@@ -0,0 +1,96 @@
+package org.apache.maven.archiva.policies;
+
+/*
+ * 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.
+ */
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.maven.archiva.policies.urlcache.UrlFailureCache;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+
+/**
+ * {@link PreDownloadPolicy} to check if the requested url has failed before.
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ *
+ * @plexus.component role="org.apache.maven.archiva.policies.PreDownloadPolicy"
+ * role-hint="cache-failures"
+ */
+public class CachedFailuresPolicy
+ extends AbstractLogEnabled
+ implements PreDownloadPolicy
+{
+ /**
+ * The CACHED policy indicates that if the URL provided exists in the
+ * cached failures pool, then the policy fails, and the download isn't even
+ * attempted.
+ */
+ public static final String CACHED = "cached";
+
+ /**
+ * @plexus.requirement role-hint="default"
+ */
+ private UrlFailureCache urlFailureCache;
+
+ private Set validPolicyCodes = new HashSet();
+
+ public CachedFailuresPolicy()
+ {
+ validPolicyCodes.add( IGNORED );
+ validPolicyCodes.add( CACHED );
+ }
+
+ public boolean applyPolicy( String policySetting, Properties request, File localFile )
+ {
+ if ( !validPolicyCodes.contains( policySetting ) )
+ {
+ // No valid code? false it is then.
+ getLogger().error( "Unknown checksum policyCode [" + policySetting + "]" );
+ return false;
+ }
+
+ if ( IGNORED.equals( policySetting ) )
+ {
+ // Ignore.
+ return true;
+ }
+
+ String url = request.getProperty( "url" );
+
+ if ( StringUtils.isNotBlank( url ) )
+ {
+ if ( urlFailureCache.hasFailedBefore( url ) )
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ public String getDefaultPolicySetting()
+ {
+ return IGNORED;
+ }
+}
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java?view=diff&rev=528532&r1=528531&r2=528532
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java Fri Apr 13 08:48:27 2007
@@ -1,5 +1,24 @@
package org.apache.maven.archiva.policies;
+/*
+ * 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.
+ */
+
import org.codehaus.plexus.digest.ChecksumFile;
import org.codehaus.plexus.digest.Digester;
import org.codehaus.plexus.digest.DigesterException;
@@ -12,6 +31,15 @@
import java.util.Properties;
import java.util.Set;
+/**
+ * ChecksumPolicy
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ *
+ * @plexus.component role="org.apache.maven.archiva.policies.PostDownloadPolicy"
+ * role-hint="checksum"
+ */
public class ChecksumPolicy
extends AbstractLogEnabled
implements PostDownloadPolicy
@@ -31,13 +59,6 @@
public static final String FIX = "fix";
/**
- * The IGNORE policy indicates that the checksum is never tested
- * and even bad downloads and checksum files are left in place
- * on the local repository.
- */
- public static final String IGNORED = "ignored";
-
- /**
* @plexus.requirement role-hint="sha1"
*/
private Digester digestSha1;
@@ -88,147 +109,170 @@
if ( FAIL.equals( policySetting ) )
{
+ boolean checksPass = true;
+
+ // Both files missing is a failure.
if ( !sha1File.exists() && !md5File.exists() )
{
- getLogger().error( "File " + localFile.getAbsolutePath() + " has no checksum files (sha1 or md5)." );
- localFile.delete();
- return false;
+ getLogger().error( "File " + localFile.getPath() + " has no checksum files (sha1 or md5)." );
+ checksPass = false;
}
- // Test for sha1 first, then md5
-
if ( sha1File.exists() )
{
- try
+ // Bad sha1 checksum is a failure.
+ if ( !validateChecksum( sha1File, "sha1" ) )
{
- return checksumFile.isValidChecksum( sha1File );
- }
- catch ( FileNotFoundException e )
- {
- getLogger().warn( "Unable to find sha1 file: " + sha1File.getAbsolutePath(), e );
- return false;
- }
- catch ( DigesterException e )
- {
- getLogger().warn( "Unable to process sha1 file: " + sha1File.getAbsolutePath(), e );
- return false;
- }
- catch ( IOException e )
- {
- getLogger().warn( "Unable to process sha1 file: " + sha1File.getAbsolutePath(), e );
- return false;
+ getLogger().warn( "SHA1 is incorrect for " + localFile.getPath() );
+ checksPass = false;
}
}
if ( md5File.exists() )
{
- try
- {
- return checksumFile.isValidChecksum( md5File );
- }
- catch ( FileNotFoundException e )
+ // Bad md5 checksum is a failure.
+ if ( !validateChecksum( md5File, "md5" ) )
{
- getLogger().warn( "Unable to find md5 file: " + md5File.getAbsolutePath(), e );
- return false;
+ getLogger().warn( "MD5 is incorrect for " + localFile.getPath() );
+ checksPass = false;
}
- catch ( DigesterException e )
+ }
+
+ if ( !checksPass )
+ {
+ // On failure. delete files.
+ if ( sha1File.exists() )
{
- getLogger().warn( "Unable to process md5 file: " + md5File.getAbsolutePath(), e );
- return false;
+ sha1File.delete();
}
- catch ( IOException e )
+
+ if ( md5File.exists() )
{
- getLogger().warn( "Unable to process md5 file: " + md5File.getAbsolutePath(), e );
- return false;
+ md5File.delete();
}
+
+ localFile.delete();
}
+
+ return checksPass;
}
if ( FIX.equals( policySetting ) )
{
- if ( !sha1File.exists() )
+ boolean checksPass = true;
+
+ if ( !fixChecksum( localFile, sha1File, digestSha1 ) )
{
- try
- {
- checksumFile.createChecksum( localFile, digestSha1 );
- }
- catch ( DigesterException e )
- {
- getLogger().warn( "Unable to create sha1 file: " + e.getMessage(), e );
- return false;
- }
- catch ( IOException e )
- {
- getLogger().warn( "Unable to create sha1 file: " + e.getMessage(), e );
- return false;
- }
+ checksPass = false;
}
- else
+
+ if ( !fixChecksum( localFile, md5File, digestMd5 ) )
{
- try
- {
- checksumFile.isValidChecksum( sha1File );
- }
- catch ( FileNotFoundException e )
- {
- getLogger().warn( "Unable to find sha1 file: " + sha1File.getAbsolutePath(), e );
- return false;
- }
- catch ( DigesterException e )
- {
- getLogger().warn( "Unable to process sha1 file: " + sha1File.getAbsolutePath(), e );
- return false;
- }
- catch ( IOException e )
- {
- getLogger().warn( "Unable to process sha1 file: " + sha1File.getAbsolutePath(), e );
- return false;
- }
+ checksPass = false;
}
- if ( !md5File.exists() )
+ return checksPass;
+ }
+
+ getLogger().error( "Unhandled policyCode [" + policySetting + "]" );
+ return false;
+ }
+
+ private boolean createChecksum( File localFile, Digester digester )
+ {
+ try
+ {
+ checksumFile.createChecksum( localFile, digester );
+ return true;
+ }
+ catch ( DigesterException e )
+ {
+ getLogger().warn( "Unable to create " + digester.getFilenameExtension() + " file: " + e.getMessage(), e );
+ return false;
+ }
+ catch ( IOException e )
+ {
+ getLogger().warn( "Unable to create " + digester.getFilenameExtension() + " file: " + e.getMessage(), e );
+ return false;
+ }
+ }
+
+ private boolean fixChecksum( File localFile, File hashFile, Digester digester )
+ {
+ String ext = digester.getFilenameExtension();
+
+ if ( !hashFile.getPath().endsWith( ext ) )
+ {
+ throw new IllegalArgumentException( "Cannot fix " + hashFile.getPath() + " using " + ext + " digester." );
+ }
+
+ // If hashfile doesn't exist, create it.
+ if ( !hashFile.exists() )
+ {
+ return createChecksum( localFile, digester );
+ }
+
+ // Validate checksum, if bad, recreate it.
+ try
+ {
+ if ( checksumFile.isValidChecksum( hashFile ) )
{
- try
- {
- checksumFile.createChecksum( localFile, digestMd5 );
- }
- catch ( DigesterException e )
- {
- getLogger().warn( "Unable to create md5 file: " + e.getMessage(), e );
- return false;
- }
- catch ( IOException e )
- {
- getLogger().warn( "Unable to create md5 file: " + e.getMessage(), e );
- return false;
- }
+ getLogger().debug( "Valid checksum: " + hashFile.getPath() );
+ return true;
}
else
{
- try
- {
- return checksumFile.isValidChecksum( md5File );
- }
- catch ( FileNotFoundException e )
- {
- getLogger().warn( "Unable to find md5 file: " + md5File.getAbsolutePath(), e );
- return false;
- }
- catch ( DigesterException e )
- {
- getLogger().warn( "Unable to process md5 file: " + md5File.getAbsolutePath(), e );
- return false;
- }
- catch ( IOException e )
- {
- getLogger().warn( "Unable to process md5 file: " + md5File.getAbsolutePath(), e );
- return false;
- }
+ getLogger().debug( "Not valid checksum: " + hashFile.getPath() );
+ return createChecksum( localFile, digester );
}
}
+ catch ( FileNotFoundException e )
+ {
+ getLogger().warn( "Unable to find " + ext + " file: " + hashFile.getAbsolutePath(), e );
+ return false;
+ }
+ catch ( DigesterException e )
+ {
+ getLogger().warn( "Unable to process " + ext + " file: " + hashFile.getAbsolutePath(), e );
+ return false;
+ }
+ catch ( IOException e )
+ {
+ getLogger().warn( "Unable to process " + ext + " file: " + hashFile.getAbsolutePath(), e );
+ return false;
+ }
+ }
- getLogger().error( "Unhandled policyCode [" + policySetting + "]" );
- return false;
+ private boolean validateChecksum( File hashFile, String type )
+ {
+ try
+ {
+ boolean validity = checksumFile.isValidChecksum( hashFile );
+ if ( validity )
+ {
+ getLogger().debug( "Valid checksum: " + hashFile.getPath() );
+ }
+ else
+ {
+ getLogger().debug( "Not valid checksum: " + hashFile.getPath() );
+ }
+ return validity;
+ }
+ catch ( FileNotFoundException e )
+ {
+ getLogger().warn( "Unable to find " + type + " file: " + hashFile.getAbsolutePath(), e );
+ return false;
+ }
+ catch ( DigesterException e )
+ {
+ getLogger().warn( "Unable to process " + type + " file: " + hashFile.getAbsolutePath(), e );
+ return false;
+ }
+ catch ( IOException e )
+ {
+ getLogger().warn( "Unable to process " + type + " file: " + hashFile.getAbsolutePath(), e );
+ return false;
+ }
}
public String getDefaultPolicySetting()
Modified: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/DownloadPolicy.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/DownloadPolicy.java?view=diff&rev=528532&r1=528531&r2=528532
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/DownloadPolicy.java (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/DownloadPolicy.java Fri Apr 13 08:48:27 2007
@@ -35,6 +35,9 @@
*/
public static final String IGNORED = "ignored";
+ public static final boolean PASS = true;
+ public static final boolean FAIL = false;
+
/**
* Get the default policy setting.
*
Modified: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java?view=diff&rev=528532&r1=528531&r2=528532
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java Fri Apr 13 08:48:27 2007
@@ -26,7 +26,7 @@
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*
- * @plexus.component role="org.apache.maven.archiva.policies.download.PreDownloadPolicy"
+ * @plexus.component role="org.apache.maven.archiva.policies.PreDownloadPolicy"
* role-hint="releases"
*/
public class ReleasesPolicy
Modified: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java?view=diff&rev=528532&r1=528531&r2=528532
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java Fri Apr 13 08:48:27 2007
@@ -26,8 +26,8 @@
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
* @version $Id$
*
- * @plexus.component role="org.apache.maven.archiva.policies.download.PreDownloadPolicy"
- * role-hint="releases"
+ * @plexus.component role="org.apache.maven.archiva.policies.PreDownloadPolicy"
+ * role-hint="snapshots"
*/
public class SnapshotsPolicy
extends AbstractUpdatePolicy
Added: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/urlcache/DefaultUrlFailureCache.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/urlcache/DefaultUrlFailureCache.java?view=auto&rev=528532
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/urlcache/DefaultUrlFailureCache.java (added)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/urlcache/DefaultUrlFailureCache.java Fri Apr 13 08:48:27 2007
@@ -0,0 +1,58 @@
+package org.apache.maven.archiva.policies.urlcache;
+
+/*
+ * 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.
+ */
+
+import org.codehaus.plexus.cache.Cache;
+
+import java.util.Date;
+
+/**
+ * DefaultUrlFailureCache
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ *
+ * @plexus.component role="org.apache.maven.archiva.policies.urlcache.UrlFailureCache"
+ * role-hint="default"
+ */
+public class DefaultUrlFailureCache
+ implements UrlFailureCache
+{
+ /**
+ * @plexus.requirement role-hint="url-failures-cache"
+ */
+ private Cache urlCache;
+
+ public void cacheFailure( String url )
+ {
+ urlCache.register( url, new Date() );
+ }
+
+ public boolean hasFailedBefore( String url )
+ {
+ if ( urlCache.hasKey( url ) )
+ {
+ urlCache.register( url, new Date() );
+ return true;
+ }
+
+ return false;
+ }
+}
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/urlcache/DefaultUrlFailureCache.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/urlcache/DefaultUrlFailureCache.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/urlcache/DefaultUrlFailureCache.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/urlcache/UrlFailureCache.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/urlcache/UrlFailureCache.java?view=auto&rev=528532
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/urlcache/UrlFailureCache.java (added)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/urlcache/UrlFailureCache.java Fri Apr 13 08:48:27 2007
@@ -0,0 +1,48 @@
+package org.apache.maven.archiva.policies.urlcache;
+
+/*
+ * 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.
+ */
+
+
+/**
+ * Cache for requested URLs that cannot be fetched.
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public interface UrlFailureCache
+{
+ /**
+ * Store a URL in the cache as failed.
+ *
+ * @param url the url to store.
+ */
+ public void cacheFailure( String url );
+
+ /**
+ * Test if a specified URL has failed before.
+ *
+ * NOTE: If the provided URL has failed, then making this call
+ * should refresh the expiration time on that URL entry.
+ *
+ * @param url the URL to test.
+ * @return true if it has failed before, false if not.
+ */
+ public boolean hasFailedBefore( String url );
+}
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/urlcache/UrlFailureCache.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/urlcache/UrlFailureCache.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/urlcache/UrlFailureCache.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/resources/META-INF/plexus/components.xml?view=auto&rev=528532
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/resources/META-INF/plexus/components.xml (added)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/resources/META-INF/plexus/components.xml Fri Apr 13 08:48:27 2007
@@ -0,0 +1,24 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.codehaus.plexus.cache.Cache</role>
+ <role-hint>url-failures-cache</role-hint>
+ <implementation>org.codehaus.plexus.cache.ehcache.EhcacheCache</implementation>
+ <description>URL Failure Cache</description>
+ <configuration>
+ <disk-expiry-thread-interval-seconds>600</disk-expiry-thread-interval-seconds>
+ <disk-persistent>true</disk-persistent>
+ <disk-store-path>${java.io.tmpdir}/archiva/urlcache</disk-store-path>
+ <eternal>false</eternal>
+ <max-elements-in-memory>1000</max-elements-in-memory>
+ <memory-eviction-policy>LRU</memory-eviction-policy>
+ <name>cache</name>
+ <overflow-to-disk>false</overflow-to-disk>
+ <!-- 45 minutes = 2700 seconds -->
+ <time-to-idle-seconds>2700</time-to-idle-seconds>
+ <!-- 30 minutes = 1800 seconds -->
+ <time-to-live-seconds>1800</time-to-live-seconds>
+ </configuration>
+ </component>
+ </components>
+</component-set>
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java?view=auto&rev=528532
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java (added)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java Fri Apr 13 08:48:27 2007
@@ -0,0 +1,102 @@
+package org.apache.maven.archiva.policies;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.archiva.policies.urlcache.UrlFailureCache;
+import org.codehaus.plexus.PlexusTestCase;
+
+import java.io.File;
+import java.util.Properties;
+
+/**
+ * CachedFailuresPolicyTest
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class CachedFailuresPolicyTest
+ extends PlexusTestCase
+{
+ private DownloadPolicy lookupPolicy()
+ throws Exception
+ {
+ return (DownloadPolicy) lookup( PreDownloadPolicy.class.getName(), "cache-failures" );
+ }
+
+ private UrlFailureCache lookupUrlFailureCache()
+ throws Exception
+ {
+ return (UrlFailureCache) lookup( UrlFailureCache.class.getName(), "default" );
+ }
+
+ private File getFile()
+ {
+ return new File( "target/cache-failures/" + getName() + ".txt" );
+ }
+
+ private Properties createRequest()
+ {
+ Properties request = new Properties();
+
+ return request;
+ }
+
+ public void testIgnored()
+ throws Exception
+ {
+ DownloadPolicy policy = lookupPolicy();
+ File localFile = getFile();
+ Properties request = createRequest();
+
+ request.setProperty( "url", "http://a.bad.hostname.maven.org/path/to/resource.txt" );
+
+ assertTrue( policy.applyPolicy( CachedFailuresPolicy.IGNORED, request, localFile ) );
+ }
+
+ public void testCachedNotInCache()
+ throws Exception
+ {
+ DownloadPolicy policy = lookupPolicy();
+ File localFile = getFile();
+ Properties request = createRequest();
+
+ request.setProperty( "url", "http://a.bad.hostname.maven.org/path/to/resource.txt" );
+
+ assertTrue( policy.applyPolicy( CachedFailuresPolicy.CACHED, request, localFile ) );
+ }
+
+ public void testCachedInCache()
+ throws Exception
+ {
+ UrlFailureCache urlFailureCache = lookupUrlFailureCache();
+
+ DownloadPolicy policy = lookupPolicy();
+ File localFile = getFile();
+ Properties request = createRequest();
+
+ String url = "http://a.bad.hostname.maven.org/path/to/resource.txt";
+
+ urlFailureCache.cacheFailure( url );
+
+ request.setProperty( "url", url );
+
+ assertFalse( policy.applyPolicy( CachedFailuresPolicy.CACHED, request, localFile ) );
+ }
+}
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/CachedFailuresPolicyTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java?view=auto&rev=528532
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java (added)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java Fri Apr 13 08:48:27 2007
@@ -0,0 +1,314 @@
+package org.apache.maven.archiva.policies;
+
+/*
+ * 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.
+ */
+
+import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.util.FileUtils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.Properties;
+
+/**
+ * ChecksumPolicyTest
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class ChecksumPolicyTest
+ extends PlexusTestCase
+{
+ private static final String GOOD = "good";
+
+ private static final String BAD = "bad";
+
+ public void testFailOnFileOnly()
+ throws Exception
+ {
+ assertFailSetting( false, null, null );
+ }
+
+ public void testFailOnFileWithBadMd5AndBadSha1()
+ throws Exception
+ {
+ assertFailSetting( false, BAD, BAD );
+ }
+
+ public void testFailOnFileWithBadMd5AndGoodSha1()
+ throws Exception
+ {
+ assertFailSetting( false, BAD, GOOD );
+ }
+
+ public void testFailOnFileWithBadMd5Only()
+ throws Exception
+ {
+ assertFailSetting( false, BAD, null );
+ }
+
+ public void testFailOnFileWithBadSha1Only()
+ throws Exception
+ {
+ assertFailSetting( false, null, BAD );
+ }
+
+ public void testFailOnFileWithGoodMd5AndBadSha1()
+ throws Exception
+ {
+ assertFailSetting( false, GOOD, BAD );
+ }
+
+ public void testFailOnFileWithGoodMd5AndGoodSha1()
+ throws Exception
+ {
+ assertFailSetting( true, GOOD, GOOD );
+ }
+
+ public void testFailOnFileWithGoodMd5Only()
+ throws Exception
+ {
+ assertFailSetting( true, GOOD, null );
+ }
+
+ public void testFailOnFileWithGoodSha1Only()
+ throws Exception
+ {
+ assertFailSetting( true, null, GOOD );
+ }
+
+ public void testFixOnFileOnly()
+ throws Exception
+ {
+ assertFixSetting( true, null, null );
+ }
+
+ public void testFixOnFileWithBadMd5AndBadSha1()
+ throws Exception
+ {
+ assertFixSetting( true, BAD, BAD );
+ }
+
+ public void testFixOnFileWithBadMd5AndGoodSha1()
+ throws Exception
+ {
+ assertFixSetting( true, BAD, GOOD );
+ }
+
+ public void testFixOnFileWithBadMd5Only()
+ throws Exception
+ {
+ assertFixSetting( true, BAD, null );
+ }
+
+ public void testFixOnFileWithBadSha1Only()
+ throws Exception
+ {
+ assertFixSetting( true, null, BAD );
+ }
+
+ public void testFixOnFileWithGoodMd5AndBadSha1()
+ throws Exception
+ {
+ assertFixSetting( true, GOOD, BAD );
+ }
+
+ public void testFixOnFileWithGoodMd5AndGoodSha1()
+ throws Exception
+ {
+ assertFixSetting( true, GOOD, GOOD );
+ }
+
+ public void testFixOnFileWithGoodMd5Only()
+ throws Exception
+ {
+ assertFixSetting( true, GOOD, null );
+ }
+
+ public void testFixOnFileWithGoodSha1Only()
+ throws Exception
+ {
+ assertFixSetting( true, null, GOOD );
+ }
+
+ public void testIgnored()
+ throws Exception
+ {
+ PostDownloadPolicy policy = lookupPolicy();
+ File localFile = createTestableFiles( null, null );
+ Properties request = createRequest();
+
+ assertTrue( policy.applyPolicy( ChecksumPolicy.IGNORED, request, localFile ) );
+ }
+
+ private void assertFailSetting( boolean expectedResult, String md5State, String sha1State )
+ throws Exception
+ {
+ PostDownloadPolicy policy = lookupPolicy();
+ File localFile = createTestableFiles( md5State, sha1State );
+ Properties request = createRequest();
+
+ boolean actualResult = policy.applyPolicy( ChecksumPolicy.FAIL, request, localFile );
+ String msg = createMessage( ChecksumPolicy.FAIL, md5State, sha1State );
+
+ if ( actualResult == false )
+ {
+ assertFalse( msg + " local file should not exist:", localFile.exists() );
+ File md5File = new File( localFile.getAbsolutePath() + ".sha1" );
+ File sha1File = new File( localFile.getAbsolutePath() + ".md5" );
+ assertFalse( msg + " local md5 file should not exist:", md5File.exists() );
+ assertFalse( msg + " local sha1 file should not exist:", sha1File.exists() );
+ }
+
+ assertEquals( createMessage( ChecksumPolicy.FAIL, md5State, sha1State ), expectedResult, actualResult );
+ }
+
+ private void assertFixSetting( boolean expectedResult, String md5State, String sha1State )
+ throws Exception
+ {
+ PostDownloadPolicy policy = lookupPolicy();
+ File localFile = createTestableFiles( md5State, sha1State );
+ Properties request = createRequest();
+
+ boolean actualResult = policy.applyPolicy( ChecksumPolicy.FIX, request, localFile );
+ assertEquals( createMessage( ChecksumPolicy.FIX, md5State, sha1State ), expectedResult, actualResult );
+
+ // End result should be legitimate SHA1 and MD5 files.
+ File md5File = new File( localFile.getAbsolutePath() + ".md5" );
+ File sha1File = new File( localFile.getAbsolutePath() + ".sha1" );
+
+ assertTrue( "ChecksumPolicy.apply(FIX) md5 should exist.", md5File.exists() && md5File.isFile() );
+ assertTrue( "ChecksumPolicy.apply(FIX) sha1 should exist.", sha1File.exists() && sha1File.isFile() );
+
+ String actualMd5Contents = readChecksumFile( md5File );
+ String actualSha1Contents = readChecksumFile( sha1File );
+
+ String expectedMd5Contents = "360ccd01d8a0a2d94b86f9802c2fc548 artifact.jar";
+ String expectedSha1Contents = "7dd8929150664f182db60ad15f20359d875f059f artifact.jar";
+
+ assertEquals( "ChecksumPolicy.apply(FIX) md5 contents:", expectedMd5Contents, actualMd5Contents );
+ assertEquals( "ChecksumPolicy.apply(FIX) sha1 contents:", expectedSha1Contents, actualSha1Contents );
+ }
+
+ /**
+ * Read the first line from the checksum file, and return it (trimmed).
+ */
+ private String readChecksumFile( File checksumFile )
+ throws Exception
+ {
+ FileReader freader = null;
+ BufferedReader buf = null;
+
+ try
+ {
+ freader = new FileReader( checksumFile );
+ buf = new BufferedReader( freader );
+ return buf.readLine();
+ }
+ finally
+ {
+ if ( buf != null )
+ {
+ buf.close();
+ }
+
+ if ( freader != null )
+ {
+ freader.close();
+ }
+ }
+ }
+
+ private String createMessage( String settingType, String md5State, String sha1State )
+ {
+ StringBuffer msg = new StringBuffer();
+ msg.append( "Expected result of ChecksumPolicy.apply(" );
+ msg.append( settingType.toUpperCase() );
+ msg.append( ") when working with " );
+ if ( md5State == null )
+ {
+ msg.append( "NO" );
+ }
+ else
+ {
+ msg.append( "a " ).append( md5State.toUpperCase() );
+ }
+
+ msg.append( " MD5 and " );
+
+ if ( sha1State == null )
+ {
+ msg.append( "NO" );
+ }
+ else
+ {
+ msg.append( "a " ).append( sha1State.toUpperCase() );
+ }
+ msg.append( " SHA1:" );
+
+ return msg.toString();
+ }
+
+ private Properties createRequest()
+ {
+ Properties request = new Properties();
+
+ request.setProperty( "url", "http://a.bad.hostname.maven.org/path/to/resource.txt" );
+
+ return request;
+ }
+
+ private File createTestableFiles( String md5State, String sha1State )
+ throws Exception
+ {
+ File sourceDir = new File( "src/test/resources/checksums/" );
+ File destDir = new File( "target/checksum-tests/" + getName() + "/" );
+
+ FileUtils.copyFileToDirectory( new File( sourceDir, "artifact.jar" ), destDir );
+
+ if ( md5State != null )
+ {
+ File md5File = new File( sourceDir, "artifact.jar.md5-" + md5State );
+ assertTrue( "Testable file exists: " + md5File.getName() + ":", md5File.exists() && md5File.isFile() );
+ File destFile = new File( destDir, "artifact.jar.md5" );
+ FileUtils.copyFile( md5File, destFile );
+ }
+
+ if ( sha1State != null )
+ {
+ File sha1File = new File( sourceDir, "artifact.jar.sha1-" + sha1State );
+ assertTrue( "Testable file exists: " + sha1File.getName() + ":", sha1File.exists() && sha1File.isFile() );
+ File destFile = new File( destDir, "artifact.jar.sha1" );
+ FileUtils.copyFile( sha1File, destFile );
+ }
+
+ File localFile = new File( destDir, "artifact.jar" );
+ return localFile;
+ }
+
+ private PostDownloadPolicy lookupPolicy()
+ throws Exception
+ {
+ PostDownloadPolicy policy = (PostDownloadPolicy) lookup( PostDownloadPolicy.class.getName(), "checksum" );
+ assertNotNull( policy );
+ return policy;
+ }
+
+}
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/java/org/apache/maven/archiva/policies/ChecksumPolicyTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar?view=auto&rev=528532
==============================================================================
Binary file - no diff available.
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar
------------------------------------------------------------------------------
svn:mime-type = application/java-archive
Added: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.md5-bad
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.md5-bad?view=auto&rev=528532
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.md5-bad (added)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.md5-bad Fri Apr 13 08:48:27 2007
@@ -0,0 +1 @@
+444ccc111aaa222999888eee222fff00 artifact.jar
Added: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.md5-good
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.md5-good?view=auto&rev=528532
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.md5-good (added)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.md5-good Fri Apr 13 08:48:27 2007
@@ -0,0 +1 @@
+360ccd01d8a0a2d94b86f9802c2fc548 artifact.jar
Added: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.sha1-bad
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.sha1-bad?view=auto&rev=528532
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.sha1-bad (added)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.sha1-bad Fri Apr 13 08:48:27 2007
@@ -0,0 +1 @@
+ddd888999000444888bbbaaa555333999777eee0 artifact.jar
Added: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.sha1-good
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.sha1-good?view=auto&rev=528532
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.sha1-good (added)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/checksums/artifact.jar.sha1-good Fri Apr 13 08:48:27 2007
@@ -0,0 +1 @@
+7dd8929150664f182db60ad15f20359d875f059f artifact.jar
Added: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/log4j.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/log4j.xml?view=auto&rev=528532
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/log4j.xml (added)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/log4j.xml Fri Apr 13 08:48:27 2007
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%5p|%t|%5r|%-30c{1} - %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- Help identify bugs during testing -->
+ <logger name="org.apache.maven.archiva">
+ <level value="debug"/>
+ </logger>
+
+ <logger name="org.codehaus.plexus.security">
+ <level value="info"/>
+ </logger>
+
+ <logger name="org.codehaus.plexus.PlexusContainer">
+ <level value="info"/>
+ </logger>
+
+ <logger name="JPOX">
+ <level value="warn"/>
+ </logger>
+
+ <logger name="JPOX.MetaData">
+ <level value="error"/>
+ </logger>
+
+ <logger name="JPOX.RDBMS.SQL">
+ <level value="error"/>
+ </logger>
+
+ <logger name="SQL">
+ <level value="error"/>
+ </logger>
+
+ <root>
+ <priority value ="debug" />
+ <appender-ref ref="console" />
+ </root>
+
+</log4j:configuration>
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/log4j.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/log4j.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/test/resources/log4j.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml