();
+ int len = version.length();
+ int i = 0;
+ int start = 0;
+ int mode = modeOther;
+
+ while ( i < len )
+ {
+ char c = version.charAt( i );
+
+ if ( Character.isDigit( c ) )
+ {
+ if ( mode != modeDigit )
+ {
+ if ( mode != modeOther )
+ {
+ parts.add( version.substring( start, i ) );
+ }
+ mode = modeDigit;
+ start = i;
+ }
+ }
+ else if ( Character.isLetter( c ) )
+ {
+ if ( mode != modeText )
+ {
+ if ( mode != modeOther )
+ {
+ parts.add( version.substring( start, i ) );
+ }
+ mode = modeText;
+ start = i;
+ }
+ }
+ else
+ {
+ // Other.
+ if ( mode != modeOther )
+ {
+ parts.add( version.substring( start, i ) );
+ mode = modeOther;
+ }
+ }
+
+ i++;
+ }
+
+ // Add remainder
+ if ( mode != modeOther )
+ {
+ parts.add( version.substring( start, i ) );
+ }
+
+ return parts.toArray( new String[parts.size()] );
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/VersionUtil.java b/MRM-541/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/VersionUtil.java
new file mode 100644
index 000000000..2e3831d4a
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/VersionUtil.java
@@ -0,0 +1,204 @@
+package org.apache.maven.archiva.common.utils;
+
+/*
+ * 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 java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Version utility methods.
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public class VersionUtil
+{
+ /**
+ * These are the version patterns found in the filenames of the various artifact's versions IDs.
+ * These patterns are all tackling lowercase version IDs.
+ */
+ private static final String versionPatterns[] = new String[] {
+ "([0-9][_.0-9a-z]*)",
+ "(snapshot)",
+ "(g?[_.0-9ab]*(pre|rc|g|m)[_.0-9]*)",
+ "(dev[_.0-9]*)",
+ "(alpha[_.0-9]*)",
+ "(beta[_.0-9]*)",
+ "(rc[_.0-9]*)",
+// "(test[_.0-9]*)", -- omitted for MRM-681, can be reinstated as part of MRM-712
+ "(debug[_.0-9]*)",
+ "(unofficial[_.0-9]*)",
+ "(current)",
+ "(latest)",
+ "(fcs)",
+ "(release[_.0-9]*)",
+ "(nightly)",
+ "(final)",
+ "(incubating)",
+ "(incubator)",
+ "([ab][_.0-9]+)" };
+
+ public static final String SNAPSHOT = "SNAPSHOT";
+
+ public static final Pattern UNIQUE_SNAPSHOT_PATTERN = Pattern.compile( "^(.*)-([0-9]{8}\\.[0-9]{6})-([0-9]+)$" );
+
+ public static final Pattern TIMESTAMP_PATTERN = Pattern.compile( "^([0-9]{8})\\.([0-9]{6})$" );
+
+ public static final Pattern GENERIC_SNAPSHOT_PATTERN = Pattern.compile( "^(.*)-" + SNAPSHOT );
+
+ private static final Pattern VERSION_MEGA_PATTERN = Pattern.compile( StringUtils.join( versionPatterns, '|' ), Pattern.CASE_INSENSITIVE );
+
+ /**
+ *
+ * Tests if the unknown string contains elements that identify it as a version string (or not).
+ *
+ *
+ *
+ * The algorithm tests each part of the string that is delimited by a '-' (dash) character.
+ * If 75% or more of the sections are identified as 'version' strings, the result is
+ * determined to be of a high probability to be version identifier string.
+ *
+ *
+ * @param unknown the unknown string to test.
+ * @return true if the unknown string is likely a version string.
+ */
+ public static boolean isVersion( String unknown )
+ {
+ String versionParts[] = StringUtils.split( unknown, '-' );
+
+ Matcher mat;
+
+ int countValidParts = 0;
+
+ for ( int i = 0; i < versionParts.length; i++ )
+ {
+ String part = versionParts[i];
+ mat = VERSION_MEGA_PATTERN.matcher( part );
+
+ if ( mat.matches() )
+ {
+ countValidParts++;
+ }
+ }
+
+ /* Calculate version probability as true if 3/4's of the input string has pieces of
+ * of known version identifier strings.
+ */
+ int threshold = (int) Math.floor( Math.max( (double) 1.0, (double) ( versionParts.length * 0.75 ) ) );
+
+ return ( countValidParts >= threshold );
+ }
+
+ /**
+ *
+ * Tests if the identifier is a known simple version keyword.
+ *
+ *
+ *
+ * This method is different from {@link #isVersion(String)} in that it tests the whole input string in
+ * one go as a simple identifier. (eg "alpha", "1.0", "beta", "debug", "latest", "rc#", etc...)
+ *
+ *
+ * @param identifier the identifier to test.
+ * @return true if the unknown string is likely a version string.
+ */
+ public static boolean isSimpleVersionKeyword( String identifier )
+ {
+ Matcher mat = VERSION_MEGA_PATTERN.matcher( identifier );
+
+ return mat.matches();
+ }
+
+ public static boolean isSnapshot( String version )
+ {
+ Matcher m = UNIQUE_SNAPSHOT_PATTERN.matcher( version );
+ if ( m.matches() )
+ {
+ return true;
+ }
+ else
+ {
+ return version.endsWith( SNAPSHOT );
+ }
+ }
+
+ public static String getBaseVersion( String version )
+ {
+ Matcher m = UNIQUE_SNAPSHOT_PATTERN.matcher( version );
+ if ( m.matches() )
+ {
+ return m.group( 1 ) + "-" + SNAPSHOT;
+ }
+ else
+ {
+ return version;
+ }
+ }
+
+ /**
+ *
+ * Get the release version of the snapshot version.
+ *
+ *
+ *
+ * If snapshot version is 1.0-SNAPSHOT, then release version would be 1.0
+ * And if snapshot version is 1.0-20070113.163208-1.jar, then release version would still be 1.0
+ *
+ *
+ * @param snapshotVersion
+ * @return
+ */
+ public static String getReleaseVersion( String snapshotVersion )
+ {
+ Matcher m = UNIQUE_SNAPSHOT_PATTERN.matcher( snapshotVersion );
+
+ if( isGenericSnapshot( snapshotVersion ) )
+ {
+ m = GENERIC_SNAPSHOT_PATTERN.matcher( snapshotVersion );
+ }
+
+ if ( m.matches() )
+ {
+ return m.group( 1 );
+ }
+ else
+ {
+ return snapshotVersion;
+ }
+ }
+
+ public static boolean isUniqueSnapshot( String version )
+ {
+ Matcher m = UNIQUE_SNAPSHOT_PATTERN.matcher( version );
+ if( m.matches() )
+ {
+ return true;
+ }
+
+ return false;
+ }
+
+ public static boolean isGenericSnapshot( String version )
+ {
+ return version.endsWith( SNAPSHOT );
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/BaseFileTest.java b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/BaseFileTest.java
new file mode 100644
index 000000000..4de78842b
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/BaseFileTest.java
@@ -0,0 +1,132 @@
+package org.apache.maven.archiva.common.utils;
+
+/*
+ * 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 junit.framework.TestCase;
+
+import java.io.File;
+
+/**
+ * BaseFileTest
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public class BaseFileTest
+ extends TestCase
+{
+ public void testFileString()
+ {
+ File repoDir = new File( "/home/user/foo/repository" );
+ String pathFile = "path/to/resource.xml";
+ BaseFile file = new BaseFile( repoDir, pathFile );
+
+ assertAbsolutePath( "/home/user/foo/repository/path/to/resource.xml", file );
+ assertRelativePath( "path/to/resource.xml", file );
+ assertBasedir( "/home/user/foo/repository", file );
+ }
+
+ public void testFileFile()
+ {
+ File repoDir = new File( "/home/user/foo/repository" );
+ File pathFile = new File( "/home/user/foo/repository/path/to/resource.xml" );
+ BaseFile file = new BaseFile( repoDir, pathFile );
+
+ assertAbsolutePath( "/home/user/foo/repository/path/to/resource.xml", file );
+ assertRelativePath( "path/to/resource.xml", file );
+ assertBasedir( "/home/user/foo/repository", file );
+ }
+
+ public void testStringFile()
+ {
+ String repoDir = "/home/user/foo/repository";
+ File pathFile = new File( "/home/user/foo/repository/path/to/resource.xml" );
+ BaseFile file = new BaseFile( repoDir, pathFile );
+
+ assertAbsolutePath( "/home/user/foo/repository/path/to/resource.xml", file );
+ assertRelativePath( "path/to/resource.xml", file );
+ assertBasedir( "/home/user/foo/repository", file );
+ }
+
+ public void testFileThenSetBaseString()
+ {
+ String repoDir = "/home/user/foo/repository";
+ File pathFile = new File( "/home/user/foo/repository/path/to/resource.xml" );
+ BaseFile file = new BaseFile( pathFile );
+ file.setBaseDir( repoDir );
+
+ assertAbsolutePath( "/home/user/foo/repository/path/to/resource.xml", file );
+ assertRelativePath( "path/to/resource.xml", file );
+ assertBasedir( "/home/user/foo/repository", file );
+ }
+
+ public void testFileThenSetBaseFile()
+ {
+ File repoDir = new File( "/home/user/foo/repository" );
+ File pathFile = new File( "/home/user/foo/repository/path/to/resource.xml" );
+ BaseFile file = new BaseFile( pathFile );
+ file.setBaseDir( repoDir );
+
+ assertAbsolutePath( "/home/user/foo/repository/path/to/resource.xml", file );
+ assertRelativePath( "path/to/resource.xml", file );
+ assertBasedir( "/home/user/foo/repository", file );
+ }
+
+ public void testStringThenSetBaseString()
+ {
+ String repoDir = "/home/user/foo/repository";
+ String pathFile = "/home/user/foo/repository/path/to/resource.xml";
+ BaseFile file = new BaseFile( pathFile );
+ file.setBaseDir( repoDir );
+
+ assertAbsolutePath( "/home/user/foo/repository/path/to/resource.xml", file );
+ assertRelativePath( "path/to/resource.xml", file );
+ assertBasedir( "/home/user/foo/repository", file );
+ }
+
+ public void testStringThenSetBaseFile()
+ {
+ File repoDir = new File( "/home/user/foo/repository" );
+ String pathFile = "/home/user/foo/repository/path/to/resource.xml";
+ BaseFile file = new BaseFile( pathFile );
+ file.setBaseDir( repoDir );
+
+ assertAbsolutePath( "/home/user/foo/repository/path/to/resource.xml", file );
+ assertRelativePath( "path/to/resource.xml", file );
+ assertBasedir( "/home/user/foo/repository", file );
+ }
+
+ private void assertAbsolutePath( String expectedPath, BaseFile actualFile )
+ {
+ assertEquals( new File( expectedPath ).getAbsolutePath(), actualFile.getAbsolutePath() );
+ }
+
+ private void assertRelativePath( String expectedPath, BaseFile actualFile )
+ {
+ assertEquals( expectedPath, StringUtils.replace( actualFile.getRelativePath(), "\\", "/" ) );
+ }
+
+ private void assertBasedir( String expectedPath, BaseFile actualFile )
+ {
+ assertEquals( new File( expectedPath ), actualFile.getBaseDir() );
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/DateUtilTest.java b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/DateUtilTest.java
new file mode 100644
index 000000000..b080227fe
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/DateUtilTest.java
@@ -0,0 +1,69 @@
+package org.apache.maven.archiva.common.utils;
+
+/*
+ * 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 java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import junit.framework.TestCase;
+
+/**
+ * DateUtilTest
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public class DateUtilTest extends TestCase
+{
+ private void assertDuration( String expectedDuration, String startTimestamp, String endTimestamp )
+ throws ParseException
+ {
+ SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss SSS" );
+ Date startDate = sdf.parse( startTimestamp );
+ Date endDate = sdf.parse( endTimestamp );
+
+// System.out.println( "Date: " + endTimestamp + " - " + startTimestamp + " = "
+// + ( endDate.getTime() - startDate.getTime() ) + " ms" );
+
+ assertEquals( expectedDuration, DateUtil.getDuration( startDate, endDate ) );
+ }
+
+ public void testGetDurationDifference() throws ParseException
+ {
+ assertDuration( "2 Seconds", "2006-08-22 13:00:02 0000",
+ "2006-08-22 13:00:04 0000" );
+
+ assertDuration( "12 Minutes 12 Seconds 234 Milliseconds", "2006-08-22 13:12:02 0000",
+ "2006-08-22 13:24:14 0234" );
+
+ assertDuration( "12 Minutes 501 Milliseconds", "2006-08-22 13:12:01 0500",
+ "2006-08-22 13:24:02 0001" );
+ }
+
+ public void testGetDurationDirect() throws ParseException
+ {
+ assertEquals( "2 Seconds", DateUtil.getDuration( 2000 ) );
+
+ assertEquals( "12 Minutes 12 Seconds 234 Milliseconds", DateUtil.getDuration( 732234 ) );
+
+ assertEquals( "12 Minutes 501 Milliseconds", DateUtil.getDuration( 720501 ) );
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/PathUtilTest.java b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/PathUtilTest.java
new file mode 100644
index 000000000..a318e57f4
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/PathUtilTest.java
@@ -0,0 +1,94 @@
+package org.apache.maven.archiva.common.utils;
+
+/*
+ * 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 java.io.File;
+
+import junit.framework.TestCase;
+
+/**
+ * PathUtilTest
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public class PathUtilTest
+ extends TestCase
+{
+ public void testToRelativeWithoutSlash()
+ {
+ assertEquals( "path/to/resource.xml", PathUtil.getRelative( "/home/user/foo/repository",
+ "/home/user/foo/repository/path/to/resource.xml" ) );
+ }
+
+ public void testToRelativeWithSlash()
+ {
+ assertEquals( "path/to/resource.xml", PathUtil.getRelative( "/home/user/foo/repository/",
+ "/home/user/foo/repository/path/to/resource.xml" ) );
+ }
+
+ public void testToUrlRelativePath()
+ {
+ File workingDir = new File( "." );
+
+ String workingDirname = StringUtils.replaceChars( workingDir.getAbsolutePath(), '\\', '/' );
+
+ // Some JVM's retain the "." at the end of the path. Drop it.
+ if ( workingDirname.endsWith( "/." ) )
+ {
+ workingDirname = workingDirname.substring( 0, workingDirname.length() - 2 );
+ }
+
+ if ( !workingDirname.startsWith( "/" ) )
+ {
+ workingDirname = "/" + workingDirname;
+ }
+
+ String path = "path/to/resource.xml";
+ String expectedPath = "file:" + workingDirname + "/" + path;
+
+ assertEquals( expectedPath, PathUtil.toUrl( path ) );
+ }
+
+ public void testToUrlUsingFileUrl()
+ {
+ File workingDir = new File( "." );
+
+ String workingDirname = StringUtils.replaceChars( workingDir.getAbsolutePath(), '\\', '/' );
+
+ // Some JVM's retain the "." at the end of the path. Drop it.
+ if ( workingDirname.endsWith( "/." ) )
+ {
+ workingDirname = workingDirname.substring( 0, workingDirname.length() - 2 );
+ }
+
+ if ( !workingDirname.startsWith( "/" ) )
+ {
+ workingDirname = "/" + workingDirname;
+ }
+
+ String path = "path/to/resource.xml";
+ String expectedPath = "file:" + workingDirname + "/" + path;
+
+ assertEquals( expectedPath, PathUtil.toUrl( expectedPath ) );
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/ResourceUtils.java b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/ResourceUtils.java
new file mode 100644
index 000000000..db2a0dc27
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/ResourceUtils.java
@@ -0,0 +1,90 @@
+package org.apache.maven.archiva.common.utils;
+
+/*
+ * 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 java.io.File;
+import java.io.IOException;
+import java.net.URL;
+
+/**
+ * ResourceUtils
+ */
+public class ResourceUtils
+{
+ /**
+ * Lookup resource at the given path relative to the root of the classpath and if it exists return a file object
+ * that can be used to access it.
+ *
+ * At test time the contents of both the src/resources and test/resources dirs are available at the root of the
+ * classpath.
+ *
+ * To retrieve the file src/test/resources/sometest/test.properties use getResource("/sometest/test.properties").
+ *
+ * @param resourcePath the path to the resource relative to the root of the classpath
+ * @return File a file object pointing to the resource on the classpath or null if the resource cannot be found
+ */
+ public static File getResource( String resourcePath )
+ throws IOException
+ {
+ return getResource( resourcePath, null );
+ }
+
+ /**
+ * Lookup resource at the given path relative to the root of the classpath and if it exists return a file object
+ * that can be used to access it.
+ *
+ * At test time the contents of both the src/resources and test/resources dirs are available at the root of the
+ * classpath.
+ *
+ * To retrieve the file src/test/resources/sometest/test.properties use getResource("/sometest/test.properties").
+ *
+ * @param resourcePath the path to the resource relative to the root of the classpath
+ * @param classloader the classloader who's classpath should be searched for the resource
+ * @return File a file object pointing to the resource on the classpath or null if the resource cannot be found
+ */
+ public static File getResource( String resourcePath, ClassLoader classloader )
+ throws IOException
+ {
+ File testResource = null;
+
+ if ( StringUtils.isNotBlank( resourcePath ) )
+ {
+ // make sure the retrieval is relative to the root of the classpath
+ resourcePath = resourcePath.startsWith( "/" ) ? resourcePath : "/" + resourcePath;
+
+ URL resourceUrl = getResourceUrl( resourcePath, classloader );
+ if ( resourceUrl == null )
+ {
+ throw new IOException( "Could not find test resource at path '" + resourcePath + "'" );
+ }
+ testResource = new File( resourceUrl.getFile() );
+ }
+
+ return testResource;
+ }
+
+ private static URL getResourceUrl( String resourcePath, ClassLoader classloader )
+ {
+ return classloader != null ? classloader.getResource( resourcePath )
+ : ResourceUtils.class.getResource( resourcePath );
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/VersionComparatorTest.java b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/VersionComparatorTest.java
new file mode 100644
index 000000000..4bfef29fb
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/VersionComparatorTest.java
@@ -0,0 +1,131 @@
+package org.apache.maven.archiva.common.utils;
+
+/*
+ * 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 java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+/**
+ * VersionComparatorTest
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public class VersionComparatorTest
+ extends TestCase
+{
+ public void testComparator()
+ {
+ /* Sort order is oldest to newest */
+
+ assertSort( new String[] { "1.0", "3.0", "2.0" }, new String[] { "1.0", "2.0", "3.0" } );
+ assertSort( new String[] { "1.5", "1.2", "1.0" }, new String[] { "1.0", "1.2", "1.5" } );
+
+ assertSort( new String[] { "1.5-SNAPSHOT", "1.2", "1.20" }, new String[] { "1.2", "1.5-SNAPSHOT", "1.20" } );
+
+ assertSort( new String[] { "1.1", "1.0-SNAPSHOT", "1.1-m6", "1.1-rc1" }, new String[] {
+ "1.0-SNAPSHOT",
+ "1.1-rc1",
+ "1.1-m6",
+ "1.1" } );
+
+ assertSort( new String[] { "1.1-m6", "1.0-SNAPSHOT", "1.1-rc1", "1.1" }, new String[] {
+ "1.0-SNAPSHOT",
+ "1.1-rc1",
+ "1.1-m6",
+ "1.1" } );
+
+ assertSort( new String[] { "2.0.5", "2.0.4-SNAPSHOT", "2.0", "2.0-rc1" }, new String[] {
+ "2.0-rc1",
+ "2.0",
+ "2.0.4-SNAPSHOT",
+ "2.0.5" } );
+
+ assertSort( new String[] { "1.0-alpha-1", "1.0-alpha-22", "1.0-alpha-10", "1.0-alpha-9" }, new String[] {
+ "1.0-alpha-1",
+ "1.0-alpha-9",
+ "1.0-alpha-10",
+ "1.0-alpha-22" } );
+
+ assertSort( new String[] { "1.0-alpha1", "1.0-alpha22", "1.0-alpha10", "1.0-alpha9" }, new String[] {
+ "1.0-alpha1",
+ "1.0-alpha9",
+ "1.0-alpha10",
+ "1.0-alpha22" } );
+
+ assertSort( new String[] { "1.0-1", "1.0-22", "1.0-10", "1.0-9" }, new String[] {
+ "1.0-1",
+ "1.0-9",
+ "1.0-10",
+ "1.0-22" } );
+
+ assertSort( new String[] { "alpha-1", "alpha-22", "alpha-10", "alpha-9" }, new String[] {
+ "alpha-1",
+ "alpha-9",
+ "alpha-10",
+ "alpha-22" } );
+
+ assertSort( new String[] { "1.0.1", "1.0.22", "1.0.10", "1.0.9" }, new String[] {
+ "1.0.1",
+ "1.0.9",
+ "1.0.10",
+ "1.0.22" } );
+
+
+ // TODO: write more unit tests.
+ }
+
+ private void assertSort( String[] rawVersions, String[] expectedSort )
+ {
+ List versions = new ArrayList();
+ versions.addAll( Arrays.asList( rawVersions ) );
+
+ Collections.sort( versions, VersionComparator.getInstance() );
+
+ assertEquals( "Versions.size()", expectedSort.length, versions.size() );
+ for ( int i = 0; i < expectedSort.length; i++ )
+ {
+ assertEquals( "Sorted Versions[" + i + "]", expectedSort[i], (String) versions.get( i ) );
+ }
+ }
+
+ public void testToParts()
+ {
+ assertParts( "1.0", new String[] { "1", "0" } );
+ assertParts( "1.0-alpha-1", new String[] { "1", "0", "alpha", "1" } );
+ assertParts( "2.0-rc2", new String[] { "2", "0", "rc", "2" } );
+ assertParts( "1.3-m6", new String[] { "1", "3", "m", "6" } );
+ }
+
+ private void assertParts( String version, String[] expectedParts )
+ {
+ String actualParts[] = VersionComparator.toParts( version );
+ assertEquals( "Parts.length", expectedParts.length, actualParts.length );
+
+ for ( int i = 0; i < expectedParts.length; i++ )
+ {
+ assertEquals( "parts[" + i + "]", expectedParts[i], actualParts[i] );
+ }
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/CVS/Root b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/CVS/Root
new file mode 100644
index 000000000..2e65f24a6
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/CVS/Root
@@ -0,0 +1 @@
+not a real CVS root - for testing exclusions
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/KEYS b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/KEYS
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/invalid/foo/invalid-1.0.foo b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/invalid/foo/invalid-1.0.foo
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/invalid/invalid-1.0.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/invalid/invalid-1.0.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/1.0/invalid-1.0.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/invalid-1.0.rar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/invalid-1.0.rar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/invalid.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/invalid.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/no-extension b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/invalid/jars/no-extension
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/javax.sql/jars/jdbc-2.0.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar
new file mode 100644
index 000000000..54d190b23
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-not-updated-1.0.jar
@@ -0,0 +1 @@
+dummy content. sample file only.
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar
new file mode 100644
index 000000000..54d190b23
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven.update/jars/test-updated-1.0.jar
@@ -0,0 +1 @@
+dummy content. sample file only.
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/some-ejb-1.0-client.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-20050611.112233-1.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0-sources.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.tar.gz
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-1.0.zip
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/legacy-repository/org.apache.maven/jars/testing-UNKNOWN.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/CVS/Root b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/CVS/Root
new file mode 100644
index 000000000..2e65f24a6
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/CVS/Root
@@ -0,0 +1 @@
+not a real CVS root - for testing exclusions
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/KEYS b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/KEYS
new file mode 100644
index 000000000..d3b34d5ad
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/KEYS
@@ -0,0 +1 @@
+test KEYS file
\ No newline at end of file
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/invalid/invalid-1.0.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/invalid/invalid-1.0.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0-20050611.123456-1/invalid-1.0-20050611.123456-1.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0-SNAPSHOT/invalid-1.0.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-1.0b.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/invalid/invalid/1.0/invalid-2.0.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/invalid/invalid/1/invalid-1 b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/invalid/invalid/1/invalid-1
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/javax/maven-metadata.xml b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/javax/maven-metadata.xml
new file mode 100644
index 000000000..b3baf545d
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/javax/maven-metadata.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+ javax.sql
+ jdbc
+ 2.0
+
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/2.0/jdbc-2.0.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
new file mode 100644
index 000000000..caf5b6697
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
@@ -0,0 +1,25 @@
+
+
+
+
+ javax.sql
+ jdbc
+ 2.0
+
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml
new file mode 100644
index 000000000..bb7570891
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/javax/sql/jdbc/maven-metadata-repository.xml
@@ -0,0 +1,30 @@
+
+
+
+
+ javax.sql
+ jdbc
+ 2.0
+
+
+ 2.0
+
+
+
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/javax/sql/maven-metadata-repository.xml b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/javax/sql/maven-metadata-repository.xml
new file mode 100644
index 000000000..caf5b6697
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/javax/sql/maven-metadata-repository.xml
@@ -0,0 +1,25 @@
+
+
+
+
+ javax.sql
+ jdbc
+ 2.0
+
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom
new file mode 100644
index 000000000..202a0a448
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.pom
@@ -0,0 +1,28 @@
+
+
+
+ 4.0.0
+ org.apache.maven
+ A
+ 1.0
+ Maven Test Repository Artifact Discovery
+ war
+
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.war b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.war
new file mode 100644
index 000000000..54d190b23
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/A/1.0/A-1.0.war
@@ -0,0 +1 @@
+dummy content. sample file only.
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom
new file mode 100644
index 000000000..fa5f8f6c8
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/B/1.0/B-1.0.pom
@@ -0,0 +1,28 @@
+
+
+
+ 4.0.0
+ org.apache.maven
+ B
+ 1.0
+ Maven Test Repository Artifact Discovery
+ pom
+
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom
new file mode 100644
index 000000000..c3034e820
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/B/2.0/B-2.0.pom
@@ -0,0 +1,28 @@
+
+
+
+ 4.0.0
+ org.apache.maven
+ B
+ 2.0
+ Maven Test Repository Artifact Discovery
+ pom
+
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom
new file mode 100644
index 000000000..ae14cd7eb
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.pom
@@ -0,0 +1,28 @@
+
+
+
+ 4.0.0
+ org.apache.maven
+ C
+ 1.0
+ Maven Test Repository Artifact Discovery
+ war
+
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.war b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.war
new file mode 100644
index 000000000..54d190b23
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/C/1.0/C-1.0.war
@@ -0,0 +1 @@
+dummy content. sample file only.
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom
new file mode 100644
index 000000000..5a29f6117
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/discovery/1.0/discovery-1.0.pom
@@ -0,0 +1,28 @@
+
+
+
+ 4.0.0
+ org.apache.maven
+ discovery
+ 1.0
+ Maven Test Repository Artifact Discovery
+ pom
+
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/maven-metadata.xml b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/maven-metadata.xml
new file mode 100644
index 000000000..8ce7fc7bb
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/maven-metadata.xml
@@ -0,0 +1,23 @@
+
+
+
+
+ org.apache.maven
+
\ No newline at end of file
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar
new file mode 100644
index 000000000..54d190b23
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.jar
@@ -0,0 +1 @@
+dummy content. sample file only.
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
new file mode 100644
index 000000000..6ab57d162
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/1.0/samplejar-1.0.pom
@@ -0,0 +1,29 @@
+
+
+
+ 4.0.0
+ org.apache.maven
+ C
+ 1.0
+ Maven Test Repository Artifact Discovery
+
+
+
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar
new file mode 100644
index 000000000..54d190b23
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.jar
@@ -0,0 +1 @@
+dummy content. sample file only.
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
new file mode 100644
index 000000000..a959980df
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/samplejar/2.0/samplejar-2.0.pom
@@ -0,0 +1,29 @@
+
+
+
+ 4.0.0
+ org.apache.maven
+ C
+ 1.0
+ Maven Test Repository Artifact Discovery
+
+ jar
+
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/some-ejb/1.0/some-ejb-1.0-client.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1-javadoc.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/test-1.0-20050611.112233-1.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/test/1.0-SNAPSHOT/wrong-artifactId-1.0-20050611.112233-1.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-sources.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.tar.gz
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/testing/1.0/testing-1.0.zip
new file mode 100644
index 000000000..e69de29bb
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar
new file mode 100644
index 000000000..54d190b23
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.jar
@@ -0,0 +1 @@
+dummy content. sample file only.
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom
new file mode 100644
index 000000000..452727f28
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/1.0/test-not-updated-1.0.pom
@@ -0,0 +1,29 @@
+
+
+
+ 4.0.0
+ org.apache.maven.update
+ test-not-updated
+ 1.0
+ Maven Test Repository Artifact Discovery
+
+
+
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
new file mode 100644
index 000000000..bd56a21c1
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-not-updated/maven-metadata.xml
@@ -0,0 +1,24 @@
+
+
+
+
+ org.apache.maven.update
+ test-not-updated
+
\ No newline at end of file
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar
new file mode 100644
index 000000000..54d190b23
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.jar
@@ -0,0 +1 @@
+dummy content. sample file only.
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom
new file mode 100644
index 000000000..edd7b6479
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/1.0/test-updated-1.0.pom
@@ -0,0 +1,29 @@
+
+
+
+ 4.0.0
+ org.apache.maven.update
+ test-updated
+ 1.0
+ Maven Test Repository Artifact Discovery
+
+
+
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml
new file mode 100644
index 000000000..86e063ca8
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/maven/update/test-updated/maven-metadata.xml
@@ -0,0 +1,24 @@
+
+
+
+
+ org.apache.maven.update
+ test-updated
+
\ No newline at end of file
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
new file mode 100644
index 000000000..12538e81a
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
@@ -0,0 +1,28 @@
+
+
+
+ 4.0.0
+ org.apache.testgroup
+ discovery
+ 1.0
+ Maven Test Repository Artifact Discovery
+ pom
+
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
new file mode 100644
index 000000000..8ee18048c
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
@@ -0,0 +1,25 @@
+
+
+
+
+ org.apache.testgroup
+ discovery
+ 1.0
+
\ No newline at end of file
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml
new file mode 100644
index 000000000..b024ef7ef
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/repository/org/apache/testgroup/discovery/maven-metadata.xml
@@ -0,0 +1,24 @@
+
+
+
+
+ org.apache.testgroup
+ discovery
+
\ No newline at end of file
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/checksums/artifact.jar b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/checksums/artifact.jar
new file mode 100644
index 000000000..d1b610e5e
Binary files /dev/null and b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/checksums/artifact.jar differ
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/checksums/artifact.jar.md5-bad b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/checksums/artifact.jar.md5-bad
new file mode 100644
index 000000000..aafbb1c77
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/checksums/artifact.jar.md5-bad
@@ -0,0 +1 @@
+444ccc111aaa222999888eee222fff00 artifact.jar
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/checksums/artifact.jar.md5-good b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/checksums/artifact.jar.md5-good
new file mode 100644
index 000000000..1c8465238
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/checksums/artifact.jar.md5-good
@@ -0,0 +1 @@
+360ccd01d8a0a2d94b86f9802c2fc548 artifact.jar
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/checksums/artifact.jar.sha1-bad b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/checksums/artifact.jar.sha1-bad
new file mode 100644
index 000000000..2d809c29b
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/checksums/artifact.jar.sha1-bad
@@ -0,0 +1 @@
+ddd888999000444888bbbaaa555333999777eee0 artifact.jar
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/checksums/artifact.jar.sha1-good b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/checksums/artifact.jar.sha1-good
new file mode 100644
index 000000000..0f10d257e
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/checksums/artifact.jar.sha1-good
@@ -0,0 +1 @@
+7dd8929150664f182db60ad15f20359d875f059f artifact.jar
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericArtifactConsumerTest.xml b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericArtifactConsumerTest.xml
new file mode 100644
index 000000000..5760e8918
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericArtifactConsumerTest.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+ org.apache.maven.archiva.common.consumers.Consumer
+ mock-artifact
+ org.apache.maven.archiva.common.consumers.MockArtifactConsumer
+
+
+ org.apache.maven.artifact.factory.ArtifactFactory
+
+
+
+
+
\ No newline at end of file
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericModelConsumerTest.xml b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericModelConsumerTest.xml
new file mode 100644
index 000000000..2ded1b62d
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericModelConsumerTest.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+ org.apache.maven.archiva.discoverer.DiscovererConsumer
+ mock-model
+ org.apache.maven.archiva.discoverer.consumers.MockModelConsumer
+
+
+ org.apache.maven.artifact.factory.ArtifactFactory
+
+
+
+
+
\ No newline at end of file
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericRepositoryMetadataConsumerTest.xml b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericRepositoryMetadataConsumerTest.xml
new file mode 100644
index 000000000..da9864d00
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-common/src/test/resources/org/apache/maven/archiva/common/consumers/GenericRepositoryMetadataConsumerTest.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+ org.apache.maven.archiva.discoverer.DiscovererConsumer
+ mock-metadata
+ org.apache.maven.archiva.discoverer.consumers.MockRepositoryMetadataConsumer
+
+
+ org.apache.maven.artifact.factory.ArtifactFactory
+
+
+
+
+
\ No newline at end of file
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/pom.xml b/MRM-541/archiva-modules/archiva-base/archiva-configuration/pom.xml
new file mode 100644
index 000000000..2999766b9
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -0,0 +1,99 @@
+
+
+
+
+
+ org.apache.archiva
+ archiva-base
+ 1.2-SNAPSHOT
+
+ 4.0.0
+ archiva-configuration
+ Archiva Base :: Configuration
+
+
+ org.codehaus.plexus
+ plexus-spring
+ test
+
+
+ org.codehaus.plexus.registry
+ plexus-registry-api
+
+
+ org.codehaus.plexus.registry
+ plexus-registry-commons
+
+
+ org.codehaus.plexus
+ plexus-expression-evaluator
+
+
+ commons-io
+ commons-io
+
+
+ org.apache.archiva
+ archiva-policies
+
+
+ xmlunit
+ xmlunit
+ test
+
+
+
+
+
+ org.codehaus.modello
+ modello-maven-plugin
+ 1.0-alpha-15
+
+
+
+ java
+ registry-reader
+ registry-writer
+
+
+
+
+ 1.2.0
+ src/main/mdo/configuration.mdo
+
+
+
+ org.codehaus.mojo
+ cobertura-maven-plugin
+
+
+
+
+ org/apache/maven/archiva/configuration/io/**
+ org/apache/maven/archiva/configuration/*RepositoryConfiguration.*
+ org/apache/maven/archiva/configuration/Configuration.*
+ org/apache/maven/archiva/configuration/Proxy.*
+
+
+
+
+
+
+
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java
new file mode 100644
index 000000000..0705fd654
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ArchivaConfiguration.java
@@ -0,0 +1,82 @@
+package org.apache.maven.archiva.configuration;
+
+/*
+ * 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.registry.RegistryException;
+import org.codehaus.plexus.registry.RegistryListener;
+
+/**
+ * Configuration holder for the model read from the registry.
+ */
+public interface ArchivaConfiguration
+{
+ String ROLE = ArchivaConfiguration.class.getName();
+
+ /**
+ * Get the configuration.
+ *
+ * @return the configuration
+ */
+ Configuration getConfiguration();
+
+ /**
+ * Save any updated configuration.
+ *
+ * @param configuration the configuration to save
+ * @throws org.codehaus.plexus.registry.RegistryException
+ * if there is a problem saving the registry data
+ * @throws IndeterminateConfigurationException
+ * if the configuration cannot be saved because it was read from two sources
+ */
+ void save( Configuration configuration )
+ throws RegistryException, IndeterminateConfigurationException;
+
+ /**
+ * Determines if the configuration in use was as a result of a defaulted configuration.
+ *
+ * @return true if the configuration was created from the default-archiva.xml as opposed
+ * to being loaded from the usual locations of ${user.home}/.m2/archiva.xml or
+ * ${appserver.base}/conf/archiva.xml
+ */
+ boolean isDefaulted();
+
+ /**
+ * Add a configuration listener to notify of changes to the configuration.
+ *
+ * @param listener the listener
+ */
+ void addListener( ConfigurationListener listener );
+
+ /**
+ * Remove a configuration listener to stop notifications of changes to the configuration.
+ *
+ * @param listener the listener
+ */
+ void removeListener( ConfigurationListener listener );
+
+ /**
+ * Add a registry listener to notify of events in plexus-registry.
+ *
+ * @param listener the listener
+ * TODO: Remove in future.
+ */
+ void addChangeListener( RegistryListener listener );
+}
+
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationEvent.java b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationEvent.java
new file mode 100644
index 000000000..3105ee96e
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationEvent.java
@@ -0,0 +1,77 @@
+package org.apache.maven.archiva.configuration;
+
+/*
+ * 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.
+ */
+
+/**
+ * ConfigurationEvent
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public class ConfigurationEvent
+{
+ public static final int SAVED = 1;
+
+ public static final int CHANGED = 2;
+
+ private int type;
+
+ public ConfigurationEvent( int type )
+ {
+ this.type = type;
+ }
+
+ public int getType()
+ {
+ return type;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + type;
+ return result;
+ }
+
+ @Override
+ public boolean equals( Object obj )
+ {
+ if ( this == obj )
+ {
+ return true;
+ }
+ if ( obj == null )
+ {
+ return false;
+ }
+ if ( getClass() != obj.getClass() )
+ {
+ return false;
+ }
+ final ConfigurationEvent other = (ConfigurationEvent) obj;
+ if ( type != other.type )
+ {
+ return false;
+ }
+ return true;
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationListener.java b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationListener.java
new file mode 100644
index 000000000..f02637c83
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationListener.java
@@ -0,0 +1,34 @@
+package org.apache.maven.archiva.configuration;
+
+/*
+ * 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.
+ */
+
+/**
+ * ConfigurationListener
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public interface ConfigurationListener
+{
+ /**
+ * Generic event point to notify components that something has happend in the configuration.
+ */
+ public void configurationEvent(ConfigurationEvent event);
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationNames.java b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationNames.java
new file mode 100644
index 000000000..e1daac902
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationNames.java
@@ -0,0 +1,69 @@
+package org.apache.maven.archiva.configuration;
+
+/*
+ * 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.
+ */
+
+/**
+ * Utility methods for testing the configuration property name.
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public class ConfigurationNames
+{
+ public static boolean isNetworkProxy( String propertyName )
+ {
+ return startsWith( "networkProxies.", propertyName );
+ }
+
+ public static boolean isRepositoryScanning( String propertyName )
+ {
+ return startsWith( "repositoryScanning.", propertyName );
+ }
+
+ public static boolean isManagedRepositories( String propertyName )
+ {
+ return startsWith( "managedRepositories.", propertyName );
+ }
+
+ public static boolean isRemoteRepositories( String propertyName )
+ {
+ return startsWith( "remoteRepositories.", propertyName );
+ }
+
+ public static boolean isProxyConnector( String propertyName )
+ {
+ return startsWith( "proxyConnectors.", propertyName );
+ }
+
+ private static boolean startsWith( String prefix, String name )
+ {
+ if ( name == null )
+ {
+ return false;
+ }
+
+ if ( name.length() <= 0 )
+ {
+ return false;
+ }
+
+ return name.startsWith( prefix );
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationRuntimeException.java b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationRuntimeException.java
new file mode 100644
index 000000000..5fc44f80d
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/ConfigurationRuntimeException.java
@@ -0,0 +1,32 @@
+package org.apache.maven.archiva.configuration;
+
+/*
+ * 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.
+ */
+
+/**
+ * Unrecoverable exception in the configuration mechanism that is the result of a programming error.
+ */
+public class ConfigurationRuntimeException
+ extends RuntimeException
+{
+ public ConfigurationRuntimeException( String msg, Throwable cause )
+ {
+ super( msg, cause );
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
new file mode 100644
index 000000000..af3180d13
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
@@ -0,0 +1,736 @@
+package org.apache.maven.archiva.configuration;
+
+/*
+ * 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.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.maven.archiva.configuration.functors.ProxyConnectorConfigurationOrderComparator;
+import org.apache.maven.archiva.configuration.io.registry.ConfigurationRegistryReader;
+import org.apache.maven.archiva.configuration.io.registry.ConfigurationRegistryWriter;
+import org.apache.maven.archiva.policies.AbstractUpdatePolicy;
+import org.apache.maven.archiva.policies.CachedFailuresPolicy;
+import org.apache.maven.archiva.policies.ChecksumPolicy;
+import org.apache.maven.archiva.policies.Policy;
+import org.apache.maven.archiva.policies.PostDownloadPolicy;
+import org.apache.maven.archiva.policies.PreDownloadPolicy;
+import org.codehaus.plexus.evaluator.DefaultExpressionEvaluator;
+import org.codehaus.plexus.evaluator.EvaluatorException;
+import org.codehaus.plexus.evaluator.ExpressionEvaluator;
+import org.codehaus.plexus.evaluator.sources.SystemPropertyExpressionSource;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+import org.codehaus.plexus.registry.Registry;
+import org.codehaus.plexus.registry.RegistryException;
+import org.codehaus.plexus.registry.RegistryListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+/**
+ *
+ * Implementation of configuration holder that retrieves it from the registry.
+ *
+ *
+ * The registry layers and merges the 2 configuration files: user, and application server.
+ *
+ *
+ * Instead of relying on the model defaults, if the registry is empty a default configuration file is loaded and
+ * applied from a resource. The defaults are not loaded into the registry as the lists (eg repositories) could no longer
+ * be removed if that was the case.
+ *
+ *
+ * When saving the configuration, it is saved to the location it was read from. If it was read from the defaults, it
+ * will be saved to the user location.
+ * However, if the configuration contains information from both sources, an exception is raised as this is currently
+ * unsupported. The reason for this is that it is not possible to identify where to re-save elements, and can result
+ * in list configurations (eg repositories) becoming inconsistent.
+ *
+ *
+ * If the configuration is outdated, it will be upgraded when it is loaded. This is done by checking the version flag
+ * before reading it from the registry.
+ *
+ *
+ * @plexus.component role="org.apache.maven.archiva.configuration.ArchivaConfiguration"
+ */
+public class DefaultArchivaConfiguration
+ implements ArchivaConfiguration, RegistryListener, Initializable
+{
+ private Logger log = LoggerFactory.getLogger( DefaultArchivaConfiguration.class );
+
+ /**
+ * Plexus registry to read the configuration from.
+ *
+ * @plexus.requirement role-hint="commons-configuration"
+ */
+ private Registry registry;
+
+ /**
+ * The configuration that has been converted.
+ */
+ private Configuration configuration;
+
+ /**
+ * @plexus.requirement role="org.apache.maven.archiva.policies.PreDownloadPolicy"
+ * @todo these don't strictly belong in here
+ */
+ private Map prePolicies;
+
+ /**
+ * @plexus.requirement role="org.apache.maven.archiva.policies.PostDownloadPolicy"
+ * @todo these don't strictly belong in here
+ */
+ private Map postPolicies;
+
+ /**
+ * @plexus.configuration default-value="${user.home}/.m2/archiva.xml"
+ */
+ private String userConfigFilename;
+
+ /**
+ * @plexus.configuration default-value="${appserver.base}/conf/archiva.xml"
+ */
+ private String altConfigFilename;
+
+ /**
+ * Configuration Listeners we've registered.
+ */
+ private Set listeners = new HashSet();
+
+ /**
+ * Registry Listeners we've registered.
+ */
+ private Set registryListeners = new HashSet();
+
+ /**
+ * Boolean to help determine if the configuration exists as a result of pulling in
+ * the default-archiva.xml
+ */
+ private boolean isConfigurationDefaulted = false;
+
+ private static final String KEY = "org.apache.maven.archiva";
+
+ public synchronized Configuration getConfiguration()
+ {
+ if ( configuration == null )
+ {
+ configuration = load();
+ configuration = unescapeExpressions( configuration );
+ if( isConfigurationDefaulted )
+ {
+ configuration = checkRepositoryLocations( configuration );
+ }
+ }
+
+ return configuration;
+ }
+
+ private Configuration load()
+ {
+ // TODO: should this be the same as section? make sure unnamed sections still work (eg, sys properties)
+ Registry subset = registry.getSubset( KEY );
+ if ( subset.getString( "version" ) == null )
+ {
+ // a little autodetection of v1, even if version is omitted (this was previously allowed)
+ if ( subset.getSubset( "repositoryScanning" ).isEmpty() )
+ {
+ // only for empty, or v < 1
+ subset = readDefaultConfiguration();
+ }
+ }
+
+ Configuration config = new ConfigurationRegistryReader().read( subset );
+
+ if ( !config.getRepositories().isEmpty() )
+ {
+ for ( Iterator i = config.getRepositories().iterator(); i.hasNext(); )
+ {
+ V1RepositoryConfiguration r = i.next();
+ r.setScanned( r.isIndexed() );
+
+ if ( r.getUrl().startsWith( "file://" ) )
+ {
+ r.setLocation( r.getUrl().substring( 7 ) );
+ config.addManagedRepository( r );
+ }
+ else if ( r.getUrl().startsWith( "file:" ) )
+ {
+ r.setLocation( r.getUrl().substring( 5 ) );
+ config.addManagedRepository( r );
+ }
+ else
+ {
+ RemoteRepositoryConfiguration repo = new RemoteRepositoryConfiguration();
+ repo.setId( r.getId() );
+ repo.setLayout( r.getLayout() );
+ repo.setName( r.getName() );
+ repo.setUrl( r.getUrl() );
+ config.addRemoteRepository( repo );
+ }
+ }
+
+ // Prevent duplicate repositories from showing up.
+ config.getRepositories().clear();
+
+ registry.removeSubset( KEY + ".repositories" );
+ }
+
+ if ( !CollectionUtils.isEmpty( config.getRemoteRepositories() ) )
+ {
+ List remoteRepos = config.getRemoteRepositories();
+ for ( RemoteRepositoryConfiguration repo : remoteRepos )
+ {
+ // [MRM-582] Remote Repositories with empty and fields shouldn't be created in configuration.
+ if ( StringUtils.isBlank( repo.getUsername() ) )
+ {
+ repo.setUsername( null );
+ }
+
+ if ( StringUtils.isBlank( repo.getPassword() ) )
+ {
+ repo.setPassword( null );
+ }
+ }
+ }
+
+ if ( !config.getProxyConnectors().isEmpty() )
+ {
+ // Fix Proxy Connector Settings.
+
+ List proxyConnectorList = new ArrayList();
+ // Create a copy of the list to read from (to prevent concurrent modification exceptions)
+ proxyConnectorList.addAll( config.getProxyConnectors() );
+ // Remove the old connector list.
+ config.getProxyConnectors().clear();
+
+ for ( ProxyConnectorConfiguration connector : proxyConnectorList )
+ {
+ // Fix policies
+ boolean connectorValid = true;
+
+ Map policies = new HashMap();
+ // Make copy of policies
+ policies.putAll( connector.getPolicies() );
+ // Clear out policies
+ connector.getPolicies().clear();
+
+ // Work thru policies. cleaning them up.
+ for ( Entry entry : policies.entrySet() )
+ {
+ String policyId = entry.getKey();
+ String setting = entry.getValue();
+
+ // Upgrade old policy settings.
+ if ( "releases".equals( policyId ) || "snapshots".equals( policyId ) )
+ {
+ if ( "ignored".equals( setting ) )
+ {
+ setting = AbstractUpdatePolicy.ALWAYS;
+ }
+ else if ( "disabled".equals( setting ) )
+ {
+ setting = AbstractUpdatePolicy.NEVER;
+ }
+ }
+ else if ( "cache-failures".equals( policyId ) )
+ {
+ if ( "ignored".equals( setting ) )
+ {
+ setting = CachedFailuresPolicy.NO;
+ }
+ else if ( "cached".equals( setting ) )
+ {
+ setting = CachedFailuresPolicy.YES;
+ }
+ }
+ else if ( "checksum".equals( policyId ) )
+ {
+ if ( "ignored".equals( setting ) )
+ {
+ setting = ChecksumPolicy.IGNORE;
+ }
+ }
+
+ // Validate existance of policy key.
+ if ( policyExists( policyId ) )
+ {
+ Policy policy = findPolicy( policyId );
+ // Does option exist?
+ if ( !policy.getOptions().contains( setting ) )
+ {
+ setting = policy.getDefaultOption();
+ }
+ connector.addPolicy( policyId, setting );
+ }
+ else
+ {
+ // Policy key doesn't exist. Don't add it to golden version.
+ log.warn( "Policy [" + policyId + "] does not exist." );
+ }
+ }
+
+ if ( connectorValid )
+ {
+ config.addProxyConnector( connector );
+ }
+ }
+
+ // Normalize the order fields in the proxy connectors.
+ Map> proxyConnectorMap = config
+ .getProxyConnectorAsMap();
+
+ for ( String key : proxyConnectorMap.keySet() )
+ {
+ List connectors = proxyConnectorMap.get( key );
+ // Sort connectors by order field.
+ Collections.sort( connectors, ProxyConnectorConfigurationOrderComparator.getInstance() );
+
+ // Normalize the order field values.
+ int order = 1;
+ for ( ProxyConnectorConfiguration connector : connectors )
+ {
+ connector.setOrder( order++ );
+ }
+ }
+ }
+
+ return config;
+ }
+
+ private Policy findPolicy( String policyId )
+ {
+ if ( MapUtils.isEmpty( prePolicies ) )
+ {
+ log.error( "No PreDownloadPolicies found!" );
+ return null;
+ }
+
+ if ( MapUtils.isEmpty( postPolicies ) )
+ {
+ log.error( "No PostDownloadPolicies found!" );
+ return null;
+ }
+
+ Policy policy;
+
+ policy = prePolicies.get( policyId );
+ if ( policy != null )
+ {
+ return policy;
+ }
+
+ policy = postPolicies.get( policyId );
+ if ( policy != null )
+ {
+ return policy;
+ }
+
+ return null;
+ }
+
+ private boolean policyExists( String policyId )
+ {
+ if ( MapUtils.isEmpty( prePolicies ) )
+ {
+ log.error( "No PreDownloadPolicies found!" );
+ return false;
+ }
+
+ if ( MapUtils.isEmpty( postPolicies ) )
+ {
+ log.error( "No PostDownloadPolicies found!" );
+ return false;
+ }
+
+ return ( prePolicies.containsKey( policyId ) || postPolicies.containsKey( policyId ) );
+ }
+
+ private Registry readDefaultConfiguration()
+ {
+ // if it contains some old configuration, remove it (Archiva 0.9)
+ registry.removeSubset( KEY );
+
+ try
+ {
+ registry.addConfigurationFromResource( "org/apache/maven/archiva/configuration/default-archiva.xml", KEY );
+ this.isConfigurationDefaulted = true;
+ }
+ catch ( RegistryException e )
+ {
+ throw new ConfigurationRuntimeException(
+ "Fatal error: Unable to find the built-in default configuration and load it into the registry",
+ e );
+ }
+ return registry.getSubset( KEY );
+ }
+
+ public synchronized void save( Configuration configuration )
+ throws RegistryException, IndeterminateConfigurationException
+ {
+ Registry section = registry.getSection( KEY + ".user" );
+ Registry baseSection = registry.getSection( KEY + ".base" );
+ if ( section == null )
+ {
+ section = baseSection;
+ if ( section == null )
+ {
+ section = createDefaultConfigurationFile();
+ }
+ }
+ else if ( baseSection != null )
+ {
+ Collection keys = baseSection.getKeys();
+ boolean foundList = false;
+ for ( Iterator i = keys.iterator(); i.hasNext() && !foundList; )
+ {
+ String key = i.next();
+
+ // a little aggressive with the repositoryScanning and databaseScanning - should be no need to split
+ // that configuration
+ if ( key.startsWith( "repositories" ) || key.startsWith( "proxyConnectors" )
+ || key.startsWith( "networkProxies" ) || key.startsWith( "repositoryScanning" )
+ || key.startsWith( "databaseScanning" ) || key.startsWith( "remoteRepositories" )
+ || key.startsWith( "managedRepositories" ) || key.startsWith( "repositoryGroups" ) )
+ {
+ foundList = true;
+ }
+ }
+
+ if ( foundList )
+ {
+ this.configuration = null;
+
+ throw new IndeterminateConfigurationException(
+ "Configuration can not be saved when it is loaded from two sources" );
+ }
+ }
+
+ // escape all cron expressions to handle ','
+ escapeCronExpressions( configuration );
+
+ // [MRM-661] Due to a bug in the modello registry writer, we need to take these out by hand. They'll be put back by the writer.
+ if ( configuration.getManagedRepositories().isEmpty() )
+ {
+ section.removeSubset( "managedRepositories" );
+ }
+ if ( configuration.getRemoteRepositories().isEmpty() )
+ {
+ section.removeSubset( "remoteRepositories" );
+ }
+ if ( configuration.getProxyConnectors().isEmpty() )
+ {
+ section.removeSubset( "proxyConnectors" );
+ }
+ if ( configuration.getNetworkProxies().isEmpty() )
+ {
+ section.removeSubset( "networkProxies" );
+ }
+ if ( configuration.getLegacyArtifactPaths().isEmpty() )
+ {
+ section.removeSubset( "legacyArtifactPaths" );
+ }
+ if ( configuration.getRepositoryGroups().isEmpty() )
+ {
+ section.removeSubset( "repositoryGroups" );
+ }
+ if ( configuration.getRepositoryScanning() != null )
+ {
+ if ( configuration.getRepositoryScanning().getKnownContentConsumers().isEmpty() )
+ {
+ section.removeSubset( "repositoryScanning.knownContentConsumers" );
+ }
+ if ( configuration.getRepositoryScanning().getInvalidContentConsumers().isEmpty() )
+ {
+ section.removeSubset( "repositoryScanning.invalidContentConsumers" );
+ }
+ }
+ if ( configuration.getDatabaseScanning() != null )
+ {
+ if ( configuration.getDatabaseScanning().getCleanupConsumers().isEmpty() )
+ {
+ section.removeSubset( "databaseScanning.cleanupConsumers" );
+ }
+ if ( configuration.getDatabaseScanning().getUnprocessedConsumers().isEmpty() )
+ {
+ section.removeSubset( "databaseScanning.unprocessedConsumers" );
+ }
+ }
+
+ new ConfigurationRegistryWriter().write( configuration, section );
+ section.save();
+
+ this.configuration = unescapeExpressions( configuration );
+
+ triggerEvent( ConfigurationEvent.SAVED );
+ }
+
+ private void escapeCronExpressions( Configuration configuration )
+ {
+ for ( ManagedRepositoryConfiguration c : (List) configuration.getManagedRepositories() )
+ {
+ c.setRefreshCronExpression( escapeCronExpression( c.getRefreshCronExpression() ) );
+ }
+
+ DatabaseScanningConfiguration scanning = configuration.getDatabaseScanning();
+ if ( scanning != null )
+ {
+ scanning.setCronExpression( escapeCronExpression( scanning.getCronExpression() ) );
+ }
+ }
+
+ private Registry createDefaultConfigurationFile()
+ throws RegistryException
+ {
+ // TODO: may not be needed under commons-configuration 1.4 - check
+ // UPDATE: Upgrading to commons-configuration 1.4 breaks half the unit tests. 2007-10-11 (joakime)
+
+ String contents = "";
+ if ( !writeFile( "user configuration", userConfigFilename, contents ) )
+ {
+ if ( !writeFile( "alternative configuration", altConfigFilename, contents ) )
+ {
+ throw new RegistryException( "Unable to create configuration file in either user ["
+ + userConfigFilename + "] or alternative [" + altConfigFilename
+ + "] locations on disk, usually happens when not allowed to write to those locations." );
+ }
+ }
+
+ try
+ {
+ ( (Initializable) registry ).initialize();
+
+ for ( RegistryListener regListener : registryListeners )
+ {
+ addRegistryChangeListener( regListener );
+ }
+ }
+ catch ( InitializationException e )
+ {
+ throw new RegistryException( "Unable to reinitialize configuration: " + e.getMessage(), e );
+ }
+
+ triggerEvent( ConfigurationEvent.SAVED );
+
+ return registry.getSection( KEY + ".user" );
+ }
+
+ /**
+ * Attempts to write the contents to a file, if an IOException occurs, return false.
+ *
+ * The file will be created if the directory to the file exists, otherwise this will return false.
+ *
+ * @param filetype the filetype (freeform text) to use in logging messages when failure to write.
+ * @param path the path to write to.
+ * @param contents the contents to write.
+ * @return true if write successful.
+ */
+ private boolean writeFile( String filetype, String path, String contents )
+ {
+ File file = new File( path );
+
+ try
+ {
+ // Check parent directory (if it is declared)
+ if ( file.getParentFile() != null )
+ {
+ // Check that directory exists
+ if ( ( file.getParentFile().exists() == false ) || ( file.getParentFile().isDirectory() == false ) )
+ {
+ // Directory to file must exist for file to be created
+ return false;
+ }
+ }
+
+ FileUtils.writeStringToFile( file, contents, "UTF-8" );
+ return true;
+ }
+ catch ( IOException e )
+ {
+ log.error( "Unable to create " + filetype + " file: " + e.getMessage(), e );
+ return false;
+ }
+ }
+
+ private void triggerEvent( int type )
+ {
+ ConfigurationEvent evt = new ConfigurationEvent( type );
+ for ( ConfigurationListener listener : listeners )
+ {
+ listener.configurationEvent( evt );
+ }
+ }
+
+ public void addListener( ConfigurationListener listener )
+ {
+ if ( listener == null )
+ {
+ return;
+ }
+
+ listeners.add( listener );
+ }
+
+ public void removeListener( ConfigurationListener listener )
+ {
+ if ( listener == null )
+ {
+ return;
+ }
+
+ listeners.remove( listener );
+ }
+
+ public void addChangeListener( RegistryListener listener )
+ {
+ addRegistryChangeListener( listener );
+
+ // keep track for later
+ registryListeners.add( listener );
+ }
+
+ private void addRegistryChangeListener( RegistryListener listener )
+ {
+ Registry section = registry.getSection( KEY + ".user" );
+ if ( section != null )
+ {
+ section.addChangeListener( listener );
+ }
+ section = registry.getSection( KEY + ".base" );
+ if ( section != null )
+ {
+ section.addChangeListener( listener );
+ }
+ }
+
+ public void initialize()
+ throws InitializationException
+ {
+ // Resolve expressions in the userConfigFilename and altConfigFilename
+ try
+ {
+ ExpressionEvaluator expressionEvaluator = new DefaultExpressionEvaluator();
+ expressionEvaluator.addExpressionSource( new SystemPropertyExpressionSource() );
+ userConfigFilename = expressionEvaluator.expand( userConfigFilename );
+ altConfigFilename = expressionEvaluator.expand( altConfigFilename );
+ }
+ catch ( EvaluatorException e )
+ {
+ throw new InitializationException( "Unable to evaluate expressions found in "
+ + "userConfigFilename or altConfigFilename." );
+ }
+
+ registry.addChangeListener( this );
+ }
+
+ public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue )
+ {
+ // nothing to do here
+ }
+
+ public synchronized void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
+ {
+ configuration = null;
+ }
+
+ private String removeExpressions( String directory )
+ {
+ String value = StringUtils.replace( directory, "${appserver.base}", registry.getString( "appserver.base",
+ "${appserver.base}" ) );
+ value = StringUtils.replace( value, "${appserver.home}", registry.getString( "appserver.home",
+ "${appserver.home}" ) );
+ return value;
+ }
+
+ private String unescapeCronExpression( String cronExpression )
+ {
+ return StringUtils.replace( cronExpression, "\\,", "," );
+ }
+
+ private String escapeCronExpression( String cronExpression )
+ {
+ return StringUtils.replace( cronExpression, ",", "\\," );
+ }
+
+ private Configuration unescapeExpressions( Configuration config )
+ {
+ // TODO: for commons-configuration 1.3 only
+ for ( Iterator i = config.getManagedRepositories().iterator(); i.hasNext(); )
+ {
+ ManagedRepositoryConfiguration c = i.next();
+ c.setLocation( removeExpressions( c.getLocation() ) );
+ c.setRefreshCronExpression( unescapeCronExpression( c.getRefreshCronExpression() ) );
+ }
+
+ DatabaseScanningConfiguration databaseScanning = config.getDatabaseScanning();
+ if ( databaseScanning != null )
+ {
+ String cron = databaseScanning.getCronExpression();
+ databaseScanning.setCronExpression( unescapeCronExpression( cron ) );
+ }
+
+ return config;
+ }
+
+ private Configuration checkRepositoryLocations( Configuration config )
+ {
+ // additional check for [MRM-789], ensure that the location of the default repositories
+ // are not installed in the server installation
+ for( ManagedRepositoryConfiguration repo : (List) config.getManagedRepositories() )
+ {
+ String repoPath = repo.getLocation();
+ File repoLocation = new File( repoPath );
+
+ if( repoLocation.exists() && repoLocation.isDirectory() && !repoPath.endsWith( "data/repositories/" + repo.getId() ) )
+ {
+ repo.setLocation( repoPath + "/data/repositories/" + repo.getId() );
+ }
+ }
+
+ return config;
+ }
+
+ public String getUserConfigFilename()
+ {
+ return userConfigFilename;
+ }
+
+ public String getAltConfigFilename()
+ {
+ return altConfigFilename;
+ }
+
+ public boolean isDefaulted()
+ {
+ return this.isConfigurationDefaulted;
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
new file mode 100644
index 000000000..66be709b6
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
@@ -0,0 +1,252 @@
+package org.apache.maven.archiva.configuration;
+
+/*
+ * 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 java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.Predicate;
+import org.apache.commons.configuration.CombinedConfiguration;
+import org.apache.maven.archiva.common.utils.Slf4JPlexusLogger;
+import org.apache.maven.archiva.configuration.functors.FiletypeSelectionPredicate;
+import org.apache.maven.archiva.configuration.io.registry.ConfigurationRegistryReader;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+import org.codehaus.plexus.registry.Registry;
+import org.codehaus.plexus.registry.RegistryException;
+import org.codehaus.plexus.registry.RegistryListener;
+import org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry;
+import org.codehaus.plexus.util.SelectorUtils;
+
+/**
+ * FileTypes
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ *
+ * @plexus.component role="org.apache.maven.archiva.configuration.FileTypes"
+ */
+public class FileTypes
+ implements Initializable, RegistryListener
+{
+ public static final String ARTIFACTS = "artifacts";
+
+ public static final String AUTO_REMOVE = "auto-remove";
+
+ public static final String INDEXABLE_CONTENT = "indexable-content";
+
+ public static final String IGNORED = "ignored";
+
+ /**
+ * @plexus.requirement
+ */
+ private ArchivaConfiguration archivaConfiguration;
+
+ /**
+ * Map of default values for the file types.
+ */
+ private Map> defaultTypeMap = new HashMap>();
+
+ private List artifactPatterns;
+
+ /**
+ * Default exclusions from artifact consumers that are using the file types. Note that this is simplistic in the
+ * case of the support files (based on extension) as it is elsewhere - it may be better to match these to actual
+ * artifacts and exclude later during scanning.
+ */
+ public static final List DEFAULT_EXCLUSIONS = Arrays.asList( "**/maven-metadata.xml",
+ "**/maven-metadata-*.xml", "**/*.sha1",
+ "**/*.asc", "**/*.md5", "**/*.pgp" );
+
+ public void setArchivaConfiguration( ArchivaConfiguration archivaConfiguration )
+ {
+ this.archivaConfiguration = archivaConfiguration;
+ }
+
+ /**
+ *
+ * Get the list of patterns for a specified filetype.
+ *
+ *
+ *
+ * You will always get a list. In this order.
+ *
+ * - The Configured List
+ * - The Default List
+ * - A single item list of
"**/*"
+ *
+ *
+ *
+ * @param id the id to lookup.
+ * @return the list of patterns.
+ */
+ public List getFileTypePatterns( String id )
+ {
+ Configuration config = archivaConfiguration.getConfiguration();
+ Predicate selectedFiletype = new FiletypeSelectionPredicate( id );
+ FileType filetype = (FileType) CollectionUtils.find( config.getRepositoryScanning().getFileTypes(),
+ selectedFiletype );
+
+ if ( ( filetype != null ) && CollectionUtils.isNotEmpty( filetype.getPatterns() ) )
+ {
+ return filetype.getPatterns();
+ }
+
+ List defaultPatterns = defaultTypeMap.get( id );
+
+ if ( CollectionUtils.isEmpty( defaultPatterns ) )
+ {
+ return Collections.singletonList( "**/*" );
+ }
+
+ return defaultPatterns;
+ }
+
+ public synchronized boolean matchesArtifactPattern( String relativePath )
+ {
+ // Correct the slash pattern.
+ relativePath = relativePath.replace( '\\', '/' );
+
+ if ( artifactPatterns == null )
+ {
+ artifactPatterns = getFileTypePatterns( ARTIFACTS );
+ }
+
+ for ( String pattern : artifactPatterns )
+ {
+ if ( SelectorUtils.matchPath( pattern, relativePath, false ) )
+ {
+ // Found match
+ return true;
+ }
+ }
+
+ // No match.
+ return false;
+ }
+
+ public boolean matchesDefaultExclusions( String relativePath )
+ {
+ // Correct the slash pattern.
+ relativePath = relativePath.replace( '\\', '/' );
+
+ for ( String pattern : DEFAULT_EXCLUSIONS )
+ {
+ if ( SelectorUtils.matchPath( pattern, relativePath, false ) )
+ {
+ // Found match
+ return true;
+ }
+ }
+
+ // No match.
+ return false;
+ }
+
+ public void initialize()
+ throws InitializationException
+ {
+ // TODO: why is this done by hand?
+
+ // TODO: ideally, this would be instantiated by configuration instead, and not need to be a component
+
+ String errMsg = "Unable to load default archiva configuration for FileTypes: ";
+
+ try
+ {
+ CommonsConfigurationRegistry commonsRegistry = new CommonsConfigurationRegistry();
+
+ // Configure commonsRegistry
+ Field fld = commonsRegistry.getClass().getDeclaredField( "configuration" );
+ fld.setAccessible( true );
+ fld.set( commonsRegistry, new CombinedConfiguration() );
+ commonsRegistry.enableLogging( new Slf4JPlexusLogger( FileTypes.class ) );
+ commonsRegistry.addConfigurationFromResource( "org/apache/maven/archiva/configuration/default-archiva.xml" );
+
+ // Read configuration as it was intended.
+ ConfigurationRegistryReader configReader = new ConfigurationRegistryReader();
+ Configuration defaultConfig = configReader.read( commonsRegistry );
+
+ initialiseTypeMap( defaultConfig );
+ }
+ catch ( RegistryException e )
+ {
+ throw new InitializationException( errMsg + e.getMessage(), e );
+ }
+ catch ( SecurityException e )
+ {
+ throw new InitializationException( errMsg + e.getMessage(), e );
+ }
+ catch ( NoSuchFieldException e )
+ {
+ throw new InitializationException( errMsg + e.getMessage(), e );
+ }
+ catch ( IllegalArgumentException e )
+ {
+ throw new InitializationException( errMsg + e.getMessage(), e );
+ }
+ catch ( IllegalAccessException e )
+ {
+ throw new InitializationException( errMsg + e.getMessage(), e );
+ }
+
+ this.archivaConfiguration.addChangeListener( this );
+ }
+
+ private void initialiseTypeMap( Configuration configuration )
+ {
+ defaultTypeMap.clear();
+
+ // Store the default file type declaration.
+ List filetypes = configuration.getRepositoryScanning().getFileTypes();
+ for ( FileType filetype : filetypes )
+ {
+ List patterns = defaultTypeMap.get( filetype.getId() );
+ if ( patterns == null )
+ {
+ patterns = new ArrayList();
+ }
+ patterns.addAll( filetype.getPatterns() );
+
+ defaultTypeMap.put( filetype.getId(), patterns );
+ }
+ }
+
+ public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
+ {
+ if ( propertyName.contains( "fileType" ) )
+ {
+ artifactPatterns = null;
+
+ initialiseTypeMap( archivaConfiguration.getConfiguration() );
+ }
+ }
+
+ public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue )
+ {
+ /* nothing to do */
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/IndeterminateConfigurationException.java b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/IndeterminateConfigurationException.java
new file mode 100644
index 000000000..97d5fbdf2
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/IndeterminateConfigurationException.java
@@ -0,0 +1,32 @@
+package org.apache.maven.archiva.configuration;
+
+/*
+ * 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.
+ */
+
+/**
+ * Occurs when the configuration is stored in two locations and the save location can not be determined.
+ */
+public class IndeterminateConfigurationException
+ extends Exception
+{
+ public IndeterminateConfigurationException( String message )
+ {
+ super( message );
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/InvalidConfigurationException.java b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/InvalidConfigurationException.java
new file mode 100644
index 000000000..0efcde250
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/InvalidConfigurationException.java
@@ -0,0 +1,49 @@
+package org.apache.maven.archiva.configuration;
+
+/*
+ * 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.
+ */
+
+/**
+ * An error in the configuration.
+ *
+ * @author Brett Porter
+ */
+public class InvalidConfigurationException
+ extends Exception
+{
+ private final String name;
+
+ public InvalidConfigurationException( String name, String message )
+ {
+ super( message );
+ this.name = name;
+ }
+
+ public InvalidConfigurationException( String name, String message, Throwable cause )
+ {
+ super( message, cause );
+
+ this.name = name;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
new file mode 100644
index 000000000..e48b2d39a
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
@@ -0,0 +1,154 @@
+package org.apache.maven.archiva.configuration;
+
+/*
+ * 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.ReleasesPolicy;
+import org.apache.maven.archiva.policies.SnapshotsPolicy;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+/**
+ * @author Ben Walding
+ * @author Brett Porter
+ */
+public class MavenProxyPropertyLoader
+{
+ private static final String REPO_LOCAL_STORE = "repo.local.store";
+
+ private static final String PROXY_LIST = "proxy.list";
+
+ private static final String REPO_LIST = "repo.list";
+
+ public void load( Properties props, Configuration configuration )
+ throws InvalidConfigurationException
+ {
+ // set up the managed repository
+ String localCachePath = getMandatoryProperty( props, REPO_LOCAL_STORE );
+
+ ManagedRepositoryConfiguration config = new ManagedRepositoryConfiguration();
+ config.setLocation( localCachePath );
+ config.setName( "Imported Maven-Proxy Cache" );
+ config.setId( "maven-proxy" );
+ config.setScanned( false );
+ config.setReleases( true );
+ config.setSnapshots( false );
+ configuration.addManagedRepository( config );
+
+ // Add the network proxies.
+ String propertyList = props.getProperty( PROXY_LIST );
+ if ( propertyList != null )
+ {
+ StringTokenizer tok = new StringTokenizer( propertyList, "," );
+ while ( tok.hasMoreTokens() )
+ {
+ String key = tok.nextToken();
+ if ( StringUtils.isNotEmpty( key ) )
+ {
+ NetworkProxyConfiguration proxy = new NetworkProxyConfiguration();
+ proxy.setHost( getMandatoryProperty( props, "proxy." + key + ".host" ) );
+ proxy.setPort( Integer.parseInt( getMandatoryProperty( props, "proxy." + key + ".port" ) ) );
+
+ // the username and password isn't required
+ proxy.setUsername( props.getProperty( "proxy." + key + ".username" ) );
+ proxy.setPassword( props.getProperty( "proxy." + key + ".password" ) );
+
+ configuration.addNetworkProxy( proxy );
+ }
+ }
+ }
+
+ // Add the remote repository list
+ String repoList = getMandatoryProperty( props, REPO_LIST );
+
+ StringTokenizer tok = new StringTokenizer( repoList, "," );
+ while ( tok.hasMoreTokens() )
+ {
+ String key = tok.nextToken();
+
+ Properties repoProps = getSubset( props, "repo." + key + "." );
+ String url = getMandatoryProperty( props, "repo." + key + ".url" );
+ String proxyKey = repoProps.getProperty( "proxy" );
+
+ int cachePeriod = Integer.parseInt( repoProps.getProperty( "cache.period", "60" ) );
+
+ RemoteRepositoryConfiguration repository = new RemoteRepositoryConfiguration();
+ repository.setId( key );
+ repository.setName( "Imported Maven-Proxy Remote Proxy" );
+ repository.setUrl( url );
+ repository.setLayout( "legacy" );
+
+ configuration.addRemoteRepository( repository );
+
+ ProxyConnectorConfiguration proxyConnector = new ProxyConnectorConfiguration();
+ proxyConnector.setSourceRepoId( "maven-proxy" );
+ proxyConnector.setTargetRepoId( key );
+ proxyConnector.setProxyId( proxyKey );
+ // TODO: convert cachePeriod to closest "daily" or "hourly"
+ proxyConnector.addPolicy( ProxyConnectorConfiguration.POLICY_SNAPSHOTS, SnapshotsPolicy.DAILY );
+ proxyConnector.addPolicy( ProxyConnectorConfiguration.POLICY_RELEASES, ReleasesPolicy.ALWAYS );
+
+ configuration.addProxyConnector( proxyConnector );
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private Properties getSubset( Properties props, String prefix )
+ {
+ Enumeration keys = props.keys();
+ Properties result = new Properties();
+ while ( keys.hasMoreElements() )
+ {
+ String key = (String) keys.nextElement();
+ String value = props.getProperty( key );
+ if ( key.startsWith( prefix ) )
+ {
+ String newKey = key.substring( prefix.length() );
+ result.setProperty( newKey, value );
+ }
+ }
+ return result;
+ }
+
+ public void load( InputStream is, Configuration configuration )
+ throws IOException, InvalidConfigurationException
+ {
+ Properties props = new Properties();
+ props.load( is );
+ load( props, configuration );
+ }
+
+ private String getMandatoryProperty( Properties props, String key )
+ throws InvalidConfigurationException
+ {
+ String value = props.getProperty( key );
+
+ if ( value == null )
+ {
+ throw new InvalidConfigurationException( key, "Missing required field: " + key );
+ }
+
+ return value;
+ }
+}
\ No newline at end of file
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/FiletypeSelectionPredicate.java b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/FiletypeSelectionPredicate.java
new file mode 100644
index 000000000..cfbe58fbe
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/FiletypeSelectionPredicate.java
@@ -0,0 +1,55 @@
+package org.apache.maven.archiva.configuration.functors;
+
+/*
+ * 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.collections.Predicate;
+import org.apache.commons.lang.StringUtils;
+import org.apache.maven.archiva.configuration.FileType;
+
+/**
+ * FiletypeSelectionPredicate
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public class FiletypeSelectionPredicate
+ implements Predicate
+{
+ private String filetypeId;
+
+ public FiletypeSelectionPredicate( String id )
+ {
+ this.filetypeId = id;
+ }
+
+ public boolean evaluate( Object object )
+ {
+ boolean satisfies = false;
+
+ if ( object instanceof FileType )
+ {
+ FileType filetype = (FileType) object;
+ return ( StringUtils.equals( filetypeId, filetype.getId() ) );
+ }
+
+ return satisfies;
+ }
+
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/FiletypeToMapClosure.java b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/FiletypeToMapClosure.java
new file mode 100644
index 000000000..96f15ab2a
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/FiletypeToMapClosure.java
@@ -0,0 +1,52 @@
+package org.apache.maven.archiva.configuration.functors;
+
+/*
+ * 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.collections.Closure;
+import org.apache.maven.archiva.configuration.FileType;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * FiletypeToMapClosure
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public class FiletypeToMapClosure
+ implements Closure
+{
+ private Map map = new HashMap();
+
+ public void execute( Object input )
+ {
+ if ( input instanceof FileType )
+ {
+ FileType filetype = (FileType) input;
+ map.put( filetype.getId(), filetype );
+ }
+ }
+
+ public Map getMap()
+ {
+ return map;
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/NetworkProxyComparator.java b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/NetworkProxyComparator.java
new file mode 100644
index 000000000..aebc924ba
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/NetworkProxyComparator.java
@@ -0,0 +1,56 @@
+package org.apache.maven.archiva.configuration.functors;
+
+/*
+ * 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.configuration.NetworkProxyConfiguration;
+
+import java.util.Comparator;
+
+/**
+ * NetworkProxyComparator
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public class NetworkProxyComparator
+ implements Comparator
+{
+ public int compare( NetworkProxyConfiguration o1, NetworkProxyConfiguration o2 )
+ {
+ if ( o1 == null && o2 == null )
+ {
+ return 0;
+ }
+
+ if ( o1 == null && o2 != null )
+ {
+ return 1;
+ }
+
+ if ( o1 != null && o2 == null )
+ {
+ return -1;
+ }
+
+ String id1 = o1.getId();
+ String id2 = o2.getId();
+ return id1.compareToIgnoreCase( id2 );
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/NetworkProxySelectionPredicate.java b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/NetworkProxySelectionPredicate.java
new file mode 100644
index 000000000..b89828307
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/NetworkProxySelectionPredicate.java
@@ -0,0 +1,54 @@
+package org.apache.maven.archiva.configuration.functors;
+
+/*
+ * 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.collections.Predicate;
+import org.apache.commons.lang.StringUtils;
+import org.apache.maven.archiva.configuration.NetworkProxyConfiguration;
+
+/**
+ * NetworkProxySelectionPredicate
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public class NetworkProxySelectionPredicate
+ implements Predicate
+{
+ private String proxyId;
+
+ public NetworkProxySelectionPredicate( String id )
+ {
+ this.proxyId = id;
+ }
+
+ public boolean evaluate( Object object )
+ {
+ boolean satisfies = false;
+
+ if ( object instanceof NetworkProxyConfiguration )
+ {
+ NetworkProxyConfiguration proxy = (NetworkProxyConfiguration) object;
+ return ( StringUtils.equals( proxyId, proxy.getId() ) );
+ }
+
+ return satisfies;
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java
new file mode 100644
index 000000000..6c6cffe6f
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java
@@ -0,0 +1,73 @@
+package org.apache.maven.archiva.configuration.functors;
+
+/*
+ * 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.configuration.ProxyConnectorConfiguration;
+
+import java.util.Comparator;
+
+/**
+ * ProxyConnectorConfigurationOrderComparator
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public class ProxyConnectorConfigurationOrderComparator
+ implements Comparator
+{
+ private static ProxyConnectorConfigurationOrderComparator INSTANCE = new ProxyConnectorConfigurationOrderComparator();
+
+ public int compare( ProxyConnectorConfiguration o1, ProxyConnectorConfiguration o2 )
+ {
+ if ( o1 == null && o2 == null )
+ {
+ return 0;
+ }
+
+ // Ensure null goes to end of list.
+ if ( o1 == null && o2 != null )
+ {
+ return 1;
+ }
+
+ if ( o1 != null && o2 == null )
+ {
+ return -1;
+ }
+
+ // Ensure 0 (unordered) goes to end of list.
+ if ( o1.getOrder() == 0 && o2.getOrder() != 0 )
+ {
+ return 1;
+ }
+
+ if ( o1.getOrder() != 0 && o2.getOrder() == 0 )
+ {
+ return -1;
+ }
+
+ return o1.getOrder() - o2.getOrder();
+ }
+
+ public static ProxyConnectorConfigurationOrderComparator getInstance()
+ {
+ return INSTANCE;
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java
new file mode 100644
index 000000000..af18c6c5f
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java
@@ -0,0 +1,59 @@
+package org.apache.maven.archiva.configuration.functors;
+
+/*
+ * 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.collections.Predicate;
+import org.apache.commons.lang.StringUtils;
+import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
+
+/**
+ * ProxyConnectorPredicate
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public class ProxyConnectorSelectionPredicate
+ implements Predicate
+{
+ private String sourceId;
+
+ private String targetId;
+
+ public ProxyConnectorSelectionPredicate( String sourceId, String targetId )
+ {
+ this.sourceId = sourceId;
+ this.targetId = targetId;
+ }
+
+ public boolean evaluate( Object object )
+ {
+ boolean satisfies = false;
+
+ if ( object instanceof ProxyConnectorConfiguration )
+ {
+ ProxyConnectorConfiguration connector = (ProxyConnectorConfiguration) object;
+ return ( StringUtils.equals( sourceId, connector.getSourceRepoId() ) && StringUtils
+ .equals( targetId, connector.getTargetRepoId() ) );
+ }
+
+ return satisfies;
+ }
+
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparator.java b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparator.java
new file mode 100644
index 000000000..caf99d343
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/RepositoryConfigurationComparator.java
@@ -0,0 +1,54 @@
+package org.apache.maven.archiva.configuration.functors;
+
+/*
+ * 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.configuration.AbstractRepositoryConfiguration;
+
+import java.util.Comparator;
+
+/**
+ * RepositoryConfigurationComparator
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public class RepositoryConfigurationComparator
+ implements Comparator
+{
+ public int compare( AbstractRepositoryConfiguration o1, AbstractRepositoryConfiguration o2 )
+ {
+ if ( o1 == null && o2 == null )
+ {
+ return 0;
+ }
+
+ if ( o1 == null )
+ {
+ return -1;
+ }
+
+ if ( o2 == null )
+ {
+ return 1;
+ }
+
+ return o1.getId().compareToIgnoreCase( o2.getId() );
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
new file mode 100644
index 000000000..b7523ef13
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
@@ -0,0 +1,1127 @@
+
+
+
+
+ configuration
+ Configuration
+
+ Configuration for the Maven Repository Manager.
+
+
+
+ package
+ org.apache.maven.archiva.configuration
+
+
+
+
+ Configuration
+ 1.0.0+
+
+
+ version
+ 1.0.0+
+ String
+ true
+ This is the version of the configuration format.
+
+
+
+ @deprecated use managedRepositories or remoteRepositories instead.
+
+ repositories
+ 1.0.0+
+
+ V1RepositoryConfiguration
+ *
+
+
+
+ repositoryGroups
+ 1.2.0+
+
+ RepositoryGroupConfiguration
+ *
+
+ The list of repository groups.
+
+
+ managedRepositories
+ 1.0.0+
+
+ ManagedRepositoryConfiguration
+ *
+
+ The list of repositories that this archiva instance uses.
+
+
+ remoteRepositories
+ 1.0.0+
+
+ RemoteRepositoryConfiguration
+ *
+
+ The list of repositories that this archiva can retrieve from or publish to.
+
+
+ proxyConnectors
+ 1.0.0+
+
+ ProxyConnectorConfiguration
+ *
+
+ The list of proxy connectors for this archiva instance.
+
+
+
+ networkProxies
+ 1.0.0+
+
+ NetworkProxyConfiguration
+ *
+
+
+ The list of network proxies to use for outgoing requests.
+
+
+
+ legacyArtifactPaths
+ 1.1.0+
+
+ LegacyArtifactPath
+ *
+
+
+ The list of custom legacy path to artifact.
+
+
+
+ repositoryScanning
+ 1.0.0+
+
+ RepositoryScanningConfiguration
+ 1
+
+
+ The repository scanning configuration.
+
+
+
+ databaseScanning
+ 1.0.0+
+
+ DatabaseScanningConfiguration
+ 1
+
+
+ The database scanning configuration.
+
+
+
+ webapp
+ 1.0.0+
+
+ WebappConfiguration
+ 1
+
+
+ The webapp configuration.
+
+
+
+ organisationInfo
+ 1.1.0+
+
+ OrganisationInformation
+ 1
+
+
+ The organisation info.
+
+
+
+
+
+ 1.2.0+
+ > repositoryToGroupMap;
+
+ public java.util.Map> getRepositoryToGroupMap()
+ {
+ if ( repositoryGroups != null )
+ {
+ java.util.Map> map = new java.util.HashMap>();
+
+ for ( RepositoryGroupConfiguration group : (java.util.List) repositoryGroups )
+ {
+ for ( String repositoryId : (java.util.List) group.getRepositories() )
+ {
+ java.util.List groups = map.get( repositoryId );
+ if ( groups == null )
+ {
+ groups = new java.util.ArrayList();
+ map.put( repositoryId, groups );
+ }
+ groups.add( group.getId() );
+ }
+ }
+
+ repositoryToGroupMap = map;
+ }
+ return repositoryToGroupMap;
+ }
+
+ public java.util.Map getRepositoryGroupsAsMap()
+ {
+ java.util.Map map = new java.util.HashMap();
+ if ( repositoryGroups != null )
+ {
+ for ( RepositoryGroupConfiguration group : (java.util.List) repositoryGroups )
+ {
+ map.put( group.getId(), group );
+ }
+ }
+ return map;
+ }
+
+ public RepositoryGroupConfiguration findRepositoryGroupById( String id )
+ {
+ if ( repositoryGroups != null )
+ {
+ for ( RepositoryGroupConfiguration group : (java.util.List) repositoryGroups )
+ {
+ if ( group.getId().equals( id ) )
+ {
+ return group;
+ }
+ }
+ }
+ return null;
+ }
+
+ private java.util.Map> groupToRepositoryMap;
+
+ public java.util.Map> getGroupToRepositoryMap()
+ {
+ if ( repositoryGroups != null && managedRepositories != null )
+ {
+ java.util.Map> map = new java.util.HashMap>();
+
+ for ( ManagedRepositoryConfiguration repo : (java.util.List) managedRepositories )
+ {
+ for ( RepositoryGroupConfiguration group : (java.util.List) repositoryGroups )
+ {
+ if ( !group.getRepositories().contains( repo.getId() ) )
+ {
+ String groupId = group.getId();
+ java.util.List repos = map.get( groupId );
+ if ( repos == null )
+ {
+ repos = new java.util.ArrayList();
+ map.put( groupId, repos );
+ }
+ repos.add( repo.getId() );
+ }
+ }
+ }
+ groupToRepositoryMap = map;
+ }
+ return groupToRepositoryMap;
+ }
+ ]]>
+
+
+ 1.0.0+
+ getNetworkProxiesAsMap()
+ {
+ java.util.Map map = new java.util.HashMap();
+ if ( networkProxies != null )
+ {
+ for ( java.util.Iterator i = networkProxies.iterator(); i.hasNext(); )
+ {
+ NetworkProxyConfiguration proxy = i.next();
+ map.put( proxy.getId(), proxy );
+ }
+ }
+ return map;
+ }
+
+ public java.util.Map> getProxyConnectorAsMap()
+ {
+ java.util.Map> proxyConnectorMap =
+ new java.util.HashMap>();
+
+ java.util.Iterator it = proxyConnectors.iterator();
+ while ( it.hasNext() )
+ {
+ ProxyConnectorConfiguration proxyConfig = it.next();
+ String key = proxyConfig.getSourceRepoId();
+
+ java.util.List connectors = proxyConnectorMap.get( key );
+ if ( connectors == null )
+ {
+ connectors = new java.util.ArrayList();
+ proxyConnectorMap.put( key, connectors );
+ }
+
+ connectors.add( proxyConfig );
+ java.util.Collections.sort( connectors,
+ org.apache.maven.archiva.configuration.functors.ProxyConnectorConfigurationOrderComparator.getInstance() );
+ }
+
+ return proxyConnectorMap;
+ }
+
+ public java.util.Map getRemoteRepositoriesAsMap()
+ {
+ java.util.Map map = new java.util.HashMap();
+ if ( remoteRepositories != null )
+ {
+ for ( java.util.Iterator i = remoteRepositories.iterator(); i.hasNext(); )
+ {
+ RemoteRepositoryConfiguration repo = i.next();
+ map.put( repo.getId(), repo );
+ }
+ }
+ return map;
+ }
+
+ public RemoteRepositoryConfiguration findRemoteRepositoryById( String id )
+ {
+ if ( remoteRepositories != null )
+ {
+ for ( java.util.Iterator i = remoteRepositories.iterator(); i.hasNext(); )
+ {
+ RemoteRepositoryConfiguration repo = i.next();
+ if ( repo.getId().equals( id ) )
+ {
+ return repo;
+ }
+ }
+ }
+ return null;
+ }
+
+ public java.util.Map getManagedRepositoriesAsMap()
+ {
+ java.util.Map map = new java.util.HashMap();
+ if ( managedRepositories != null )
+ {
+ for ( java.util.Iterator i = managedRepositories.iterator(); i.hasNext(); )
+ {
+ ManagedRepositoryConfiguration repo = i.next();
+ map.put( repo.getId(), repo );
+ }
+ }
+ return map;
+ }
+
+ public ManagedRepositoryConfiguration findManagedRepositoryById( String id )
+ {
+ if ( managedRepositories != null )
+ {
+ for ( java.util.Iterator i = managedRepositories.iterator(); i.hasNext(); )
+ {
+ ManagedRepositoryConfiguration repo = i.next();
+ if ( repo.getId().equals( id ) )
+ {
+ return repo;
+ }
+ }
+ }
+ return null;
+ }
+ ]]>
+
+
+
+
+
+
+
+ AbstractRepositoryConfiguration
+ 1.0.0+
+ true
+
+
+ id
+ 1.0.0+
+ String
+ true
+
+ The repository identifier.
+
+
+
+ name
+ 1.0.0+
+ String
+ true
+
+ The descriptive name of the repository.
+
+
+
+ layout
+ 1.0.0+
+ String
+ true
+
+ The layout of the repository. Valid values are "default" and "legacy".
+
+
+ default
+
+
+
+
+ RemoteRepositoryConfiguration
+ 1.0.0+
+ AbstractRepositoryConfiguration
+
+
+ url
+ 1.0.0+
+ String
+ true
+
+ The URL for this repository.
+
+
+
+ username
+ 1.0.0+
+ String
+
+ The Username for this repository.
+
+
+
+ password
+ 1.0.0+
+ String
+
+ The Password for this repository.
+
+
+
+ timeout
+ 1.0.1+
+ int
+
+ Timeout in seconds for connections to this repository
+
+ 60
+
+
+
+
+ ManagedRepositoryConfiguration
+ 1.0.0+
+ AbstractRepositoryConfiguration
+
+
+ location
+ 1.0.0+
+ String
+ true
+
+ The file system location for this repository.
+
+
+
+ releases
+ 1.0.0+
+ boolean
+ True if this repository contains release versioned artifacts.
+ true
+
+
+ snapshots
+ 1.0.0+
+ boolean
+ True if this repository contains snapshot versioned artifacts.
+ false
+
+
+ scanned
+ 1.0.0+
+ boolean
+ True if this repository should be scanned and processed.
+ true
+
+
+ indexDir
+ 1.0.0+
+ String
+
+ The directory for the indexes of this repository.
+
+
+
+ refreshCronExpression
+ 1.0.0+
+ String
+
+ When to run the refresh task.
+ Default is every hour
+
+ 0 0 * * * ?
+
+
+ retentionCount
+ 1.0.0+
+ int
+
+ The total count of the artifact to be retained for each snapshot.
+
+ 2
+
+
+ daysOlder
+ 1.0.0+
+ int
+
+ The number of days old which will be the basis for removing a snapshot.
+
+ 100
+
+
+ deleteReleasedSnapshots
+ 1.0.0+
+ boolean
+
+ True if the released snapshots are to be removed from the repo during repository purge.
+
+ false
+
+
+
+
+ V1RepositoryConfiguration
+ 1.0.0+
+ ManagedRepositoryConfiguration
+
+
+ url
+ 1.0.0+
+ String
+ true
+
+ The URL for this repository.
+
+
+
+ indexed
+ 1.0.0+
+ boolean
+ true
+
+
+
+
+
+ LegacyArtifactPath
+ 1.1.0+
+
+
+ path
+ 1.1.0+
+ String
+ true
+
+ The legacy path.
+
+
+
+ artifact
+ 1.1.0+
+ String
+ true
+
+ The artifact reference, as " [groupId] : [artifactId] : [version] : [classifier] : [type] ".
+
+
+
+
+
+ 1.0.0+
+ 0 ? classifier : null;
+ }
+
+ public String getType()
+ {
+ return artifact.split( ":" )[4];
+ }
+ ]]>
+
+
+
+
+ RepositoryGroupConfiguration
+ 1.2.0+
+
+
+ id
+ 1.2.0+
+ String
+ true
+ The id of the repository group.
+
+
+ repositories
+ 1.2.0+
+
+ String
+ *
+
+ The list of repository ids under the group.
+
+
+
+
+
+
+
+ AbstractRepositoryConnectorConfiguration
+ true
+ 1.0.0+
+
+
+ sourceRepoId
+ 1.0.0+
+ String
+ true
+
+ The Repository Source for this connector.
+
+
+
+ targetRepoId
+ 1.0.0+
+ String
+ true
+
+ The Repository Target for this connector.
+
+
+
+ proxyId
+ 1.0.0+
+ String
+
+ The network proxy ID to use for this connector.
+
+
+
+ blackListPatterns
+ 1.0.0+
+
+ String
+ *
+
+
+ The list of blacklisted patterns for this connector.
+
+
+
+ whiteListPatterns
+ 1.0.0+
+
+ String
+ *
+
+
+ The list of whitelisted patterns for this connector.
+
+
+
+ policies
+ 1.0.0+
+ Map
+ Policy configuration for the connector.
+
+ String
+ *
+
+
+
+ properties
+ 1.0.0+
+ Map
+ Configuration for the connector.
+
+ String
+ *
+
+
+
+
+
+ 1.0.0+
+
+ * Event that triggers at the beginning of a scan.
+ *
+ *
+ *
+ * NOTE: This would be a good place to initialize the consumer, to lock any resources, and to
+ * generally start tracking the scan as a whole.
+ *
+ */
+ public void beginScan();
+
+ /**
+ *
+ * Event indicating an {@link ArchivaArtifact} is to be processed by this consumer.
+ *
+ *
+ *
+ * NOTE: The consumer does not need to process the artifact immediately, can can opt to queue and/or track
+ * the artifact to be processed in batch. Just be sure to complete the processing by the {@link #completeScan()}
+ * event.
+ *
+ *
+ * @param file the file to process.
+ * @throws ConsumerException if there was a problem processing this file.
+ */
+ public void processArchivaArtifact( ArchivaArtifact artifact ) throws ConsumerException;
+
+ /**
+ *
+ * Event that triggers on the completion of a scan.
+ *
+ *
+ *
+ * NOTE: If the consumer opted to batch up processing requests in the
+ * {@link #processArchivaArtifact(ArchivaArtifact)} event this would be the last opportunity to drain
+ * any processing queue's.
+ *
+ */
+ public void completeScan();
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java
new file mode 100644
index 000000000..2f32f1fec
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java
@@ -0,0 +1,64 @@
+package org.apache.maven.archiva.consumers;
+
+/*
+ * 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.
+ */
+
+/**
+ * BaseConsumer - the base set of methods for a consumer.
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public abstract interface BaseConsumer
+{
+ /**
+ * This is the id for the consumer.
+ *
+ * @return the consumer id.
+ */
+ public String getId();
+
+ /**
+ * The human readable description for this consumer.
+ *
+ * @return the human readable description for this consumer.
+ */
+ public String getDescription();
+
+ /**
+ * Flag indicating permanance of consumer. (if it can be disabled or not)
+ *
+ * @return true indicating that consumer is permanent and cannot be disabled.
+ */
+ public boolean isPermanent();
+
+ /**
+ * Add a consumer monitor to the consumer.
+ *
+ * @param monitor the monitor to add.
+ */
+ public void addConsumerMonitor( ConsumerMonitor monitor );
+
+ /**
+ * Remove a consumer monitor.
+ *
+ * @param monitor the monitor to remove.
+ */
+ public void removeConsumerMonitor( ConsumerMonitor monitor );
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ConsumerException.java b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ConsumerException.java
new file mode 100644
index 000000000..3b91c5ba3
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ConsumerException.java
@@ -0,0 +1,42 @@
+package org.apache.maven.archiva.consumers;
+
+/*
+ * 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.common.ArchivaException;
+
+/**
+ * ConsumerException - details about the failure of a consumer.
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public class ConsumerException
+ extends ArchivaException
+{
+ public ConsumerException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+
+ public ConsumerException( String message )
+ {
+ super( message );
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ConsumerMonitor.java b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ConsumerMonitor.java
new file mode 100644
index 000000000..971414764
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ConsumerMonitor.java
@@ -0,0 +1,55 @@
+package org.apache.maven.archiva.consumers;
+
+/*
+ * 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.
+ */
+
+/**
+ * ConsumerMonitor - a monitor for consumers.
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public interface ConsumerMonitor
+{
+ /**
+ * A consumer error event.
+ *
+ * @param consumer the consumer that caused the error.
+ * @param type the type of error.
+ * @param message the message about the error.
+ */
+ public void consumerError( BaseConsumer consumer, String type, String message );
+
+ /**
+ * A consumer warning event.
+ *
+ * @param consumer the consumer that caused the warning.
+ * @param type the type of warning.
+ * @param message the message about the warning.
+ */
+ public void consumerWarning( BaseConsumer consumer, String type, String message );
+
+ /**
+ * A consumer informational event.
+ *
+ * @param consumer the consumer that caused the informational message.
+ * @param message the message.
+ */
+ public void consumerInfo( BaseConsumer consumer, String message );
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/DatabaseCleanupConsumer.java b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/DatabaseCleanupConsumer.java
new file mode 100644
index 000000000..e9bbd0946
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/DatabaseCleanupConsumer.java
@@ -0,0 +1,32 @@
+package org.apache.maven.archiva.consumers;
+
+/*
+ * 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.
+ */
+
+/**
+ * DatabaseCleanupConsumer
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public interface DatabaseCleanupConsumer
+ extends ArchivaArtifactConsumer
+{
+
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/DatabaseUnprocessedArtifactConsumer.java b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/DatabaseUnprocessedArtifactConsumer.java
new file mode 100644
index 000000000..b34d0dd7f
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/DatabaseUnprocessedArtifactConsumer.java
@@ -0,0 +1,32 @@
+package org.apache.maven.archiva.consumers;
+
+/*
+ * 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.
+ */
+
+/**
+ * DatabaseUnprocessedArtifactConsumer
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public interface DatabaseUnprocessedArtifactConsumer
+ extends ArchivaArtifactConsumer
+{
+
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/InvalidRepositoryContentConsumer.java b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/InvalidRepositoryContentConsumer.java
new file mode 100644
index 000000000..af31c545a
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/InvalidRepositoryContentConsumer.java
@@ -0,0 +1,32 @@
+package org.apache.maven.archiva.consumers;
+
+/*
+ * 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.
+ */
+
+/**
+ * Consumer for Invalid Repository Content
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public interface InvalidRepositoryContentConsumer
+ extends RepositoryContentConsumer
+{
+
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/KnownRepositoryContentConsumer.java b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/KnownRepositoryContentConsumer.java
new file mode 100644
index 000000000..884101143
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/KnownRepositoryContentConsumer.java
@@ -0,0 +1,32 @@
+package org.apache.maven.archiva.consumers;
+
+/*
+ * 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.
+ */
+
+/**
+ * Consumer for Known Repository Content.
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public interface KnownRepositoryContentConsumer
+ extends RepositoryContentConsumer
+{
+
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java
new file mode 100644
index 000000000..9b23e1713
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/RepositoryContentConsumer.java
@@ -0,0 +1,101 @@
+package org.apache.maven.archiva.consumers;
+
+/*
+ * 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.configuration.ManagedRepositoryConfiguration;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * A consumer of content (files) in the repository.
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public interface RepositoryContentConsumer extends BaseConsumer
+{
+ /**
+ * Get the list of included file patterns for this consumer.
+ *
+ * @return the list of {@link String} patterns. (example: "**/*.pom")
+ */
+ public List getIncludes();
+
+ /**
+ * Get the list of excluded file patterns for this consumer.
+ *
+ * @return the list of {@link String} patterns. (example: "**/*.pom") - (can be null for no exclusions)
+ */
+ public List getExcludes();
+
+ /**
+ *
+ * Event that triggers at the beginning of a scan.
+ *
+ *
+ *
+ * NOTE: This would be a good place to initialize the consumer, to lock any resources, and to
+ * generally start tracking the scan as a whole.
+ *
+ *
+ * @param repository the repository that this consumer is being used for.
+ * @param whenGathered the start of the repository scan
+ * @throws ConsumerException if there was a problem with using the provided repository with the consumer.
+ */
+ public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered ) throws ConsumerException;
+
+ /**
+ *
+ * Event indicating a file is to be processed by this consumer.
+ *
+ *
+ *
+ * NOTE: The consumer does not need to process the file immediately, can can opt to queue and/or track
+ * the files to be processed in batch. Just be sure to complete the processing by the {@link #completeScan()}
+ * event.
+ *
+ *
+ * @param path the relative file path (in the repository) to process.
+ * @throws ConsumerException if there was a problem processing this file.
+ */
+ public void processFile( String path ) throws ConsumerException;
+
+ /**
+ *
+ * Event that triggers on the completion of a scan.
+ *
+ *
+ *
+ * NOTE: If the consumer opted to batch up processing requests in the {@link #processFile(String)} event
+ * this would be the last opportunity to drain any processing queue's.
+ *
+ *
+ * @todo! this is never called by the RepositoryScannerInstance
+ */
+ public void completeScan();
+
+ /**
+ * Whether the consumer should process files that have not been modified since the time passed in to the scan
+ * method.
+ * @return whether to process the unmodified files
+ */
+ boolean isProcessUnmodified();
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/PermanentConsumerPredicate.java b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/PermanentConsumerPredicate.java
new file mode 100644
index 000000000..92b9e3a55
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/functors/PermanentConsumerPredicate.java
@@ -0,0 +1,48 @@
+package org.apache.maven.archiva.consumers.functors;
+
+/*
+ * 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.collections.Predicate;
+import org.apache.maven.archiva.consumers.BaseConsumer;
+
+/**
+ * Selects Consumers that are flaged as 'permanent'.
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ */
+public class PermanentConsumerPredicate
+ implements Predicate
+{
+
+ public boolean evaluate( Object object )
+ {
+ boolean satisfies = false;
+
+ if ( object instanceof BaseConsumer )
+ {
+ BaseConsumer consumer = (BaseConsumer) object;
+ satisfies = consumer.isPermanent();
+ }
+
+ return satisfies;
+ }
+
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
new file mode 100644
index 000000000..8b85df5a0
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
@@ -0,0 +1,73 @@
+
+
+
+
+ 4.0.0
+
+ org.apache.archiva
+ archiva-consumers
+ 1.2-SNAPSHOT
+ ../pom.xml
+
+
+ archiva-core-consumers
+ Archiva Consumers :: Core Consumers
+
+
+
+ org.apache.archiva
+ archiva-database
+
+
+ org.apache.archiva
+ archiva-indexer
+
+
+ org.apache.archiva
+ archiva-configuration
+
+
+ org.apache.archiva
+ archiva-consumer-api
+
+
+ org.apache.archiva
+ archiva-repository-layer
+
+
+ org.codehaus.plexus
+ plexus-digest
+
+
+ org.codehaus.plexus
+ plexus-spring
+ test
+
+
+
+
+ hsqldb
+ hsqldb
+ test
+
+
+ xmlunit
+ xmlunit
+ test
+
+
+
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
new file mode 100644
index 000000000..553289929
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
@@ -0,0 +1,208 @@
+package org.apache.maven.archiva.consumers.core;
+
+/*
+ * 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.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.configuration.FileTypes;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
+import org.apache.maven.archiva.consumers.ConsumerException;
+import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+import org.codehaus.plexus.digest.ChecksumFile;
+import org.codehaus.plexus.digest.Digester;
+import org.codehaus.plexus.digest.DigesterException;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+import org.codehaus.plexus.registry.Registry;
+import org.codehaus.plexus.registry.RegistryListener;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * ArtifactMissingChecksumsConsumer - Create missing checksums for the artifact.
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ * @plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
+ * role-hint="create-missing-checksums"
+ * instantiation-strategy="per-lookup"
+ */
+public class ArtifactMissingChecksumsConsumer
+ extends AbstractMonitoredConsumer
+ implements KnownRepositoryContentConsumer, RegistryListener, Initializable
+{
+ /**
+ * @plexus.configuration default-value="create-missing-checksums"
+ */
+ private String id;
+
+ /**
+ * @plexus.configuration default-value="Create Missing Checksums (.sha1 & .md5)"
+ */
+ private String description;
+
+ /**
+ * @plexus.requirement
+ */
+ private ArchivaConfiguration configuration;
+
+ /**
+ * @plexus.requirement
+ */
+ private FileTypes filetypes;
+
+ /**
+ * @plexus.requirement role-hint="sha1"
+ */
+ private Digester digestSha1;
+
+ /**
+ * @plexus.requirement role-hint="md5";
+ */
+ private Digester digestMd5;
+
+ /**
+ * @plexus.requirement
+ */
+ private ChecksumFile checksum;
+
+ private static final String TYPE_CHECKSUM_NOT_FILE = "checksum-bad-not-file";
+
+ private static final String TYPE_CHECKSUM_CANNOT_CALC = "checksum-calc-failure";
+
+ private static final String TYPE_CHECKSUM_CANNOT_CREATE = "checksum-create-failure";
+
+ private File repositoryDir;
+
+ private List propertyNameTriggers = new ArrayList();
+
+ private List includes = new ArrayList();
+
+ public String getId()
+ {
+ return this.id;
+ }
+
+ public String getDescription()
+ {
+ return this.description;
+ }
+
+ public boolean isPermanent()
+ {
+ return false;
+ }
+
+ public void beginScan( ManagedRepositoryConfiguration repo, Date whenGathered )
+ throws ConsumerException
+ {
+ this.repositoryDir = new File( repo.getLocation() );
+ }
+
+ public void completeScan()
+ {
+ /* do nothing */
+ }
+
+ public List getExcludes()
+ {
+ return getDefaultArtifactExclusions();
+ }
+
+ public List getIncludes()
+ {
+ return includes;
+ }
+
+ public void processFile( String path )
+ throws ConsumerException
+ {
+ createIfMissing( path, digestSha1 );
+ createIfMissing( path, digestMd5 );
+ }
+
+ private void createIfMissing( String path, Digester digester )
+ {
+ File checksumFile = new File( this.repositoryDir, path + digester.getFilenameExtension() );
+ if ( !checksumFile.exists() )
+ {
+ try
+ {
+ checksum.createChecksum( new File( this.repositoryDir, path ), digester );
+ triggerConsumerInfo( "Created missing checksum file " + checksumFile.getAbsolutePath() );
+ }
+ catch ( DigesterException e )
+ {
+ triggerConsumerError( TYPE_CHECKSUM_CANNOT_CALC,
+ "Cannot calculate checksum for file " + checksumFile + ": " + e.getMessage() );
+ }
+ catch ( IOException e )
+ {
+ triggerConsumerError( TYPE_CHECKSUM_CANNOT_CREATE,
+ "Cannot create checksum for file " + checksumFile + ": " + e.getMessage() );
+ }
+ }
+ else if ( !checksumFile.isFile() )
+ {
+ triggerConsumerWarning( TYPE_CHECKSUM_NOT_FILE,
+ "Checksum file " + checksumFile.getAbsolutePath() + " is not a file." );
+ }
+
+ }
+
+ public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
+ {
+ if ( propertyNameTriggers.contains( propertyName ) )
+ {
+ initIncludes();
+ }
+ }
+
+ public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue )
+ {
+ /* do nothing */
+ }
+
+ private void initIncludes()
+ {
+ includes.clear();
+
+ includes.addAll( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS ) );
+ }
+
+ public void initialize()
+ throws InitializationException
+ {
+ propertyNameTriggers = new ArrayList();
+ propertyNameTriggers.add( "repositoryScanning" );
+ propertyNameTriggers.add( "fileTypes" );
+ propertyNameTriggers.add( "fileType" );
+ propertyNameTriggers.add( "patterns" );
+ propertyNameTriggers.add( "pattern" );
+
+ configuration.addChangeListener( this );
+
+ initIncludes();
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
new file mode 100644
index 000000000..618b91f21
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRemoveConsumer.java
@@ -0,0 +1,158 @@
+package org.apache.maven.archiva.consumers.core;
+
+/*
+ * 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.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.configuration.FileTypes;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
+import org.apache.maven.archiva.consumers.ConsumerException;
+import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+import org.codehaus.plexus.registry.Registry;
+import org.codehaus.plexus.registry.RegistryListener;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * AutoRemoveConsumer
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ * @plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
+ * role-hint="auto-remove"
+ * instantiation-strategy="per-lookup"
+ */
+public class AutoRemoveConsumer
+ extends AbstractMonitoredConsumer
+ implements KnownRepositoryContentConsumer, RegistryListener, Initializable
+{
+ /**
+ * @plexus.configuration default-value="auto-remove"
+ */
+ private String id;
+
+ /**
+ * @plexus.configuration default-value="Automatically Remove File from Filesystem."
+ */
+ private String description;
+
+ /**
+ * @plexus.requirement
+ */
+ private ArchivaConfiguration configuration;
+
+ /**
+ * @plexus.requirement
+ */
+ private FileTypes filetypes;
+
+ private File repositoryDir;
+
+ private List propertyNameTriggers = new ArrayList();
+
+ private List includes = new ArrayList();
+
+ public String getId()
+ {
+ return this.id;
+ }
+
+ public String getDescription()
+ {
+ return this.description;
+ }
+
+ public boolean isPermanent()
+ {
+ return false;
+ }
+
+ public void beginScan( ManagedRepositoryConfiguration repository, Date whenGathered )
+ throws ConsumerException
+ {
+ this.repositoryDir = new File( repository.getLocation() );
+ }
+
+ public void completeScan()
+ {
+ /* do nothing */
+ }
+
+ public List getExcludes()
+ {
+ return null;
+ }
+
+ public List getIncludes()
+ {
+ return includes;
+ }
+
+ public void processFile( String path )
+ throws ConsumerException
+ {
+ File file = new File( this.repositoryDir, path );
+ if ( file.exists() )
+ {
+ triggerConsumerInfo( "(Auto) Removing File: " + file.getAbsolutePath() );
+ file.delete();
+ }
+ }
+
+ public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
+ {
+ if ( propertyNameTriggers.contains( propertyName ) )
+ {
+ initIncludes();
+ }
+ }
+
+ public void beforeConfigurationChange( Registry registry, String propertyName, Object propertyValue )
+ {
+ /* do nothing */
+ }
+
+ private void initIncludes()
+ {
+ includes.clear();
+
+ includes.addAll( filetypes.getFileTypePatterns( FileTypes.AUTO_REMOVE ) );
+ }
+
+ public void initialize()
+ throws InitializationException
+ {
+ propertyNameTriggers = new ArrayList();
+ propertyNameTriggers.add( "repositoryScanning" );
+ propertyNameTriggers.add( "fileTypes" );
+ propertyNameTriggers.add( "fileType" );
+ propertyNameTriggers.add( "patterns" );
+ propertyNameTriggers.add( "pattern" );
+
+ configuration.addChangeListener( this );
+
+ initIncludes();
+ }
+}
diff --git a/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
new file mode 100644
index 000000000..4c694473e
--- /dev/null
+++ b/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/AutoRenameConsumer.java
@@ -0,0 +1,147 @@
+package org.apache.maven.archiva.consumers.core;
+
+/*
+ * 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.io.FileUtils;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
+import org.apache.maven.archiva.consumers.ConsumerException;
+import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AutoRenameConsumer
+ *
+ * @author Joakim Erdfelt
+ * @version $Id$
+ * @plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
+ * role-hint="auto-rename"
+ * instantiation-strategy="per-lookup"
+ */
+public class AutoRenameConsumer
+ extends AbstractMonitoredConsumer
+ implements KnownRepositoryContentConsumer
+{
+ /**
+ * @plexus.configuration default-value="auto-rename"
+ */
+ private String id;
+
+ /**
+ * @plexus.configuration default-value="Automatically rename common artifact mistakes."
+ */
+ private String description;
+
+ private static final String RENAME_FAILURE = "rename_failure";
+
+ private File repositoryDir;
+
+ private List includes = new ArrayList
+ 
