Author: joakime
Date: Sun Apr 15 17:49:33 2007
New Revision: 529107
URL: http://svn.apache.org/viewvc?view=rev&rev=529107
Log:
* Expanding Proxy / Policy tests.
Modified:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/AbstractUpdatePolicy.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.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/src/main/java/org/apache/maven/archiva/policies/AbstractUpdatePolicy.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/AbstractUpdatePolicy.java?view=diff&rev=529107&r1=529106&r2=529107
==============================================================================
---
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/AbstractUpdatePolicy.java
(original)
+++
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/AbstractUpdatePolicy.java
Sun Apr 15 17:49:33 2007
@@ -88,62 +88,64 @@
}
protected abstract boolean isSnapshotPolicy();
+
+ protected abstract String getUpdateMode();
public boolean applyPolicy( String policySetting, Properties request, File
localFile )
{
String version = request.getProperty( "version", "" );
boolean isSnapshotVersion = false;
-
- if( StringUtils.isNotBlank( version ) )
+
+ if ( StringUtils.isNotBlank( version ) )
{
isSnapshotVersion = VersionUtil.isSnapshot( version );
}
- // Test for mismatches.
- if ( !isSnapshotVersion && isSnapshotPolicy() )
+ if ( !validPolicyCodes.contains( policySetting ) )
{
- getLogger().debug( "Non-snapshot version detected in during
snapshot policy. ignoring policy.");
- return true;
+ // No valid code? false it is then.
+ getLogger().error( "Unknown artifact-update policyCode [" +
policySetting + "]" );
+ return false;
}
-
- if ( isSnapshotVersion && !isSnapshotPolicy() )
+
+ if ( IGNORED.equals( policySetting ) )
{
- getLogger().debug( "Snapshot version detected in during release
policy. ignoring policy.");
+ // Ignored means ok to update.
+ getLogger().debug( "OK to update, " + getUpdateMode() + " policy
set to IGNORED." );
return true;
}
- if ( !validPolicyCodes.contains( policySetting ) )
+ // Test for mismatches.
+ if ( !isSnapshotVersion && isSnapshotPolicy() )
{
- // No valid code? false it is then.
- getLogger().error( "Unknown artifact-update policyCode [" +
policySetting + "]" );
- return false;
+ getLogger().debug( "OK to update, snapshot policy does not apply
for non-snapshot versions." );
+ return true;
}
-
- if ( IGNORED.equals( policySetting ) )
+
+ if ( isSnapshotVersion && !isSnapshotPolicy() )
{
- // Disabled means no.
- getLogger().debug( "OK to update, policy ignored." );
+ getLogger().debug( "OK to update, release policy does not apply
for snapshot versions." );
return true;
}
if ( DISABLED.equals( policySetting ) )
{
// Disabled means no.
- getLogger().debug( "NO to update, disabled." );
+ getLogger().debug( "NO to update, " + getUpdateMode() + " policy
set to DISABLED." );
return false;
}
if ( !localFile.exists() )
{
// No file means it's ok.
- getLogger().debug( "OK to update, local file does not exist." );
+ getLogger().debug( "OK to update " + getUpdateMode() + ", local
file does not exist." );
return true;
}
if ( ONCE.equals( policySetting ) )
{
// File exists, but policy is once.
- getLogger().debug( "NO to update, local file exist (and policy is
ONCE)." );
+ getLogger().debug( "NO to update" + getUpdateMode() + ", local
file exist (and policy is ONCE)." );
return false;
}
Modified:
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=diff&rev=529107&r1=529106&r2=529107
==============================================================================
---
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java
(original)
+++
maven/archiva/branches/archiva-jpox-database-refactor/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java
Sun Apr 15 17:49:33 2007
@@ -73,6 +73,7 @@
if ( IGNORED.equals( policySetting ) )
{
// Ignore.
+ getLogger().debug( "OK to fetch, check-failures policy set to
IGNORED." );
return true;
}
@@ -82,9 +83,12 @@
{
if ( urlFailureCache.hasFailedBefore( url ) )
{
+ getLogger().debug( "NO to fetch, check-failures detected
previous failure on url: " + url );
return false;
}
}
+
+ getLogger().debug( "OK to fetch, check-failures detected no issues." );
return true;
}
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=529107&r1=529106&r2=529107
==============================================================================
---
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
Sun Apr 15 17:49:33 2007
@@ -42,4 +42,9 @@
{
return false;
}
+
+ protected String getUpdateMode()
+ {
+ return "releases";
+ }
}
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=529107&r1=529106&r2=529107
==============================================================================
---
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
Sun Apr 15 17:49:33 2007
@@ -42,4 +42,9 @@
{
return true;
}
+
+ protected String getUpdateMode()
+ {
+ return "snapshots";
+ }
}
