commits@archiva.apache.org Archives

svn commit: r887086 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng: config/ org/apache/archiva/web/test/ org/apache/archiva/web/test/parent/

2009-12-04T07:06:38Z

Author: mbaclay
Date: Fri Dec  4 07:06:37 2009
New Revision: 887086

URL: http://svn.apache.org/viewvc?rev=887086&view=rev
Log:
[MRM-1241] Selenium Tests for Repository Scanning and Database
- adding test scripts for Database


Added:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/DatabaseTest.java
Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml?rev=887086&r1=887085&r2=887086&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml
Fri Dec  4 07:06:37 2009
@@ -41,6 +41,7 @@
 				
 				
 				
+				
 			
 		
 		

Added: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/DatabaseTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/DatabaseTest.java?rev=887086&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/DatabaseTest.java
(added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/DatabaseTest.java
Fri Dec  4 07:06:37 2009
@@ -0,0 +1,95 @@
+package org.apache.archiva.web.test;
+
+/*
+ * 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.archiva.web.test.parent.AbstractRepositoryTest;
+import org.testng.annotations.Test;
+
+@Test( groups = { "database" }, dependsOnMethods = { "testWithCorrectUsernamePassword" },
sequential = true )
+public class DatabaseTest
+	extends AbstractRepositoryTest
+{
+	public void testUpdateCron_NullValue()
+	{
+		goToDatabasePage();
+		setFieldValue( "database_cron" , "");
+		clickButtonWithValue( "Update Cron" );
+		assertTextPresent( "Invalid cron expression value(s)" );
+		assertTextPresent( "You must enter a cron expression." );
+	}
+	
+	@Test (dependsOnMethods = { "testUpdateCron_NullValue" } )
+	public void testUpdateCron_InvalidValue()
+	{
+		setFieldValue( "database_cron" , "asdf" );
+		clickButtonWithValue( "Update Cron" );
+		assertTextPresent( "Invalid cron expression value(s)" );
+	}
+	
+	@Test (dependsOnMethods = { "testUpdateCron_InvalidValue" } )
+	public void testUpdateCron_ValidValue()
+	{
+		setFieldValue( "database_cron" , "0 0 * * * ?" );
+		clickButtonWithValue( "Update Cron" );
+		assertPage( "Apache Archiva \\ Administration - Database" );
+	}
+	
+	@Test (dependsOnMethods = { "testUpdateCron_ValidValue" } )
+	public void testUpdateConsumersUnprocessedArtifactsScanning_UnsetAll()
+	{
+		getSelenium().uncheck( "enabledUnprocessedConsumers" );
+		clickSubmitWithLocator( "//input[@id='database_0' and @value='Update Consumers']" );
+		
+		assertPage( "Apache Archiva \\ Administration - Database" );
+	}
+	
+	@Test (dependsOnMethods = { "testUpdateConsumersUnprocessedArtifactsScanning_UnsetAll" }
)
+	public void testUpdateConsumersUnprocessedArtifactsScanning()
+	{
+		checkField( "enabledUnprocessedConsumers" );
+		clickSubmitWithLocator( "//input[@id='database_0' and @value='Update Consumers']" );
+		assertPage( "Apache Archiva \\ Administration - Database" );
+	}
+	
+	@Test (dependsOnMethods = { "testUpdateConsumersUnprocessedArtifactsScanning" } )
+	public void testUpdateConsumersArtifactCleanupScanning_UnsetAll()
+	{
+		getSelenium().uncheck( "enabledCleanupConsumers" );
+		getSelenium().uncheck( "//input[@name='enabledCleanupConsumers' and @value='not-present-remove-db-project']"
);
+		getSelenium().uncheck( "//input[@name='enabledCleanupConsumers' and @value='not-present-remove-indexed']"
);
+		clickSubmitWithLocator( "//form[@id='database']/table/tbody/tr[5]/td/input" );
+		assertPage( "Apache Archiva \\ Administration - Database" );
+	}
+	
+	@Test (dependsOnMethods = { "testUpdateConsumersArtifactCleanupScanning_UnsetAll" } )
+	public void testUpdateConsumersArtifactCleanupScanning()
+	{
+		checkField( "enabledCleanupConsumers" );
+		clickSubmitWithLocator( "//form[@id='database']/table/tbody/tr[5]/td/input" );
+		assertPage( "Apache Archiva \\ Administration - Database" );
+	}
+	
+	@Test (dependsOnMethods = { "testUpdateConsumersArtifactCleanupScanning" } )
+	public void testUpdateDatabaseNow()
+	{
+		clickButtonWithValue( "Update Database Now" );
+		assertPage( "Apache Archiva \\ Administration - Database" );
+	}
+}

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java?rev=887086&r1=887085&r2=887086&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java
Fri Dec  4 07:06:37 2009
@@ -39,7 +39,8 @@
 	
 	@Test(dependsOnMethods = { "testAddManagedRepoValidValues" } )
 	public void testAddManagedRepoInvalidValues()
-	{		
+	{	
+		goToRepositoriesPage();	
 	    assertRepositoriesPage();
 	    clickLinkWithLocator( "//div[@id='contentArea']/div/div/a[@href='/archiva/admin/addRepository.action']"
);	
 		addManagedRepository( "", "" , "" , "", "Maven 2.x Repository", "", "", "" );

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java?rev=887086&r1=887085&r2=887086&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java
Fri Dec  4 07:06:37 2009
@@ -52,6 +52,7 @@
 	@Test(dependsOnMethods = { "testAddRepositoryToRepositoryGroup" } )
 	public void testDeleteRepositoryOfRepositoryGroup()
 	{   	    
+		goToRepositoryGroupsPage();
 		deleteRepositoryInRepositoryGroups();
 		assertTextPresent( "Repository Groups" );
 		assertTextNotPresent( "No Repository Groups Defined." );

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java?rev=887086&r1=887085&r2=887086&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java
Fri Dec  4 07:06:37 2009
@@ -340,7 +340,7 @@
 		assertTextPresent( "Administration - Database" );
 		assertTextPresent( "Database - Unprocessed Artifacts Scanning" );
 		assertTextPresent( "Cron:" );
-		assertElementPresent( "cron" );
+		assertElementPresent( "database_cron" );
 		assertButtonWithValuePresent( "Update Cron" );
 		assertButtonWithValuePresent( "Update Database Now" );
 		assertTextPresent( "Database - Unprocessed Artifacts Scanning" );

svn commit: r887053 - /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java

2009-12-04T04:22:23Z

Author: brett
Date: Fri Dec  4 04:22:20 2009
New Revision: 887053

URL: http://svn.apache.org/viewvc?rev=887053&view=rev
Log:
fix incorrect merge

Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java?rev=887053&r1=887052&r2=887053&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
Fri Dec  4 04:22:20 2009
@@ -231,7 +231,7 @@
         assertEquals( ARCHIVA_TEST_ARTIFACT_ID, artifact.getArtifactId() );
         assertEquals( "1.0", artifact.getVersion() );
         assertEquals( "jar", artifact.getType() );
-        assertNull( "Repository should be null since the model was not found in the database!",
artifact.getRepositoryId() );
+        assertEquals( "public.releases", artifact.getRepositoryId() );
     }
 
     public void testQuickSearchArtifactRegularSearch()

svn commit: r887052 - in /archiva/branches/MRM-1025/archiva-modules/archiva-scheduler: archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ archi...

2009-12-04T04:08:31Z

Author: brett
Date: Fri Dec  4 04:08:30 2009
New Revision: 887052

URL: http://svn.apache.org/viewvc?rev=887052&view=rev
Log:
Merged /archiva/trunk:r885006-887051 (applied changes to scheduler manually due to different
location)

Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java?rev=887052&r1=887051&r2=887052&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
Fri Dec  4 04:08:30 2009
@@ -91,9 +91,9 @@
                 }
                 catch ( IOException e )
                 {
-                    log.error( "Error occurred while executing indexing task '" + indexingTask
+ "'" );
+                    log.error( "Error occurred while executing indexing task '" + indexingTask
+ "': " + e.getMessage() );
                     throw new TaskExecutionException( "Error occurred while executing indexing
task '" + indexingTask
-                        + "'" );
+                        + "'", e );
                 }
                 finally
                 {
@@ -166,9 +166,9 @@
                 }
                 catch ( IOException e )
                 {
-                    log.error( "Error occurred while executing indexing task '" + indexingTask
+ "'" );
+                    log.error( "Error occurred while executing indexing task '" + indexingTask
+ "': " + e.getMessage() );
                     throw new TaskExecutionException( "Error occurred while executing indexing
task '" + indexingTask
-                        + "'" );
+                        + "'", e );
                 }
             }
         }

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java?rev=887052&r1=887051&r2=887052&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
Fri Dec  4 04:08:30 2009
@@ -203,6 +203,8 @@
         IndexSearcher searcher = new IndexSearcher( repositoryConfig.getLocation() + "/.indexer"
);
         TopDocs topDocs = searcher.search( q, null, 10 );
 
+        searcher.close();
+
         assertTrue( new File( repositoryConfig.getLocation(), ".indexer" ).exists() );
         assertFalse( new File( repositoryConfig.getLocation(), ".index" ).exists() );
 

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java?rev=887052&r1=887051&r2=887052&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
Fri Dec  4 04:08:30 2009
@@ -9,7 +9,7 @@
  * "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
+ *   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
@@ -152,7 +152,7 @@
                     RepositoryContentStatistics lastStats = results.get( 0 );
                     if( !repoTask.isScanAll() )
                     {
-                        sinceWhen = lastStats.getWhenGathered().getTime() + lastStats.getDuration();
+                        sinceWhen = lastStats.getWhenGathered().getTime() - lastStats.getDuration();
                     }
                 }
 
@@ -210,7 +210,7 @@
             log.error( "Error occurred while querying artifacts for artifact count : " +
ae.getMessage() );
         }
 
-        // total repo size
+        // total repo size -- TODO: needs to exclude ignored files (eg .svn)
         long size = FileUtils.sizeOfDirectory( new File( arepo.getLocation() ) );
         dbstats.setTotalSize( size );
 

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java?rev=887052&r1=887051&r2=887052&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java
Fri Dec  4 04:08:30 2009
@@ -32,6 +32,7 @@
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
 import org.apache.maven.archiva.database.ArchivaDAO;
 import org.apache.maven.archiva.database.ArtifactDAO;
+import org.apache.maven.archiva.database.constraints.MostRecentRepositoryScanStatistics;
 import org.apache.maven.archiva.model.ArchivaArtifact;
 import org.apache.maven.archiva.model.RepositoryContentStatistics;
 import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
@@ -42,7 +43,7 @@
 import org.jpox.SchemaTool;
 
 /**
- * ArchivaRepositoryScanningTaskExecutorTest 
+ * ArchivaRepositoryScanningTaskExecutorTest
  *
  * @version $Id$
  */
@@ -52,42 +53,44 @@
     private TaskExecutor taskExecutor;
 
     protected ArchivaDAO dao;
-    
+
     private File repoDir;
-    
+
+    private static final String TEST_REPO_ID = "testRepo";
+
     protected void setUp()
         throws Exception
     {
         super.setUp();
-        
+
         DefaultConfigurableJdoFactory jdoFactory = (DefaultConfigurableJdoFactory) lookup(
JdoFactory.ROLE, "archiva" );
         assertEquals( DefaultConfigurableJdoFactory.class.getName(), jdoFactory.getClass().getName()
);
 
-        jdoFactory.setPersistenceManagerFactoryClass( "org.jpox.PersistenceManagerFactoryImpl"
); 
+        jdoFactory.setPersistenceManagerFactoryClass( "org.jpox.PersistenceManagerFactoryImpl"
);
 
         /* derby version
-        File derbyDbDir = new File( "target/plexus-home/testdb" );
-        if ( derbyDbDir.exists() )
-        {
-            FileUtils.deleteDirectory( derbyDbDir );
-        }
-
-        jdoFactory.setDriverName( System.getProperty( "jdo.test.driver", "org.apache.derby.jdbc.EmbeddedDriver"
) );   
-        jdoFactory.setUrl( System.getProperty( "jdo.test.url", "jdbc:derby:" + derbyDbDir.getAbsolutePath()
+ ";create=true" ) );
-         */   
+       File derbyDbDir = new File( "target/plexus-home/testdb" );
+       if ( derbyDbDir.exists() )
+       {
+           FileUtils.deleteDirectory( derbyDbDir );
+       }
+
+       jdoFactory.setDriverName( System.getProperty( "jdo.test.driver", "org.apache.derby.jdbc.EmbeddedDriver"
) );
+       jdoFactory.setUrl( System.getProperty( "jdo.test.url", "jdbc:derby:" + derbyDbDir.getAbsolutePath()
+ ";create=true" ) );
+        */
 
-        jdoFactory.setDriverName( System.getProperty( "jdo.test.driver", "org.hsqldb.jdbcDriver"
) );   
+        jdoFactory.setDriverName( System.getProperty( "jdo.test.driver", "org.hsqldb.jdbcDriver"
) );
         jdoFactory.setUrl( System.getProperty( "jdo.test.url", "jdbc:hsqldb:mem:" + getName()
) );
-        
-        jdoFactory.setUserName( System.getProperty( "jdo.test.user", "sa" ) ); 
 
-        jdoFactory.setPassword( System.getProperty( "jdo.test.pass", "" ) ); 
+        jdoFactory.setUserName( System.getProperty( "jdo.test.user", "sa" ) );
 
-        jdoFactory.setProperty( "org.jpox.transactionIsolation", "READ_COMMITTED" );  
+        jdoFactory.setPassword( System.getProperty( "jdo.test.pass", "" ) );
 
-        jdoFactory.setProperty( "org.jpox.poid.transactionIsolation", "READ_COMMITTED" );
 
+        jdoFactory.setProperty( "org.jpox.transactionIsolation", "READ_COMMITTED" );
 
-        jdoFactory.setProperty( "org.jpox.autoCreateSchema", "true" );  
+        jdoFactory.setProperty( "org.jpox.poid.transactionIsolation", "READ_COMMITTED" );
+
+        jdoFactory.setProperty( "org.jpox.autoCreateSchema", "true" );
 
         jdoFactory.setProperty( "javax.jdo.option.RetainValues", "true" );
 
@@ -108,8 +111,7 @@
             System.setProperty( (String) entry.getKey(), (String) entry.getValue() );
         }
 
-        URL jdoFileUrls[] = new URL[] { getClass()
-            .getResource( "/org/apache/maven/archiva/model/package.jdo" ) }; 
+        URL jdoFileUrls[] = new URL[]{getClass().getResource( "/org/apache/maven/archiva/model/package.jdo"
)};
 
         if ( ( jdoFileUrls == null ) || ( jdoFileUrls[0] == null ) )
         {
@@ -119,8 +121,8 @@
         File propsFile = null; // intentional
         boolean verbose = true;
 
-        SchemaTool.deleteSchemaTables( jdoFileUrls, new URL[] {}, propsFile, verbose );
-        SchemaTool.createSchemaTables( jdoFileUrls, new URL[] {}, propsFile, verbose, null
);
+        SchemaTool.deleteSchemaTables( jdoFileUrls, new URL[]{}, propsFile, verbose );
+        SchemaTool.createSchemaTables( jdoFileUrls, new URL[]{}, propsFile, verbose, null
);
 
         PersistenceManagerFactory pmf = jdoFactory.getPersistenceManagerFactory();
 
@@ -133,156 +135,275 @@
         this.dao = (ArchivaDAO) lookup( ArchivaDAO.class.getName(), "jdo" );
 
         taskExecutor = (TaskExecutor) lookup( TaskExecutor.class, "test-repository-scanning"
);
-        
+
         File sourceRepoDir = new File( getBasedir(), "src/test/repositories/default-repository"
);
-        repoDir = new File( getBasedir(), "target/default-repository" );  
-        
+        repoDir = new File( getBasedir(), "target/default-repository" );
+
+        FileUtils.deleteDirectory( repoDir );
+        assertFalse( "Default Test Repository should not exist.", repoDir.exists() );
+
         repoDir.mkdir();
-        
+
         FileUtils.copyDirectoryStructure( sourceRepoDir, repoDir );
-        
-        assertTrue( repoDir.exists() );
-    }
-    
-    protected void tearDown() throws Exception
-    {   
-        FileUtils.deleteDirectory( repoDir );
-        
-        assertFalse( repoDir.exists() );
-        
-        super.tearDown();
-    }
-    
-    public void testExecutor() throws Exception
-    {
+        // set the timestamps to a time well in the past
+        Calendar cal = Calendar.getInstance();
+        cal.add( Calendar.YEAR, -1 );
+        for ( File f : (List) FileUtils.getFiles( repoDir, "**", null ) )
+        {
+            f.setLastModified( cal.getTimeInMillis() );
+        }
+        for ( String dir : (List) FileUtils.getDirectoryNames( repoDir, "**/.svn",
null, false ) )
+        {
+            FileUtils.deleteDirectory( new File( repoDir, dir ) );
+        }
+
         assertTrue( "Default Test Repository should exist.", repoDir.exists() &&
repoDir.isDirectory() );
 
         ArchivaConfiguration archivaConfig = (ArchivaConfiguration) lookup( ArchivaConfiguration.class
);
         assertNotNull( archivaConfig );
-        
+
         // Create it
-        ManagedRepositoryConfiguration repo = createRepository( "testRepo", "Test Repository",
repoDir );
-        assertNotNull( repo );
+        ManagedRepositoryConfiguration repositoryConfiguration = new ManagedRepositoryConfiguration();
+        repositoryConfiguration.setId( TEST_REPO_ID );
+        repositoryConfiguration.setName( "Test Repository" );
+        repositoryConfiguration.setLocation( repoDir.getAbsolutePath() );
         archivaConfig.getConfiguration().getManagedRepositories().clear();
-        archivaConfig.getConfiguration().addManagedRepository( repo );
+        archivaConfig.getConfiguration().addManagedRepository( repositoryConfiguration );
+    }
 
+    protected void tearDown()
+        throws Exception
+    {
+        FileUtils.deleteDirectory( repoDir );
+
+        assertFalse( repoDir.exists() );
+
+        super.tearDown();
+    }
+
+    public void testExecutor()
+        throws Exception
+    {
         RepositoryTask repoTask = new RepositoryTask();
-        
-        repoTask.setRepositoryId( "testRepo" );
-        
+
+        repoTask.setRepositoryId( TEST_REPO_ID );
+
         taskExecutor.executeTask( repoTask );
 
         ArtifactDAO adao = dao.getArtifactDAO();
         List unprocessedResultList = adao.queryArtifacts( null );
-        
+
         assertNotNull( unprocessedResultList );
-        assertEquals("Incorrect number of unprocessed artifacts detected.", 8, unprocessedResultList.size()
);
+        assertEquals( "Incorrect number of unprocessed artifacts detected.", 8, unprocessedResultList.size()
);
     }
-    
+
     public void testExecutorScanOnlyNewArtifacts()
         throws Exception
-    {  
-        assertTrue( "Default Test Repository should exist.", repoDir.exists() &&
repoDir.isDirectory() );
-
-        ArchivaConfiguration archivaConfig = (ArchivaConfiguration) lookup( ArchivaConfiguration.class
);
-        assertNotNull( archivaConfig );
-        
-        // Create it
-        ManagedRepositoryConfiguration repo = createRepository( "testRepo", "Test Repository",
repoDir );
-        assertNotNull( repo );
-        archivaConfig.getConfiguration().getManagedRepositories().clear();
-        archivaConfig.getConfiguration().addManagedRepository( repo );
-
+    {
         RepositoryTask repoTask = new RepositoryTask();
-        
-        repoTask.setRepositoryId( "testRepo" );
+
+        repoTask.setRepositoryId( TEST_REPO_ID );
         repoTask.setScanAll( false );
-        
-        RepositoryContentStatistics stats = new RepositoryContentStatistics();
-        stats.setDuration( 1234567 );
-        stats.setNewFileCount( 8 );
-        stats.setRepositoryId( "testRepo" );
-        stats.setTotalArtifactCount( 8 );
-        stats.setTotalFileCount( 8 );
-        stats.setTotalGroupCount( 3 );
-        stats.setTotalProjectCount( 5 );
-        stats.setTotalSize( 999999 );
-        stats.setWhenGathered( Calendar.getInstance().getTime() );
-        
-        dao.getRepositoryContentStatisticsDAO().saveRepositoryContentStatistics( stats );
-        
+
+        createAndSaveTestStats();
+
         taskExecutor.executeTask( repoTask );
 
+        // check no artifacts processed
         ArtifactDAO adao = dao.getArtifactDAO();
         List unprocessedResultList = adao.queryArtifacts( null );
-        
+
         assertNotNull( unprocessedResultList );
-        assertEquals("Incorrect number of unprocessed artifacts detected. No new artifacts
should have been found.", 0, unprocessedResultList.size() );
-        
-        File newArtifactGroup = new File( repoDir, "org/apache/archiva");
-        
-        FileUtils.copyDirectoryStructure( new File( getBasedir(), "target/test-classes/test-repo/org/apache/archiva"),
newArtifactGroup );
+        assertEquals( "Incorrect number of unprocessed artifacts detected. No new artifacts
should have been found.", 0,
+                      unprocessedResultList.size() );
+
+        // check correctness of new stats
+        List results =
+            (List) dao.query( new MostRecentRepositoryScanStatistics(
TEST_REPO_ID ) );
+        RepositoryContentStatistics newStats = results.get( 0 );
+        assertEquals( 0, newStats.getNewFileCount() );
+        assertEquals( TEST_REPO_ID, newStats.getRepositoryId() );
+        assertEquals( 31, newStats.getTotalFileCount() );
+        // TODO: can't test these as they weren't stored in the database
+//        assertEquals( 8, newStats.getTotalArtifactCount() );
+//        assertEquals( 3, newStats.getTotalGroupCount() );
+//        assertEquals( 5, newStats.getTotalProjectCount() );
+        assertEquals( 14159, newStats.getTotalSize() );
+
+        File newArtifactGroup = new File( repoDir, "org/apache/archiva" );
+
+        FileUtils.copyDirectoryStructure( new File( getBasedir(), "target/test-classes/test-repo/org/apache/archiva"
),
+                                          newArtifactGroup );
 
         // update last modified date
-        new File( newArtifactGroup, "archiva-index-methods-jar-test/1.0/pom.xml" ).setLastModified(
Calendar.getInstance().getTimeInMillis() + 1000 );
-        new File( newArtifactGroup, "archiva-index-methods-jar-test/1.0/archiva-index-methods-jar-test-1.0.jar"
).setLastModified( Calendar.getInstance().getTimeInMillis() + 1000 );
+        new File( newArtifactGroup, "archiva-index-methods-jar-test/1.0/pom.xml" ).setLastModified(
+            Calendar.getInstance().getTimeInMillis() + 1000 );
+        new File( newArtifactGroup,
+                  "archiva-index-methods-jar-test/1.0/archiva-index-methods-jar-test-1.0.jar"
).setLastModified(
+            Calendar.getInstance().getTimeInMillis() + 1000 );
 
         assertTrue( newArtifactGroup.exists() );
-        
+
         taskExecutor.executeTask( repoTask );
-        
+
         unprocessedResultList = adao.queryArtifacts( null );
         assertNotNull( unprocessedResultList );
-        assertEquals( "Incorrect number of unprocessed artifacts detected. One new artifact
should have been found.", 1, unprocessedResultList.size() );        
+        assertEquals( "Incorrect number of unprocessed artifacts detected. One new artifact
should have been found.", 1,
+                      unprocessedResultList.size() );
+
+        // check correctness of new stats
+        results =
+            (List) dao.query( new MostRecentRepositoryScanStatistics(
TEST_REPO_ID ) );
+        RepositoryContentStatistics updatedStats = results.get( 0 );
+        assertEquals( 2, updatedStats.getNewFileCount() );
+        assertEquals( TEST_REPO_ID, updatedStats.getRepositoryId() );
+        assertEquals( 33, updatedStats.getTotalFileCount() );
+        // TODO: can't test these as they weren't stored in the database
+//        assertEquals( 8, newStats.getTotalArtifactCount() );
+//        assertEquals( 3, newStats.getTotalGroupCount() );
+//        assertEquals( 5, newStats.getTotalProjectCount() );
+        assertEquals( 19301, updatedStats.getTotalSize() );
     }
-    
-    public void testExecutorForceScanAll()
+
+    public void testExecutorScanOnlyNewArtifactsChangeTimes()
         throws Exception
     {
-        assertTrue( "Default Test Repository should exist.", repoDir.exists() &&
repoDir.isDirectory() );
+        RepositoryTask repoTask = new RepositoryTask();
 
-        ArchivaConfiguration archivaConfig = (ArchivaConfiguration) lookup( ArchivaConfiguration.class
);
-        assertNotNull( archivaConfig );
-        
-        // Create it
-        ManagedRepositoryConfiguration repo = createRepository( "testRepo", "Test Repository",
repoDir );
-        assertNotNull( repo );
-        archivaConfig.getConfiguration().getManagedRepositories().clear();
-        archivaConfig.getConfiguration().addManagedRepository( repo );
+        repoTask.setRepositoryId( TEST_REPO_ID );
+        repoTask.setScanAll( false );
+
+        createAndSaveTestStats();
+
+        File newArtifactGroup = new File( repoDir, "org/apache/archiva" );
+
+        FileUtils.copyDirectoryStructure( new File( getBasedir(), "target/test-classes/test-repo/org/apache/archiva"
),
+                                          newArtifactGroup );
+
+        // update last modified date, placing shortly after last scan
+        new File( newArtifactGroup, "archiva-index-methods-jar-test/1.0/pom.xml" ).setLastModified(
+            Calendar.getInstance().getTimeInMillis() + 1000 );
+        new File( newArtifactGroup,
+                  "archiva-index-methods-jar-test/1.0/archiva-index-methods-jar-test-1.0.jar"
).setLastModified(
+            Calendar.getInstance().getTimeInMillis() + 1000 );
+
+        assertTrue( newArtifactGroup.exists() );
+
+        // scan using the really long previous duration
+        taskExecutor.executeTask( repoTask );
+
+        // check no artifacts processed
+        ArtifactDAO adao = dao.getArtifactDAO();
+        List unprocessedResultList = adao.queryArtifacts( null );
+        assertNotNull( unprocessedResultList );
+        assertEquals( "Incorrect number of unprocessed artifacts detected. One new artifact
should have been found.", 1,
+                      unprocessedResultList.size() );
+
+        // check correctness of new stats
+        List results =
+            (List) dao.query( new MostRecentRepositoryScanStatistics(
TEST_REPO_ID ) );
+        RepositoryContentStatistics newStats = results.get( 0 );
+        assertEquals( 2, newStats.getNewFileCount() );
+        assertEquals( TEST_REPO_ID, newStats.getRepositoryId() );
+        assertEquals( 33, newStats.getTotalFileCount() );
+        // TODO: can't test these as they weren't stored in the database
+//        assertEquals( 8, newStats.getTotalArtifactCount() );
+//        assertEquals( 3, newStats.getTotalGroupCount() );
+//        assertEquals( 5, newStats.getTotalProjectCount() );
+        assertEquals( 19301, newStats.getTotalSize() );
+    }
+
+    public void testExecutorScanOnlyNewArtifactsMidScan()
+        throws Exception
+    {
+        RepositoryTask repoTask = new RepositoryTask();
+
+        repoTask.setRepositoryId( TEST_REPO_ID );
+        repoTask.setScanAll( false );
+
+        createAndSaveTestStats();
+
+        File newArtifactGroup = new File( repoDir, "org/apache/archiva" );
 
+        FileUtils.copyDirectoryStructure( new File( getBasedir(), "target/test-classes/test-repo/org/apache/archiva"
),
+                                          newArtifactGroup );
+
+        // update last modified date, placing in middle of last scan
+        new File( newArtifactGroup, "archiva-index-methods-jar-test/1.0/pom.xml" ).setLastModified(
+            Calendar.getInstance().getTimeInMillis() - 50000 );
+        new File( newArtifactGroup,
+                  "archiva-index-methods-jar-test/1.0/archiva-index-methods-jar-test-1.0.jar"
).setLastModified(
+            Calendar.getInstance().getTimeInMillis() - 50000 );
+
+        assertTrue( newArtifactGroup.exists() );
+
+        // scan using the really long previous duration
+        taskExecutor.executeTask( repoTask );
+
+        // check no artifacts processed
+        ArtifactDAO adao = dao.getArtifactDAO();
+        List unprocessedResultList = adao.queryArtifacts( null );
+        assertNotNull( unprocessedResultList );
+        assertEquals( "Incorrect number of unprocessed artifacts detected. One new artifact
should have been found.", 1,
+                      unprocessedResultList.size() );
+
+        // check correctness of new stats
+        List results =
+            (List) dao.query( new MostRecentRepositoryScanStatistics(
TEST_REPO_ID ) );
+        RepositoryContentStatistics newStats = results.get( 0 );
+        assertEquals( 2, newStats.getNewFileCount() );
+        assertEquals( TEST_REPO_ID, newStats.getRepositoryId() );
+        assertEquals( 33, newStats.getTotalFileCount() );
+        // TODO: can't test these as they weren't stored in the database
+//        assertEquals( 8, newStats.getTotalArtifactCount() );
+//        assertEquals( 3, newStats.getTotalGroupCount() );
+//        assertEquals( 5, newStats.getTotalProjectCount() );
+        assertEquals( 19301, newStats.getTotalSize() );
+    }
+
+    private void createAndSaveTestStats()
+    {
+        RepositoryContentStatistics stats = new RepositoryContentStatistics();
+        stats.setDuration( 1234567 );
+        stats.setNewFileCount( 31 );
+        stats.setRepositoryId( TEST_REPO_ID );
+        stats.setTotalArtifactCount( 8 );
+        stats.setTotalFileCount( 31 );
+        stats.setTotalGroupCount( 3 );
+        stats.setTotalProjectCount( 5 );
+        stats.setTotalSize( 38545 );
+        stats.setWhenGathered( Calendar.getInstance().getTime() );
+
+        dao.getRepositoryContentStatisticsDAO().saveRepositoryContentStatistics( stats );
+    }
+
+    public void testExecutorForceScanAll()
+        throws Exception
+    {
         RepositoryTask repoTask = new RepositoryTask();
-        
-        repoTask.setRepositoryId( "testRepo" );
+
+        repoTask.setRepositoryId( TEST_REPO_ID );
         repoTask.setScanAll( true );
-        
+
         RepositoryContentStatistics stats = new RepositoryContentStatistics();
         stats.setDuration( 1234567 );
         stats.setNewFileCount( 8 );
-        stats.setRepositoryId( "testRepo" );
+        stats.setRepositoryId( TEST_REPO_ID );
         stats.setTotalArtifactCount( 8 );
         stats.setTotalFileCount( 8 );
         stats.setTotalGroupCount( 3 );
         stats.setTotalProjectCount( 5 );
         stats.setTotalSize( 999999 );
         stats.setWhenGathered( Calendar.getInstance().getTime() );
-        
+
         dao.getRepositoryContentStatisticsDAO().saveRepositoryContentStatistics( stats );
-        
+
         taskExecutor.executeTask( repoTask );
 
         ArtifactDAO adao = dao.getArtifactDAO();
         List unprocessedResultList = adao.queryArtifacts( null );
-        
+
         assertNotNull( unprocessedResultList );
-        assertEquals("Incorrect number of unprocessed artifacts detected.", 8, unprocessedResultList.size()
);
-    }
-    
-    protected ManagedRepositoryConfiguration createRepository( String id, String name, File
location )
-    {
-        ManagedRepositoryConfiguration repo = new ManagedRepositoryConfiguration();
-        repo.setId( id );
-        repo.setName( name );
-        repo.setLocation( location.getAbsolutePath() );
-        return repo;
+        assertEquals( "Incorrect number of unprocessed artifacts detected.", 8, unprocessedResultList.size()
);
     }
 }

svn commit: r887051 - in /archiva/trunk/archiva-modules/archiva-scheduled/src: main/java/org/apache/maven/archiva/scheduled/executors/ test/java/org/apache/maven/archiva/scheduled/executors/

2009-12-04T04:07:13Z

Author: brett
Date: Fri Dec  4 04:07:12 2009
New Revision: 887051

URL: http://svn.apache.org/viewvc?rev=887051&view=rev
Log:
exclude .svn directories in the test:wq

Modified:
    archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
    archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java

Modified: archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java?rev=887051&r1=887050&r2=887051&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
(original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
Fri Dec  4 04:07:12 2009
@@ -187,7 +187,7 @@
             log.error( "Error occurred while querying artifacts for artifact count : " +
ae.getMessage() );
         }
 
-        // total repo size
+        // total repo size -- TODO: needs to exclude ignored files (eg .svn)
         long size = FileUtils.sizeOfDirectory( new File( arepo.getLocation() ) );
         dbstats.setTotalSize( size );
 

Modified: archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java?rev=887051&r1=887050&r2=887051&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
(original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
Fri Dec  4 04:07:12 2009
@@ -154,6 +154,10 @@
         {
             f.setLastModified( cal.getTimeInMillis() );
         }
+        for ( String dir : (List) FileUtils.getDirectoryNames( repoDir, "**/.svn",
null, false ) )
+        {
+            FileUtils.deleteDirectory( new File( repoDir, dir ) );
+        }
 
         assertTrue( "Default Test Repository should exist.", repoDir.exists() &&
repoDir.isDirectory() );
 
@@ -226,7 +230,7 @@
 //        assertEquals( 8, newStats.getTotalArtifactCount() );
 //        assertEquals( 3, newStats.getTotalGroupCount() );
 //        assertEquals( 5, newStats.getTotalProjectCount() );
-        assertEquals( 38545, newStats.getTotalSize() );
+        assertEquals( 14159, newStats.getTotalSize() );
 
         File newArtifactGroup = new File( repoDir, "org/apache/archiva" );
 
@@ -260,7 +264,7 @@
 //        assertEquals( 8, newStats.getTotalArtifactCount() );
 //        assertEquals( 3, newStats.getTotalGroupCount() );
 //        assertEquals( 5, newStats.getTotalProjectCount() );
-        assertEquals( 43687, updatedStats.getTotalSize() );
+        assertEquals( 19301, updatedStats.getTotalSize() );
     }
 
     public void testExecutorScanOnlyNewArtifactsChangeTimes()
@@ -308,7 +312,7 @@
 //        assertEquals( 8, newStats.getTotalArtifactCount() );
 //        assertEquals( 3, newStats.getTotalGroupCount() );
 //        assertEquals( 5, newStats.getTotalProjectCount() );
-        assertEquals( 43687, newStats.getTotalSize() );
+        assertEquals( 19301, newStats.getTotalSize() );
     }
 
     public void testExecutorScanOnlyNewArtifactsMidScan()
@@ -356,7 +360,7 @@
 //        assertEquals( 8, newStats.getTotalArtifactCount() );
 //        assertEquals( 3, newStats.getTotalGroupCount() );
 //        assertEquals( 5, newStats.getTotalProjectCount() );
-        assertEquals( 43687, newStats.getTotalSize() );
+        assertEquals( 19301, newStats.getTotalSize() );
     }
 
     private void createAndSaveTestStats()
@@ -369,7 +373,7 @@
         stats.setTotalFileCount( 31 );
         stats.setTotalGroupCount( 3 );
         stats.setTotalProjectCount( 5 );
-        stats.setTotalSize( 38545 );
+        stats.setTotalSize( 14159 );
         stats.setWhenGathered( Calendar.getInstance().getTime() );
 
         dao.getRepositoryContentStatisticsDAO().saveRepositoryContentStatistics( stats );

svn commit: r887043 [3/3] - in /archiva/branches/MRM-1025: ./ archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/or...

2009-12-04T03:00:26Z

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:825850-883981,883982-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:825850-883981,883982-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:825850-883981,883982-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:825850-883981,883982-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:825850-883981,883982-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:825850-883981,883982-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:825850-882383,883982-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:825850-882383,883982-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:721945-723577
+/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:699795-705848
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:825850-882383,885006-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:721945-723577
+/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:699795-705848
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:825850-882383,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:721945-723577
+/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:699795-705848
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:825850-882383,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:721945-723577
+/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:699795-705848
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:825850-882383,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:721945-723577
+/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:699795-705848
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:825850-882383,885006-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:825850-887039

Modified: archiva/branches/MRM-1025/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/pom.xml?rev=887043&r1=887042&r2=887043&view=diff
==============================================================================
--- archiva/branches/MRM-1025/pom.xml (original)
+++ archiva/branches/MRM-1025/pom.xml Fri Dec  4 03:00:22 2009
@@ -1221,28 +1221,4 @@
       
     
   
-  
-    
-      
-        true
-      
-      
-        false
-      
-      sonatype.public
-      Sonatype Public Repo
-      http://repository.sonatype.org/content/repositories/sonatype-apache-releases
-     
-    
-      
-        false
-      
-      
-        true
-      
-      codehaus.org.snapshots
-      Codehaus Snapshots Repository
-      http://snapshots.repository.codehaus.org
-     
-

svn commit: r887043 [1/3] - in /archiva/branches/MRM-1025: ./ archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/or...

2009-12-04T03:00:26Z

Author: brett
Date: Fri Dec  4 03:00:22 2009
New Revision: 887043

URL: http://svn.apache.org/viewvc?rev=887043&view=rev
Log:
Merged /archiva/trunk:r885006-887039

Modified:
    archiva/branches/MRM-1025/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus/components.xml   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml   (props changed)
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
    archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/some-index.zip   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/   (props changed)
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml   (props changed)
    archiva/branches/MRM-1025/pom.xml

Propchange: archiva/branches/MRM-1025/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541:686983-687034
 /archiva/branches/archiva-search-improvements:723609-726925
 /archiva/branches/archiva-struts2:699795-705848
-/archiva/trunk:825850-885005
+/archiva/trunk:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/BaseConsumer.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:825850-885005
+/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/Consumer.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java:825850-885005
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/org/apache/archiva/scheduler/ArchivaTaskScheduler.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java:825850-885005
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java:825850-885005
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArtifactIndexingTask.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java:825850-885005
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/IndexingArchivaTaskScheduler.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:825850-885005
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/resources/META-INF/plexus/components.xml:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java:825850-885005
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutorTest.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java:825850-885005
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:825850-885005
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java:825850-885005
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTask.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java:825850-885005
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus/components.xml:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus/components.xml:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus/components.xml:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus/components.xml:825850-885005
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/plexus/components.xml:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java:825850-885005
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:825850-885005
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/archiva-test.xml:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:825850-882054,882055-885005*
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository:825850-882054,882055-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:825850-885005
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:699795-705848
-/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:825850-885005
+/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/test-repo:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/main/resources/webwork.properties:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:699795-700720
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:825850-885005
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:699795-700720
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:825850-885005
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva:699795-705848
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration:825850-882383,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:825850-882383,885006-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata:699795-705848
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository:699795-705848
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory:699795-705848
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory:825850-882383,882384-887039*

svn commit: r887043 [2/3] - in /archiva/branches/MRM-1025: ./ archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/or...

2009-12-04T03:00:26Z

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java:825850-885005
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/metadata/repository/memory/TestMetadataResolver.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -1,4 +1,4 @@
 /archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/UserRepositoriesStub.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/UserRepositoriesStub.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/rss/UserRepositoriesStub.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java:825850-885005
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/security/UserRepositoriesStub.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml:721945-723577
+/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml:699795-705848
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml:825850-887039

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java?rev=887043&r1=887042&r2=887043&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java Fri Dec  4 03:00:22 2009
@@ -45,19 +45,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * SearchServiceImpl
- *
- * quick/general text search which returns a list of artifacts
- * query for an artifact based on a checksum
- * query for all available versions of an artifact, sorted in version significance order
- * query for all available versions of an artifact since a given date
- * query for an artifact's direct dependencies
- * query for an artifact's dependency tree (as with mvn dependency:tree - no duplicates should be included)
- * query for all artifacts that depend on a given artifact
- *
- * @version $Id: SearchServiceImpl.java
- */
 public class SearchServiceImpl
     implements SearchService
 {
@@ -214,9 +201,11 @@
         List artifacts = new ArrayList();
 
         // 1. get observable repositories
-        // 2. use metadata repository to query uniqueVersions? (but with date)
+        // 2. use RepositoryBrowsing method to query uniqueVersions? (but with date)
+        
+        throw new UnsupportedOperationException( "getArtifactVersionsByDate not yet implemented" );
 
-        return artifacts;
+//        return artifacts;
     }
 
     public List getDependencies( String groupId, String artifactId, String version )
@@ -248,8 +237,9 @@
         throws Exception
     {
         List a = new ArrayList();
-
-        return a;
+        
+        throw new UnsupportedOperationException( "getDependencyTree not yet implemented" );
+//        return a;
     }
 
     public List getDependees( String groupId, String artifactId, String version )

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java?rev=887043&r1=887042&r2=887043&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java Fri Dec  4 03:00:22 2009
@@ -231,7 +231,7 @@
         assertEquals( ARCHIVA_TEST_ARTIFACT_ID, artifact.getArtifactId() );
         assertEquals( "1.0", artifact.getVersion() );
         assertEquals( "jar", artifact.getType() );
-        assertEquals( "public.releases", artifact.getRepositoryId() );
+        assertNull( "Repository should be null since the model was not found in the database!", artifact.getRepositoryId() );
     }
 
     public void testQuickSearchArtifactRegularSearch()

Propchange: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:721945-723577
+/archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:699795-705848
+/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:721945-723577
+/archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:699795-705848
+/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:721945-723577
+/archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:699795-705848
+/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java:721945-723577
+/archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java:699795-705848
+/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage:699795-705848
-/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:699795-705848
-/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:825850-885005
+/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java:721945-723577
+/archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java:699795-705848
+/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java:825850-882383,885006-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java:825850-882383,883982-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java:825850-882383,883982-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:721945-723577
+/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:699795-705848
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:721945-723577
+/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:699795-705848
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:721945-723577
+/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:699795-705848
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:721945-723577
+/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:699795-705848
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:721945-723577
+/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:699795-705848
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:825850-882383,885006-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index:721945-723577
+/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index:699795-705848
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index:825850-885005,885006-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/some-index.zip
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -0,0 +1,5 @@
+/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/some-index.zip:721945-723577
+/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/some-index.zip:686983-687034
+/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/some-index.zip:723609-726925
+/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/some-index.zip:699795-705848
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/.index/some-index.zip:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com:825850-883981,883982-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com:825850-883981,883982-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example:825850-883981,883982-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example:825850-883981,883982-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test:825850-883981,883982-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test:825850-883981,883982-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata:825850-883981,883982-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata:825850-883981,883982-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT:825850-883981,883982-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT:825850-883981,883982-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom:825850-883981,883982-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom:825850-883981,883982-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0:825850-883981,883982-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0:825850-883981,883982-887039*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom:825850-885005
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom:825850-887039

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  4 03:00:22 2009
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata:825850-883981,883982-885005*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata:825850-883981,883982-887039*

svn commit: r887033 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/

2009-12-04T02:01:58Z

Author: brett
Date: Fri Dec  4 02:01:58 2009
New Revision: 887033

URL: http://svn.apache.org/viewvc?rev=887033&view=rev
Log:
ignore overlays directory

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/   (props changed)

Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Dec  4 02:01:58 2009
@@ -1,4 +1,5 @@
 appserver-base
+overlays
 target
 .deployment
 *~

svn commit: r887030 - in /archiva/trunk/archiva-modules/archiva-scheduled/src: main/java/org/apache/maven/archiva/scheduled/executors/ test/java/org/apache/maven/archiva/scheduled/executors/

2009-12-04T01:42:14Z

Author: brett
Date: Fri Dec  4 01:42:14 2009
New Revision: 887030

URL: http://svn.apache.org/viewvc?rev=887030&view=rev
Log:
[MRM-1294] start the search period from the *start* of the previous scan rather than the end
to discover anything added in the middle. Some artifacts may get scanned twice, but this is
a better consequence than not at all

Modified:
    archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
    archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java

Modified: archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java?rev=887030&r1=887029&r2=887030&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
(original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
Fri Dec  4 01:42:14 2009
@@ -137,7 +137,7 @@
                     RepositoryContentStatistics lastStats = results.get( 0 );
                     if ( !repoTask.isScanAll() )
                     {
-                        sinceWhen = lastStats.getWhenGathered().getTime();
+                        sinceWhen = lastStats.getWhenGathered().getTime() - lastStats.getDuration();
                     }
                 }
 
@@ -173,6 +173,7 @@
         // total artifact count
         try
         {
+            // note that when gathered is the end of the scan, so we look for all those before
that time
             List artifacts = dao.getArtifactDAO().queryArtifacts(
                 new ArtifactsByRepositoryConstraint( arepo.getId(), stats.getWhenGathered(),
"groupId", true ) );
             dbstats.setTotalArtifactCount( artifacts.size() );

Modified: archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java?rev=887030&r1=887029&r2=887030&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
(original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
Fri Dec  4 01:42:14 2009
@@ -141,9 +141,19 @@
         File sourceRepoDir = new File( getBasedir(), "src/test/repositories/default-repository"
);
         repoDir = new File( getBasedir(), "target/default-repository" );
 
+        FileUtils.deleteDirectory( repoDir );
+        assertFalse( "Default Test Repository should not exist.", repoDir.exists() );
+
         repoDir.mkdir();
 
         FileUtils.copyDirectoryStructure( sourceRepoDir, repoDir );
+        // set the timestamps to a time well in the past
+        Calendar cal = Calendar.getInstance();
+        cal.add( Calendar.YEAR, -1 );
+        for ( File f : (List) FileUtils.getFiles( repoDir, "**", null ) )
+        {
+            f.setLastModified( cal.getTimeInMillis() );
+        }
 
         assertTrue( "Default Test Repository should exist.", repoDir.exists() &&
repoDir.isDirectory() );
 
@@ -193,18 +203,7 @@
         repoTask.setRepositoryId( TEST_REPO_ID );
         repoTask.setScanAll( false );
 
-        RepositoryContentStatistics stats = new RepositoryContentStatistics();
-        stats.setDuration( 1234567 );
-        stats.setNewFileCount( 31 );
-        stats.setRepositoryId( TEST_REPO_ID );
-        stats.setTotalArtifactCount( 8 );
-        stats.setTotalFileCount( 31 );
-        stats.setTotalGroupCount( 3 );
-        stats.setTotalProjectCount( 5 );
-        stats.setTotalSize( 38545 );
-        stats.setWhenGathered( Calendar.getInstance().getTime() );
-
-        dao.getRepositoryContentStatisticsDAO().saveRepositoryContentStatistics( stats );
+        createAndSaveTestStats();
 
         taskExecutor.executeTask( repoTask );
 
@@ -272,25 +271,14 @@
         repoTask.setRepositoryId( TEST_REPO_ID );
         repoTask.setScanAll( false );
 
-        RepositoryContentStatistics stats = new RepositoryContentStatistics();
-        stats.setDuration( 1234567 );
-        stats.setNewFileCount( 31 );
-        stats.setRepositoryId( TEST_REPO_ID );
-        stats.setTotalArtifactCount( 8 );
-        stats.setTotalFileCount( 31 );
-        stats.setTotalGroupCount( 3 );
-        stats.setTotalProjectCount( 5 );
-        stats.setTotalSize( 38545 );
-        stats.setWhenGathered( Calendar.getInstance().getTime() );
-
-        dao.getRepositoryContentStatisticsDAO().saveRepositoryContentStatistics( stats );
+        createAndSaveTestStats();
 
         File newArtifactGroup = new File( repoDir, "org/apache/archiva" );
 
         FileUtils.copyDirectoryStructure( new File( getBasedir(), "target/test-classes/test-repo/org/apache/archiva"
),
                                           newArtifactGroup );
 
-        // update last modified date
+        // update last modified date, placing shortly after last scan
         new File( newArtifactGroup, "archiva-index-methods-jar-test/1.0/pom.xml" ).setLastModified(
             Calendar.getInstance().getTimeInMillis() + 1000 );
         new File( newArtifactGroup,
@@ -323,6 +311,70 @@
         assertEquals( 43687, newStats.getTotalSize() );
     }
 
+    public void testExecutorScanOnlyNewArtifactsMidScan()
+        throws Exception
+    {
+        RepositoryTask repoTask = new RepositoryTask();
+
+        repoTask.setRepositoryId( TEST_REPO_ID );
+        repoTask.setScanAll( false );
+
+        createAndSaveTestStats();
+
+        File newArtifactGroup = new File( repoDir, "org/apache/archiva" );
+
+        FileUtils.copyDirectoryStructure( new File( getBasedir(), "target/test-classes/test-repo/org/apache/archiva"
),
+                                          newArtifactGroup );
+
+        // update last modified date, placing in middle of last scan
+        new File( newArtifactGroup, "archiva-index-methods-jar-test/1.0/pom.xml" ).setLastModified(
+            Calendar.getInstance().getTimeInMillis() - 50000 );
+        new File( newArtifactGroup,
+                  "archiva-index-methods-jar-test/1.0/archiva-index-methods-jar-test-1.0.jar"
).setLastModified(
+            Calendar.getInstance().getTimeInMillis() - 50000 );
+
+        assertTrue( newArtifactGroup.exists() );
+
+        // scan using the really long previous duration
+        taskExecutor.executeTask( repoTask );
+
+        // check no artifacts processed
+        ArtifactDAO adao = dao.getArtifactDAO();
+        List unprocessedResultList = adao.queryArtifacts( new ArtifactsProcessedConstraint(
false ) );
+        assertNotNull( unprocessedResultList );
+        assertEquals( "Incorrect number of unprocessed artifacts detected. One new artifact
should have been found.", 1,
+                      unprocessedResultList.size() );
+
+        // check correctness of new stats
+        List results =
+            (List) dao.query( new MostRecentRepositoryScanStatistics(
TEST_REPO_ID ) );
+        RepositoryContentStatistics newStats = results.get( 0 );
+        assertEquals( 2, newStats.getNewFileCount() );
+        assertEquals( TEST_REPO_ID, newStats.getRepositoryId() );
+        assertEquals( 33, newStats.getTotalFileCount() );
+        // TODO: can't test these as they weren't stored in the database
+//        assertEquals( 8, newStats.getTotalArtifactCount() );
+//        assertEquals( 3, newStats.getTotalGroupCount() );
+//        assertEquals( 5, newStats.getTotalProjectCount() );
+        assertEquals( 43687, newStats.getTotalSize() );
+    }
+
+    private void createAndSaveTestStats()
+    {
+        RepositoryContentStatistics stats = new RepositoryContentStatistics();
+        stats.setDuration( 1234567 );
+        stats.setNewFileCount( 31 );
+        stats.setRepositoryId( TEST_REPO_ID );
+        stats.setTotalArtifactCount( 8 );
+        stats.setTotalFileCount( 31 );
+        stats.setTotalGroupCount( 3 );
+        stats.setTotalProjectCount( 5 );
+        stats.setTotalSize( 38545 );
+        stats.setWhenGathered( Calendar.getInstance().getTime() );
+
+        dao.getRepositoryContentStatisticsDAO().saveRepositoryContentStatistics( stats );
+    }
+
     public void testExecutorForceScanAll()
         throws Exception
     {

svn commit: r887027 - in /archiva/trunk/archiva-modules/archiva-scheduled/src: main/java/org/apache/maven/archiva/scheduled/executors/ test/java/org/apache/maven/archiva/scheduled/executors/

2009-12-04T01:22:44Z

Author: brett
Date: Fri Dec  4 01:22:43 2009
New Revision: 887027

URL: http://svn.apache.org/viewvc?rev=887027&view=rev
Log:
[MRM-1294] avoid starting the search period at twice the duration since the start of the previous
scan

Modified:
    archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
    archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java

Modified: archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java?rev=887027&r1=887026&r2=887027&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
(original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
Fri Dec  4 01:22:43 2009
@@ -19,6 +19,10 @@
  * under the License.
  */
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
@@ -46,29 +50,23 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
 /**
- * ArchivaRepositoryScanningTaskExecutor 
+ * ArchivaRepositoryScanningTaskExecutor
  *
  * @version $Id$
- * 
- * @plexus.component
- *   role="org.codehaus.plexus.taskqueue.execution.TaskExecutor"
- *   role-hint="repository-scanning"
+ * @plexus.component role="org.codehaus.plexus.taskqueue.execution.TaskExecutor"
+ * role-hint="repository-scanning"
  */
 public class ArchivaRepositoryScanningTaskExecutor
     implements TaskExecutor, Initializable
 {
     private Logger log = LoggerFactory.getLogger( ArchivaRepositoryScanningTaskExecutor.class
);
-    
+
     /**
      * @plexus.requirement role-hint="jdo"
      */
     private ArchivaDAO dao;
-    
+
     /**
      * @plexus.requirement
      */
@@ -76,16 +74,16 @@
 
     /**
      * The repository scanner component.
-     * 
+     *
      * @plexus.requirement
      */
     private RepositoryScanner repoScanner;
-    
+
     /**
      * @plexus.requirement
      */
     private RepositoryContentConsumers consumers;
-    
+
     private Task task;
 
     public void initialize()
@@ -99,18 +97,19 @@
         throws TaskExecutionException
     {
         this.task = task;
-        
+
         RepositoryTask repoTask = (RepositoryTask) task;
-        
+
         if ( StringUtils.isBlank( repoTask.getRepositoryId() ) )
         {
-            throw new TaskExecutionException("Unable to execute RepositoryTask with blank
repository Id.");
+            throw new TaskExecutionException( "Unable to execute RepositoryTask with blank
repository Id." );
         }
 
-        ManagedRepositoryConfiguration arepo = archivaConfiguration.getConfiguration().findManagedRepositoryById(
repoTask.getRepositoryId() );
-        
+        ManagedRepositoryConfiguration arepo =
+            archivaConfiguration.getConfiguration().findManagedRepositoryById( repoTask.getRepositoryId()
);
+
         // execute consumers on resource file if set
-        if( repoTask.getResourceFile() != null )
+        if ( repoTask.getResourceFile() != null )
         {
             log.debug( "Executing task from queue with job name: " + repoTask );
             consumers.executeConsumers( arepo, repoTask.getResourceFile(), repoTask.isUpdateRelatedArtifacts()
);
@@ -118,50 +117,50 @@
         else
         {
             log.info( "Executing task from queue with job name: " + repoTask );
-            
+
             // otherwise, execute consumers on whole repository
             try
-            {   
+            {
                 if ( arepo == null )
                 {
-                    throw new TaskExecutionException( "Unable to execute RepositoryTask with
invalid repository id: " + repoTask.getRepositoryId() );
+                    throw new TaskExecutionException(
+                        "Unable to execute RepositoryTask with invalid repository id: " +
repoTask.getRepositoryId() );
                 }
-    
+
                 long sinceWhen = RepositoryScanner.FRESH_SCAN;
-    
-                List results = (List)
dao.query( new MostRecentRepositoryScanStatistics( arepo.getId() ) );
-               
+
+                List results = (List)
dao.query(
+                    new MostRecentRepositoryScanStatistics( arepo.getId() ) );
+
                 if ( CollectionUtils.isNotEmpty( results ) )
                 {
                     RepositoryContentStatistics lastStats = results.get( 0 );
-                    if( !repoTask.isScanAll() )
+                    if ( !repoTask.isScanAll() )
                     {
-                        sinceWhen = lastStats.getWhenGathered().getTime() + lastStats.getDuration();
+                        sinceWhen = lastStats.getWhenGathered().getTime();
                     }
                 }
-    
+
                 RepositoryScanStatistics stats = repoScanner.scan( arepo, sinceWhen );
-    
+
                 log.info( "Finished repository task: " + stats.toDump( arepo ) );
-                
-                RepositoryContentStatistics dbstats = constructRepositoryStatistics( arepo,
sinceWhen, results, stats );
-                
-                dao.getRepositoryContentStatisticsDAO().saveRepositoryContentStatistics(
dbstats );   
-                
+
+                RepositoryContentStatistics dbstats = constructRepositoryStatistics( arepo,
stats );
+
+                dao.getRepositoryContentStatisticsDAO().saveRepositoryContentStatistics(
dbstats );
+
                 this.task = null;
             }
             catch ( RepositoryException e )
-            {   
+            {
                 throw new TaskExecutionException( "Repository error when executing repository
job.", e );
-            }    
+            }
         }
     }
 
     @SuppressWarnings("unchecked")
     private RepositoryContentStatistics constructRepositoryStatistics( ManagedRepositoryConfiguration
arepo,
-                                                                       long sinceWhen,
-                                                                       List
results,
-                                                                       RepositoryScanStatistics
stats )        
+                                                                       RepositoryScanStatistics
stats )
     {
         // I hate jpox and modello <-- and so do I
         RepositoryContentStatistics dbstats = new RepositoryContentStatistics();
@@ -170,12 +169,12 @@
         dbstats.setRepositoryId( stats.getRepositoryId() );
         dbstats.setTotalFileCount( stats.getTotalFileCount() );
         dbstats.setWhenGathered( stats.getWhenGathered() );
-                
+
         // total artifact count
         try
         {
-            List artifacts = dao.getArtifactDAO().queryArtifacts(

-                      new ArtifactsByRepositoryConstraint( arepo.getId(), stats.getWhenGathered(),
"groupId", true ) );            
+            List artifacts = dao.getArtifactDAO().queryArtifacts(
+                new ArtifactsByRepositoryConstraint( arepo.getId(), stats.getWhenGathered(),
"groupId", true ) );
             dbstats.setTotalArtifactCount( artifacts.size() );
         }
         catch ( ObjectNotFoundException oe )
@@ -183,27 +182,28 @@
             log.error( "Object not found in the database : " + oe.getMessage() );
         }
         catch ( ArchivaDatabaseException ae )
-        {   
+        {
             log.error( "Error occurred while querying artifacts for artifact count : " +
ae.getMessage() );
         }
-        
+
         // total repo size
         long size = FileUtils.sizeOfDirectory( new File( arepo.getLocation() ) );
         dbstats.setTotalSize( size );
-          
-          // total unique groups
+
+        // total unique groups
         List repos = new ArrayList();
-        repos.add( arepo.getId() ); 
-        
+        repos.add( arepo.getId() );
+
         List groupIds = (List) dao.query( new UniqueGroupIdConstraint(
repos ) );
         dbstats.setTotalGroupCount( groupIds.size() );
-                
-        List artifactIds = (List) dao.query( new UniqueArtifactIdConstraint(
arepo.getId(), true ) );
+
+        List artifactIds =
+            (List) dao.query( new UniqueArtifactIdConstraint( arepo.getId(),
true ) );
         dbstats.setTotalProjectCount( artifactIds.size() );
-                        
+
         return dbstats;
-    }   
-    
+    }
+
     public Task getCurrentTaskInExecution()
     {
         return task;

Modified: archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java?rev=887027&r1=887026&r2=887027&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
(original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
Fri Dec  4 01:22:43 2009
@@ -264,6 +264,65 @@
         assertEquals( 43687, updatedStats.getTotalSize() );
     }
 
+    public void testExecutorScanOnlyNewArtifactsChangeTimes()
+        throws Exception
+    {
+        RepositoryTask repoTask = new RepositoryTask();
+
+        repoTask.setRepositoryId( TEST_REPO_ID );
+        repoTask.setScanAll( false );
+
+        RepositoryContentStatistics stats = new RepositoryContentStatistics();
+        stats.setDuration( 1234567 );
+        stats.setNewFileCount( 31 );
+        stats.setRepositoryId( TEST_REPO_ID );
+        stats.setTotalArtifactCount( 8 );
+        stats.setTotalFileCount( 31 );
+        stats.setTotalGroupCount( 3 );
+        stats.setTotalProjectCount( 5 );
+        stats.setTotalSize( 38545 );
+        stats.setWhenGathered( Calendar.getInstance().getTime() );
+
+        dao.getRepositoryContentStatisticsDAO().saveRepositoryContentStatistics( stats );
+
+        File newArtifactGroup = new File( repoDir, "org/apache/archiva" );
+
+        FileUtils.copyDirectoryStructure( new File( getBasedir(), "target/test-classes/test-repo/org/apache/archiva"
),
+                                          newArtifactGroup );
+
+        // update last modified date
+        new File( newArtifactGroup, "archiva-index-methods-jar-test/1.0/pom.xml" ).setLastModified(
+            Calendar.getInstance().getTimeInMillis() + 1000 );
+        new File( newArtifactGroup,
+                  "archiva-index-methods-jar-test/1.0/archiva-index-methods-jar-test-1.0.jar"
).setLastModified(
+            Calendar.getInstance().getTimeInMillis() + 1000 );
+
+        assertTrue( newArtifactGroup.exists() );
+
+        // scan using the really long previous duration
+        taskExecutor.executeTask( repoTask );
+
+        // check no artifacts processed
+        ArtifactDAO adao = dao.getArtifactDAO();
+        List unprocessedResultList = adao.queryArtifacts( new ArtifactsProcessedConstraint(
false ) );
+        assertNotNull( unprocessedResultList );
+        assertEquals( "Incorrect number of unprocessed artifacts detected. One new artifact
should have been found.", 1,
+                      unprocessedResultList.size() );
+
+        // check correctness of new stats
+        List results =
+            (List) dao.query( new MostRecentRepositoryScanStatistics(
TEST_REPO_ID ) );
+        RepositoryContentStatistics newStats = results.get( 0 );
+        assertEquals( 2, newStats.getNewFileCount() );
+        assertEquals( TEST_REPO_ID, newStats.getRepositoryId() );
+        assertEquals( 33, newStats.getTotalFileCount() );
+        // TODO: can't test these as they weren't stored in the database
+//        assertEquals( 8, newStats.getTotalArtifactCount() );
+//        assertEquals( 3, newStats.getTotalGroupCount() );
+//        assertEquals( 5, newStats.getTotalProjectCount() );
+        assertEquals( 43687, newStats.getTotalSize() );
+    }
+
     public void testExecutorForceScanAll()
         throws Exception
     {

svn commit: r887026 - /archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java

2009-12-04T01:18:14Z

Author: brett
Date: Fri Dec  4 01:18:13 2009
New Revision: 887026

URL: http://svn.apache.org/viewvc?rev=887026&view=rev
Log:
improve test case to check stats

Modified:
    archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java

Modified: archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java?rev=887026&r1=887025&r2=887026&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
(original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
Fri Dec  4 01:18:13 2009
@@ -33,6 +33,7 @@
 import org.apache.maven.archiva.database.ArchivaDAO;
 import org.apache.maven.archiva.database.ArtifactDAO;
 import org.apache.maven.archiva.database.constraints.ArtifactsProcessedConstraint;
+import org.apache.maven.archiva.database.constraints.MostRecentRepositoryScanStatistics;
 import org.apache.maven.archiva.model.ArchivaArtifact;
 import org.apache.maven.archiva.model.RepositoryContentStatistics;
 import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
@@ -194,19 +195,20 @@
 
         RepositoryContentStatistics stats = new RepositoryContentStatistics();
         stats.setDuration( 1234567 );
-        stats.setNewFileCount( 8 );
+        stats.setNewFileCount( 31 );
         stats.setRepositoryId( TEST_REPO_ID );
         stats.setTotalArtifactCount( 8 );
-        stats.setTotalFileCount( 8 );
+        stats.setTotalFileCount( 31 );
         stats.setTotalGroupCount( 3 );
         stats.setTotalProjectCount( 5 );
-        stats.setTotalSize( 999999 );
+        stats.setTotalSize( 38545 );
         stats.setWhenGathered( Calendar.getInstance().getTime() );
 
         dao.getRepositoryContentStatisticsDAO().saveRepositoryContentStatistics( stats );
 
         taskExecutor.executeTask( repoTask );
 
+        // check no artifacts processed
         ArtifactDAO adao = dao.getArtifactDAO();
         List unprocessedResultList = adao.queryArtifacts( new ArtifactsProcessedConstraint(
false ) );
 
@@ -214,6 +216,19 @@
         assertEquals( "Incorrect number of unprocessed artifacts detected. No new artifacts
should have been found.", 0,
                       unprocessedResultList.size() );
 
+        // check correctness of new stats
+        List results =
+            (List) dao.query( new MostRecentRepositoryScanStatistics(
TEST_REPO_ID ) );
+        RepositoryContentStatistics newStats = results.get( 0 );
+        assertEquals( 0, newStats.getNewFileCount() );
+        assertEquals( TEST_REPO_ID, newStats.getRepositoryId() );
+        assertEquals( 31, newStats.getTotalFileCount() );
+        // TODO: can't test these as they weren't stored in the database
+//        assertEquals( 8, newStats.getTotalArtifactCount() );
+//        assertEquals( 3, newStats.getTotalGroupCount() );
+//        assertEquals( 5, newStats.getTotalProjectCount() );
+        assertEquals( 38545, newStats.getTotalSize() );
+
         File newArtifactGroup = new File( repoDir, "org/apache/archiva" );
 
         FileUtils.copyDirectoryStructure( new File( getBasedir(), "target/test-classes/test-repo/org/apache/archiva"
),
@@ -234,6 +249,19 @@
         assertNotNull( unprocessedResultList );
         assertEquals( "Incorrect number of unprocessed artifacts detected. One new artifact
should have been found.", 1,
                       unprocessedResultList.size() );
+
+        // check correctness of new stats
+        results =
+            (List) dao.query( new MostRecentRepositoryScanStatistics(
TEST_REPO_ID ) );
+        RepositoryContentStatistics updatedStats = results.get( 0 );
+        assertEquals( 2, updatedStats.getNewFileCount() );
+        assertEquals( TEST_REPO_ID, updatedStats.getRepositoryId() );
+        assertEquals( 33, updatedStats.getTotalFileCount() );
+        // TODO: can't test these as they weren't stored in the database
+//        assertEquals( 8, newStats.getTotalArtifactCount() );
+//        assertEquals( 3, newStats.getTotalGroupCount() );
+//        assertEquals( 5, newStats.getTotalProjectCount() );
+        assertEquals( 43687, updatedStats.getTotalSize() );
     }
 
     public void testExecutorForceScanAll()

svn commit: r887005 - /archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java

2009-12-04T00:05:01Z

Author: brett
Date: Fri Dec  4 00:05:01 2009
New Revision: 887005

URL: http://svn.apache.org/viewvc?rev=887005&view=rev
Log:
test case refactoring for clarity

Modified:
    archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java

Modified: archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java?rev=887005&r1=887004&r2=887005&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
(original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
Fri Dec  4 00:05:01 2009
@@ -25,7 +25,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-
 import javax.jdo.PersistenceManager;
 import javax.jdo.PersistenceManagerFactory;
 
@@ -45,7 +44,7 @@
 import org.jpox.SchemaTool;
 
 /**
- * ArchivaRepositoryScanningTaskExecutorTest 
+ * ArchivaRepositoryScanningTaskExecutorTest
  *
  * @version $Id$
  */
@@ -55,42 +54,44 @@
     private TaskExecutor taskExecutor;
 
     protected ArchivaDAO dao;
-    
+
     private File repoDir;
-    
+
+    private static final String TEST_REPO_ID = "testRepo";
+
     protected void setUp()
         throws Exception
     {
         super.setUp();
-        
+
         DefaultConfigurableJdoFactory jdoFactory = (DefaultConfigurableJdoFactory) lookup(
JdoFactory.ROLE, "archiva" );
         assertEquals( DefaultConfigurableJdoFactory.class.getName(), jdoFactory.getClass().getName()
);
 
-        jdoFactory.setPersistenceManagerFactoryClass( "org.jpox.PersistenceManagerFactoryImpl"
); 
+        jdoFactory.setPersistenceManagerFactoryClass( "org.jpox.PersistenceManagerFactoryImpl"
);
 
         /* derby version
-        File derbyDbDir = new File( "target/plexus-home/testdb" );
-        if ( derbyDbDir.exists() )
-        {
-            FileUtils.deleteDirectory( derbyDbDir );
-        }
+       File derbyDbDir = new File( "target/plexus-home/testdb" );
+       if ( derbyDbDir.exists() )
+       {
+           FileUtils.deleteDirectory( derbyDbDir );
+       }
+
+       jdoFactory.setDriverName( System.getProperty( "jdo.test.driver", "org.apache.derby.jdbc.EmbeddedDriver"
) );
+       jdoFactory.setUrl( System.getProperty( "jdo.test.url", "jdbc:derby:" + derbyDbDir.getAbsolutePath()
+ ";create=true" ) );
+        */
 
-        jdoFactory.setDriverName( System.getProperty( "jdo.test.driver", "org.apache.derby.jdbc.EmbeddedDriver"
) );   
-        jdoFactory.setUrl( System.getProperty( "jdo.test.url", "jdbc:derby:" + derbyDbDir.getAbsolutePath()
+ ";create=true" ) );
-         */   
-
-        jdoFactory.setDriverName( System.getProperty( "jdo.test.driver", "org.hsqldb.jdbcDriver"
) );   
+        jdoFactory.setDriverName( System.getProperty( "jdo.test.driver", "org.hsqldb.jdbcDriver"
) );
         jdoFactory.setUrl( System.getProperty( "jdo.test.url", "jdbc:hsqldb:mem:" + getName()
) );
-        
-        jdoFactory.setUserName( System.getProperty( "jdo.test.user", "sa" ) ); 
 
-        jdoFactory.setPassword( System.getProperty( "jdo.test.pass", "" ) ); 
+        jdoFactory.setUserName( System.getProperty( "jdo.test.user", "sa" ) );
+
+        jdoFactory.setPassword( System.getProperty( "jdo.test.pass", "" ) );
 
-        jdoFactory.setProperty( "org.jpox.transactionIsolation", "READ_COMMITTED" );  
+        jdoFactory.setProperty( "org.jpox.transactionIsolation", "READ_COMMITTED" );
 
-        jdoFactory.setProperty( "org.jpox.poid.transactionIsolation", "READ_COMMITTED" );
 
+        jdoFactory.setProperty( "org.jpox.poid.transactionIsolation", "READ_COMMITTED" );
 
-        jdoFactory.setProperty( "org.jpox.autoCreateSchema", "true" );  
+        jdoFactory.setProperty( "org.jpox.autoCreateSchema", "true" );
 
         jdoFactory.setProperty( "javax.jdo.option.RetainValues", "true" );
 
@@ -111,8 +112,7 @@
             System.setProperty( (String) entry.getKey(), (String) entry.getValue() );
         }
 
-        URL jdoFileUrls[] = new URL[] { getClass()
-            .getResource( "/org/apache/maven/archiva/model/package.jdo" ) }; 
+        URL jdoFileUrls[] = new URL[]{getClass().getResource( "/org/apache/maven/archiva/model/package.jdo"
)};
 
         if ( ( jdoFileUrls == null ) || ( jdoFileUrls[0] == null ) )
         {
@@ -122,8 +122,8 @@
         File propsFile = null; // intentional
         boolean verbose = true;
 
-        SchemaTool.deleteSchemaTables( jdoFileUrls, new URL[] {}, propsFile, verbose );
-        SchemaTool.createSchemaTables( jdoFileUrls, new URL[] {}, propsFile, verbose, null
);
+        SchemaTool.deleteSchemaTables( jdoFileUrls, new URL[]{}, propsFile, verbose );
+        SchemaTool.createSchemaTables( jdoFileUrls, new URL[]{}, propsFile, verbose, null
);
 
         PersistenceManagerFactory pmf = jdoFactory.getPersistenceManagerFactory();
 
@@ -136,156 +136,133 @@
         this.dao = (ArchivaDAO) lookup( ArchivaDAO.class.getName(), "jdo" );
 
         taskExecutor = (TaskExecutor) lookup( TaskExecutor.class, "test-repository-scanning"
);
-        
+
         File sourceRepoDir = new File( getBasedir(), "src/test/repositories/default-repository"
);
-        repoDir = new File( getBasedir(), "target/default-repository" );  
-        
+        repoDir = new File( getBasedir(), "target/default-repository" );
+
         repoDir.mkdir();
-        
+
         FileUtils.copyDirectoryStructure( sourceRepoDir, repoDir );
-        
-        assertTrue( repoDir.exists() );
-    }
-    
-    protected void tearDown() throws Exception
-    {   
-        FileUtils.deleteDirectory( repoDir );
-        
-        assertFalse( repoDir.exists() );
-        
-        super.tearDown();
-    }
-    
-    public void testExecutor() throws Exception
-    {
+
         assertTrue( "Default Test Repository should exist.", repoDir.exists() &&
repoDir.isDirectory() );
 
         ArchivaConfiguration archivaConfig = (ArchivaConfiguration) lookup( ArchivaConfiguration.class
);
         assertNotNull( archivaConfig );
-        
+
         // Create it
-        ManagedRepositoryConfiguration repo = createRepository( "testRepo", "Test Repository",
repoDir );
-        assertNotNull( repo );
+        ManagedRepositoryConfiguration repositoryConfiguration = new ManagedRepositoryConfiguration();
+        repositoryConfiguration.setId( TEST_REPO_ID );
+        repositoryConfiguration.setName( "Test Repository" );
+        repositoryConfiguration.setLocation( repoDir.getAbsolutePath() );
         archivaConfig.getConfiguration().getManagedRepositories().clear();
-        archivaConfig.getConfiguration().addManagedRepository( repo );
+        archivaConfig.getConfiguration().addManagedRepository( repositoryConfiguration );
+    }
+
+    protected void tearDown()
+        throws Exception
+    {
+        FileUtils.deleteDirectory( repoDir );
+
+        assertFalse( repoDir.exists() );
 
+        super.tearDown();
+    }
+
+    public void testExecutor()
+        throws Exception
+    {
         RepositoryTask repoTask = new RepositoryTask();
-        
-        repoTask.setRepositoryId( "testRepo" );
-        
+
+        repoTask.setRepositoryId( TEST_REPO_ID );
+
         taskExecutor.executeTask( repoTask );
 
         ArtifactDAO adao = dao.getArtifactDAO();
         List unprocessedResultList = adao.queryArtifacts( new ArtifactsProcessedConstraint(
false ) );
-        
+
         assertNotNull( unprocessedResultList );
-        assertEquals("Incorrect number of unprocessed artifacts detected.", 8, unprocessedResultList.size()
);
+        assertEquals( "Incorrect number of unprocessed artifacts detected.", 8, unprocessedResultList.size()
);
     }
-    
+
     public void testExecutorScanOnlyNewArtifacts()
         throws Exception
-    {  
-        assertTrue( "Default Test Repository should exist.", repoDir.exists() &&
repoDir.isDirectory() );
-
-        ArchivaConfiguration archivaConfig = (ArchivaConfiguration) lookup( ArchivaConfiguration.class
);
-        assertNotNull( archivaConfig );
-        
-        // Create it
-        ManagedRepositoryConfiguration repo = createRepository( "testRepo", "Test Repository",
repoDir );
-        assertNotNull( repo );
-        archivaConfig.getConfiguration().getManagedRepositories().clear();
-        archivaConfig.getConfiguration().addManagedRepository( repo );
-
+    {
         RepositoryTask repoTask = new RepositoryTask();
-        
-        repoTask.setRepositoryId( "testRepo" );
+
+        repoTask.setRepositoryId( TEST_REPO_ID );
         repoTask.setScanAll( false );
-        
+
         RepositoryContentStatistics stats = new RepositoryContentStatistics();
         stats.setDuration( 1234567 );
         stats.setNewFileCount( 8 );
-        stats.setRepositoryId( "testRepo" );
+        stats.setRepositoryId( TEST_REPO_ID );
         stats.setTotalArtifactCount( 8 );
         stats.setTotalFileCount( 8 );
         stats.setTotalGroupCount( 3 );
         stats.setTotalProjectCount( 5 );
         stats.setTotalSize( 999999 );
         stats.setWhenGathered( Calendar.getInstance().getTime() );
-        
+
         dao.getRepositoryContentStatisticsDAO().saveRepositoryContentStatistics( stats );
-        
+
         taskExecutor.executeTask( repoTask );
 
         ArtifactDAO adao = dao.getArtifactDAO();
         List unprocessedResultList = adao.queryArtifacts( new ArtifactsProcessedConstraint(
false ) );
-        
+
         assertNotNull( unprocessedResultList );
-        assertEquals("Incorrect number of unprocessed artifacts detected. No new artifacts
should have been found.", 0, unprocessedResultList.size() );
-        
-        File newArtifactGroup = new File( repoDir, "org/apache/archiva");
-        
-        FileUtils.copyDirectoryStructure( new File( getBasedir(), "target/test-classes/test-repo/org/apache/archiva"),
newArtifactGroup );      
-        
+        assertEquals( "Incorrect number of unprocessed artifacts detected. No new artifacts
should have been found.", 0,
+                      unprocessedResultList.size() );
+
+        File newArtifactGroup = new File( repoDir, "org/apache/archiva" );
+
+        FileUtils.copyDirectoryStructure( new File( getBasedir(), "target/test-classes/test-repo/org/apache/archiva"
),
+                                          newArtifactGroup );
+
         // update last modified date
-        new File( newArtifactGroup, "archiva-index-methods-jar-test/1.0/pom.xml" ).setLastModified(
Calendar.getInstance().getTimeInMillis() + 1000 );
-        new File( newArtifactGroup, "archiva-index-methods-jar-test/1.0/archiva-index-methods-jar-test-1.0.jar"
).setLastModified( Calendar.getInstance().getTimeInMillis() + 1000 );
+        new File( newArtifactGroup, "archiva-index-methods-jar-test/1.0/pom.xml" ).setLastModified(
+            Calendar.getInstance().getTimeInMillis() + 1000 );
+        new File( newArtifactGroup,
+                  "archiva-index-methods-jar-test/1.0/archiva-index-methods-jar-test-1.0.jar"
).setLastModified(
+            Calendar.getInstance().getTimeInMillis() + 1000 );
 
         assertTrue( newArtifactGroup.exists() );
-        
+
         taskExecutor.executeTask( repoTask );
-        
+
         unprocessedResultList = adao.queryArtifacts( new ArtifactsProcessedConstraint( false
) );
         assertNotNull( unprocessedResultList );
-        assertEquals( "Incorrect number of unprocessed artifacts detected. One new artifact
should have been found.", 1, unprocessedResultList.size() );        
+        assertEquals( "Incorrect number of unprocessed artifacts detected. One new artifact
should have been found.", 1,
+                      unprocessedResultList.size() );
     }
-    
+
     public void testExecutorForceScanAll()
         throws Exception
     {
-        assertTrue( "Default Test Repository should exist.", repoDir.exists() &&
repoDir.isDirectory() );
-
-        ArchivaConfiguration archivaConfig = (ArchivaConfiguration) lookup( ArchivaConfiguration.class
);
-        assertNotNull( archivaConfig );
-        
-        // Create it
-        ManagedRepositoryConfiguration repo = createRepository( "testRepo", "Test Repository",
repoDir );
-        assertNotNull( repo );
-        archivaConfig.getConfiguration().getManagedRepositories().clear();
-        archivaConfig.getConfiguration().addManagedRepository( repo );
-
         RepositoryTask repoTask = new RepositoryTask();
-        
-        repoTask.setRepositoryId( "testRepo" );
+
+        repoTask.setRepositoryId( TEST_REPO_ID );
         repoTask.setScanAll( true );
-        
+
         RepositoryContentStatistics stats = new RepositoryContentStatistics();
         stats.setDuration( 1234567 );
         stats.setNewFileCount( 8 );
-        stats.setRepositoryId( "testRepo" );
+        stats.setRepositoryId( TEST_REPO_ID );
         stats.setTotalArtifactCount( 8 );
         stats.setTotalFileCount( 8 );
         stats.setTotalGroupCount( 3 );
         stats.setTotalProjectCount( 5 );
         stats.setTotalSize( 999999 );
         stats.setWhenGathered( Calendar.getInstance().getTime() );
-        
+
         dao.getRepositoryContentStatisticsDAO().saveRepositoryContentStatistics( stats );
-        
+
         taskExecutor.executeTask( repoTask );
 
         ArtifactDAO adao = dao.getArtifactDAO();
         List unprocessedResultList = adao.queryArtifacts( new ArtifactsProcessedConstraint(
false ) );
-        
+
         assertNotNull( unprocessedResultList );
-        assertEquals("Incorrect number of unprocessed artifacts detected.", 8, unprocessedResultList.size()
);
-    }
-    
-    protected ManagedRepositoryConfiguration createRepository( String id, String name, File
location )
-    {
-        ManagedRepositoryConfiguration repo = new ManagedRepositoryConfiguration();
-        repo.setId( id );
-        repo.setName( name );
-        repo.setLocation( location.getAbsolutePath() );
-        return repo;
+        assertEquals( "Incorrect number of unprocessed artifacts detected.", 8, unprocessedResultList.size()
);
     }
 }

svn commit: r886966 - /archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutor.java

2009-12-03T22:40:26Z

Author: brett
Date: Thu Dec  3 22:40:24 2009
New Revision: 886966

URL: http://svn.apache.org/viewvc?rev=886966&view=rev
Log:
[MRM-1272] correct empty error message when there is a problem from Lucene

Modified:
    archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutor.java

Modified: archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutor.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutor.java?rev=886966&r1=886965&r2=886966&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutor.java
(original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutor.java
Thu Dec  3 22:40:24 2009
@@ -93,9 +93,9 @@
                 }
                 catch ( IOException e )
                 {
-                    log.error( "Error occurred while executing indexing task '" + indexingTask
+ "'" );
+                    log.error( "Error occurred while executing indexing task '" + indexingTask
+ "': " + e.getMessage() );
                     throw new TaskExecutionException( "Error occurred while executing indexing
task '" + indexingTask
-                        + "'" );
+                        + "'", e );
                 }
                 finally
                 {
@@ -168,9 +168,9 @@
                 }
                 catch ( IOException e )
                 {
-                    log.error( "Error occurred while executing indexing task '" + indexingTask
+ "'" );
+                    log.error( "Error occurred while executing indexing task '" + indexingTask
+ "': " + e.getMessage() );
                     throw new TaskExecutionException( "Error occurred while executing indexing
task '" + indexingTask
-                        + "'" );
+                        + "'", e );
                 }
             }
         }

svn commit: r886769 - /archiva/site/pom.xml

2009-12-03T13:06:58Z

Author: brett
Date: Thu Dec  3 13:06:58 2009
New Revision: 886769

URL: http://svn.apache.org/viewvc?rev=886769&view=rev
Log:
fix SVN URLs

Modified:
    archiva/site/pom.xml

Modified: archiva/site/pom.xml
URL: http://svn.apache.org/viewvc/archiva/site/pom.xml?rev=886769&r1=886768&r2=886769&view=diff
==============================================================================
--- archiva/site/pom.xml (original)
+++ archiva/site/pom.xml Thu Dec  3 13:06:58 2009
@@ -57,9 +57,9 @@
           
         
         
-          scm:svn:http://svn.apache.org/viewvc/archiva/all
+          scm:svn:http://svn.apache.org/repos/asf/archiva/all
           scm:svn:https://svn.apache.org/repos/asf/archiva/all
-          http://svn.apache.org/repos/asf/archiva/
+          http://svn.apache.org/viewvc/archiva/
           archiva-all

svn commit: r886676 - /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java

2009-12-03T04:25:45Z

Author: brett
Date: Thu Dec  3 04:25:43 2009
New Revision: 886676

URL: http://svn.apache.org/viewvc?rev=886676&view=rev
Log:
[MRM-1293] minor cleanup of unused fields

Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java?rev=886676&r1=886675&r2=886676&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
Thu Dec  3 04:25:43 2009
@@ -97,8 +97,6 @@
 
     protected String next;
 
-    protected int[] range = new int[2];
-
     protected int page = 1;
 
     protected int rowCount = 100;
@@ -107,8 +105,6 @@
 
     public static final String BLANK = "blank";
 
-    public static final String BASIC = "basic";
-
     private static Boolean jasperPresent;
 
     private Collection repositoryIds;
@@ -140,7 +136,7 @@
 
     private DataLimits limits = new DataLimits();
 
-    private String[] datePatterns =
+    private static final String[] datePatterns =
         new String[]{"MM/dd/yy", "MM/dd/yyyy", "MMMMM/dd/yyyy", "MMMMM/dd/yy", "dd MMMMM
yyyy", "dd/MM/yy",
             "dd/MM/yyyy", "yyyy/MM/dd", "yyyy-MM-dd", "yyyy-dd-MM", "MM-dd-yyyy", "MM-dd-yy"};
 
@@ -675,8 +671,8 @@
     {
         Constraint constraint;
 
-        range[0] = ( page - 1 ) * rowCount;
-        range[1] = ( page * rowCount ) + 1; // Add 1 to check if it's the last page or not.
+        int[] range =
+            new int[]{( page - 1 ) * rowCount, ( page * rowCount ) + 1}; // Add 1 to check
if it's the last page or not.
 
         if ( groupId != null && ( !groupId.equals( "" ) ) )
         {

svn commit: r886673 - /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java

2009-12-03T04:21:01Z

Author: brett
Date: Thu Dec  3 04:20:59 2009
New Revision: 886673

URL: http://svn.apache.org/viewvc?rev=886673&view=rev
Log:
formatting only

Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java?rev=886673&r1=886672&r2=886673&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
Thu Dec  3 04:20:59 2009
@@ -114,55 +114,55 @@
     private Collection repositoryIds;
 
     public static final String ALL_REPOSITORIES = "All Repositories";
-    
-    protected Map> repositoriesMap = 
-    		new TreeMap>();
-    
+
+    protected Map> repositoriesMap =
+        new TreeMap>();
+
     // for statistics report
     /**
      * @plexus.requirement role-hint="simple"
      */
     private RepositoryStatisticsReportGenerator generator;
-    
+
     private List selectedRepositories = new ArrayList();
-    
-    private List availableRepositories;  
-    
+
+    private List availableRepositories;
+
     private String startDate;
-    
+
     private String endDate;
-    
+
     private int reposSize;
-    
+
     private String selectedRepo;
-    
+
     private List repositoryStatistics = new ArrayList();
-    
+
     private DataLimits limits = new DataLimits();
-    
-    private String[] datePatterns = new String[] { "MM/dd/yy", "MM/dd/yyyy", "MMMMM/dd/yyyy",
"MMMMM/dd/yy", 
-        "dd MMMMM yyyy", "dd/MM/yy", "dd/MM/yyyy", "yyyy/MM/dd", "yyyy-MM-dd", "yyyy-dd-MM",
"MM-dd-yyyy",
-        "MM-dd-yy" };
-    
+
+    private String[] datePatterns =
+        new String[]{"MM/dd/yy", "MM/dd/yyyy", "MMMMM/dd/yyyy", "MMMMM/dd/yy", "dd MMMMM
yyyy", "dd/MM/yy",
+            "dd/MM/yyyy", "yyyy/MM/dd", "yyyy-MM-dd", "yyyy-dd-MM", "MM-dd-yyyy", "MM-dd-yy"};
+
     public static final String SEND_FILE = "send-file";
-    
+
     private InputStream inputStream;
-    
+
     @SuppressWarnings("unchecked")
     public void prepare()
     {
         repositoryIds = new ArrayList();
         repositoryIds.add( ALL_REPOSITORIES ); // comes first to be first in the list
-        repositoryIds.addAll( (List) dao.query( new UniqueFieldConstraint(
RepositoryProblem.class.getName(),
-                                                                                   "repositoryId"
) ) );
-        
+        repositoryIds.addAll( (List) dao.query(
+            new UniqueFieldConstraint( RepositoryProblem.class.getName(), "repositoryId"
) ) );
+
         availableRepositories = new ArrayList();
-     
+
         // remove selected repositories in the option for the statistics report
-        availableRepositories.addAll( archivaConfiguration.getConfiguration().getManagedRepositoriesAsMap().keySet()
);        
-        for( String repo : selectedRepositories )
+        availableRepositories.addAll( archivaConfiguration.getConfiguration().getManagedRepositoriesAsMap().keySet()
);
+        for ( String repo : selectedRepositories )
         {
-            if( availableRepositories.contains( repo ) )
+            if ( availableRepositories.contains( repo ) )
             {
                 availableRepositories.remove( repo );
             }
@@ -176,95 +176,99 @@
 
     /**
      * Generate the statistics report.
-     * 
+     *
      * check whether single repo report or comparison report
      * 1. if it is a single repository, get all the statistics for the repository on the
specified date
-     *    - if no date is specified, get only the latest 
-     *          (total page = 1 --> no pagination since only the most recent stats will
be displayed)
-     *    - otherwise, get everything within the date range (total pages = repo stats / rows
per page)
-     *       - required params: repository, startDate, endDate
-     *       
+     * - if no date is specified, get only the latest
+     * (total page = 1 --> no pagination since only the most recent stats will be displayed)
+     * - otherwise, get everything within the date range (total pages = repo stats / rows
per page)
+     * - required params: repository, startDate, endDate
+     *
      * 2. if multiple repositories, get the latest statistics on each repository on the specified
date
-     *    - if no date is specified, use the current date endDate
-     *       - required params: repositories, endDate
-     *    - total pages = repositories / rows per page
-     * 
+     * - if no date is specified, use the current date endDate
+     * - required params: repositories, endDate
+     * - total pages = repositories / rows per page
+     *
      * @return
      */
     public String generateStatistics()
-    {   
-        if( rowCount < 10 )
+    {
+        if ( rowCount < 10 )
         {
             addFieldError( "rowCount", "Row count must be larger than 10." );
             return INPUT;
         }
-        reposSize = selectedRepositories.size();                
-        
+        reposSize = selectedRepositories.size();
+
         try
         {
             RepositoryContentStatisticsDAO repoContentStatsDao = dao.getRepositoryContentStatisticsDAO();
             Date startDateInDF = null;
             Date endDateInDF = null;
-            
-            if( selectedRepositories.size() > 1 )
+
+            if ( selectedRepositories.size() > 1 )
             {
-                limits.setTotalCount( selectedRepositories.size() );            
+                limits.setTotalCount( selectedRepositories.size() );
                 limits.setCurrentPage( 1 );
                 limits.setPerPageCount( 1 );
                 limits.setCountOfPages( 1 );
-                
+
                 try
                 {
-                	startDateInDF = getStartDateInDateFormat();                	
-                	endDateInDF = getEndDateInDateFormat();
+                    startDateInDF = getStartDateInDateFormat();
+                    endDateInDF = getEndDateInDateFormat();
                 }
                 catch ( ParseException e )
                 {
-                	addActionError( "Error parsing date(s)." );
-                	return ERROR;
+                    addActionError( "Error parsing date(s)." );
+                    return ERROR;
                 }
-                
-                if( startDateInDF.after( endDateInDF ) )
+
+                if ( startDateInDF.after( endDateInDF ) )
                 {
                     addFieldError( "startDate", "Start Date must be earlier than the End
Date" );
                     return INPUT;
                 }
-                
+
                 // multiple repos
-                generateReportForMultipleRepos(repoContentStatsDao, startDateInDF, endDateInDF,
true);                
+                generateReportForMultipleRepos( repoContentStatsDao, startDateInDF, endDateInDF,
true );
             }
             else if ( selectedRepositories.size() == 1 )
-            {   
+            {
                 limits.setCurrentPage( getPage() );
                 limits.setPerPageCount( getRowCount() );
-                
+
                 selectedRepo = selectedRepositories.get( 0 );
                 try
-                {	 
-                	startDateInDF = getStartDateInDateFormat();                	
-                	endDateInDF = getEndDateInDateFormat();
-                	 
-                	if( startDateInDF.after( endDateInDF ) )
+                {
+                    startDateInDF = getStartDateInDateFormat();
+                    endDateInDF = getEndDateInDateFormat();
+
+                    if ( startDateInDF.after( endDateInDF ) )
                     {
-                	    addFieldError( "startDate", "Start Date must be earlier than the End
Date" );
-                	    return INPUT;
+                        addFieldError( "startDate", "Start Date must be earlier than the
End Date" );
+                        return INPUT;
                     }
-                	
-                    List contentStats = repoContentStatsDao.queryRepositoryContentStatistics(

-                           new RepositoryContentStatisticsByRepositoryConstraint( selectedRepo,
startDateInDF, endDateInDF ) );
-                    
-                    if( contentStats == null || contentStats.isEmpty() )
-                    {   
-                        addActionError( "No statistics available for repository. Repository
might not have been scanned." );
+
+                    List contentStats =
+                        repoContentStatsDao.queryRepositoryContentStatistics(
+                            new RepositoryContentStatisticsByRepositoryConstraint( selectedRepo,
startDateInDF,
+                                                                                   endDateInDF
) );
+
+                    if ( contentStats == null || contentStats.isEmpty() )
+                    {
+                        addActionError(
+                            "No statistics available for repository. Repository might not
have been scanned." );
                         return ERROR;
-                    }   
-                    
-                    limits.setTotalCount( contentStats.size() );                    
+                    }
+
+                    limits.setTotalCount( contentStats.size() );
                     int extraPage = ( limits.getTotalCount() % limits.getPerPageCount() )
!= 0 ? 1 : 0;
-                    int totalPages = ( limits.getTotalCount() / limits.getPerPageCount()
) + extraPage;                    
+                    int totalPages = ( limits.getTotalCount() / limits.getPerPageCount()
) + extraPage;
                     limits.setCountOfPages( totalPages );
-                    
-                    repositoryStatistics = generator.generateReport( contentStats, selectedRepo,
startDateInDF, endDateInDF, limits );
+
+                    repositoryStatistics =
+                        generator.generateReport( contentStats, selectedRepo, startDateInDF,
endDateInDF, limits );
                 }
                 catch ( ObjectNotFoundException oe )
                 {
@@ -278,92 +282,96 @@
                 }
                 catch ( ParseException pe )
                 {
-                	addActionError( pe.getMessage() );
-                	return ERROR;
+                    addActionError( pe.getMessage() );
+                    return ERROR;
                 }
             }
             else
             {
                 addFieldError( "availableRepositories", "Please select a repository (or repositories)
from the list." );
                 return INPUT;
-            } 
-            
-            if( repositoryStatistics.isEmpty() )
+            }
+
+            if ( repositoryStatistics.isEmpty() )
             {
                 return BLANK;
-            }            
+            }
         }
         catch ( ArchivaReportException e )
         {
             addActionError( "Error encountered while generating report :: " + e.getMessage()
);
             return ERROR;
         }
-        
+
         return SUCCESS;
     }
-	
+
     /**
      * Export report to CSV.
-     * 
+     *
      * @return
      */
     public String downloadStatisticsReport()
-    {   
+    {
         try
         {
-        	Date startDateInDF = null;
+            Date startDateInDF = null;
             Date endDateInDF = null;
-            
+
             selectedRepositories = parseSelectedRepositories();
             repositoryStatistics = new ArrayList();
-            
-            RepositoryContentStatisticsDAO repoContentStatsDao = dao.getRepositoryContentStatisticsDAO();
           
-            if( selectedRepositories.size() > 1 )
-            {   
+
+            RepositoryContentStatisticsDAO repoContentStatsDao = dao.getRepositoryContentStatisticsDAO();
+            if ( selectedRepositories.size() > 1 )
+            {
                 try
-                {	 
-                	startDateInDF = getStartDateInDateFormat();                	
-                	endDateInDF = getEndDateInDateFormat();
+                {
+                    startDateInDF = getStartDateInDateFormat();
+                    endDateInDF = getEndDateInDateFormat();
                 }
                 catch ( ParseException e )
                 {
-                	addActionError( "Error parsing date(s)." );
-                	return ERROR;
+                    addActionError( "Error parsing date(s)." );
+                    return ERROR;
                 }
-                
-                if( startDateInDF.after( endDateInDF ) )
+
+                if ( startDateInDF.after( endDateInDF ) )
                 {
                     addFieldError( "startDate", "Start Date must be earlier than the End
Date" );
                     return INPUT;
                 }
-                
-             // multiple repos
+
+                // multiple repos
                 generateReportForMultipleRepos( repoContentStatsDao, startDateInDF, endDateInDF,
false );
             }
             else if ( selectedRepositories.size() == 1 )
-            {   
+            {
                 selectedRepo = selectedRepositories.get( 0 );
                 try
-                {                 
-                	startDateInDF = getStartDateInDateFormat();
-                	endDateInDF = getEndDateInDateFormat();
-                	
-                	if( startDateInDF.after( endDateInDF ) )
+                {
+                    startDateInDF = getStartDateInDateFormat();
+                    endDateInDF = getEndDateInDateFormat();
+
+                    if ( startDateInDF.after( endDateInDF ) )
                     {
-                	    addFieldError( "startDate", "Start Date must be earlier than the End
Date" );
-                	    return INPUT;
+                        addFieldError( "startDate", "Start Date must be earlier than the
End Date" );
+                        return INPUT;
                     }
 
-                    List contentStats = repoContentStatsDao.queryRepositoryContentStatistics(
-                           new RepositoryContentStatisticsByRepositoryConstraint( selectedRepo,
startDateInDF, endDateInDF ) );
-                                        
-                    if( contentStats == null || contentStats.isEmpty() )
-                    {   
-                        addActionError( "No statistics available for repository. Repository
might not have been scanned." );
+                    List contentStats =
+                        repoContentStatsDao.queryRepositoryContentStatistics(
+                            new RepositoryContentStatisticsByRepositoryConstraint( selectedRepo,
startDateInDF,
+                                                                                   endDateInDF
) );
+
+                    if ( contentStats == null || contentStats.isEmpty() )
+                    {
+                        addActionError(
+                            "No statistics available for repository. Repository might not
have been scanned." );
                         return ERROR;
-                    }   
-                    
-                    repositoryStatistics = generator.generateReport( contentStats, selectedRepo,
startDateInDF, endDateInDF, false );                    
+                    }
+
+                    repositoryStatistics =
+                        generator.generateReport( contentStats, selectedRepo, startDateInDF,
endDateInDF, false );
                 }
                 catch ( ObjectNotFoundException oe )
                 {
@@ -377,56 +385,56 @@
                 }
                 catch ( ParseException pe )
                 {
-                	addActionError( pe.getMessage() );
-                	return ERROR;
+                    addActionError( pe.getMessage() );
+                    return ERROR;
                 }
             }
             else
             {
                 addFieldError( "availableRepositories", "Please select a repository (or repositories)
from the list." );
                 return INPUT;
-            } 
-            
-            if( repositoryStatistics.isEmpty() )
+            }
+
+            if ( repositoryStatistics.isEmpty() )
             {
                 return BLANK;
-            }            
+            }
         }
         catch ( ArchivaReportException e )
         {
             addActionError( "Error encountered while generating report :: " + e.getMessage()
);
             return ERROR;
-        }    
-        
+        }
+
         // write output stream depending on single or comparison report              
-        StringBuffer input = getInput();        
+        StringBuffer input = getInput();
         StringReader reader = new StringReader( input.toString() );
-        
+
         try
         {
-        	inputStream = new ByteArrayInputStream( IOUtils.toByteArray( reader ) );
+            inputStream = new ByteArrayInputStream( IOUtils.toByteArray( reader ) );
         }
         catch ( IOException i )
-        {	
-        	addActionError( "Error occurred while generating CSV file." );
-        	return ERROR;
+        {
+            addActionError( "Error occurred while generating CSV file." );
+            return ERROR;
         }
-        
-    	return SEND_FILE;
+
+        return SEND_FILE;
     }
-    
+
     // hack for parsing the struts list passed as param in 
     private List parseSelectedRepositories()
-    {           
+    {
         List pasedSelectedRepos = new ArrayList();
-     
-        for( String repo : selectedRepositories )
-        {   
+
+        for ( String repo : selectedRepositories )
+        {
             String[] tokens = StringUtils.split( repo, ',' );
-            if( tokens.length > 1 )
+            if ( tokens.length > 1 )
             {
-                for( int i = 0; i < tokens.length; i++ )
-                {   
+                for ( int i = 0; i < tokens.length; i++ )
+                {
                     pasedSelectedRepos.add( StringUtils.remove( StringUtils.remove( tokens[i],
'[' ), ']' ).trim() );
                 }
             }
@@ -438,16 +446,16 @@
         return pasedSelectedRepos;
     }
 
-    private void generateReportForMultipleRepos( RepositoryContentStatisticsDAO repoContentStatsDao,
-                                                 Date startDateInDF, Date endDateInDF, boolean
useLimits )
+    private void generateReportForMultipleRepos( RepositoryContentStatisticsDAO repoContentStatsDao,
Date startDateInDF,
+                                                 Date endDateInDF, boolean useLimits )
         throws ArchivaReportException
-    {   
+    {
         for ( String repo : selectedRepositories )
-        {   
+        {
             try
-            {                
-                List contentStats = repoContentStatsDao.queryRepositoryContentStatistics(

-                         new RepositoryContentStatisticsByRepositoryConstraint( repo, startDateInDF,
endDateInDF ) );
+            {
+                List contentStats = repoContentStatsDao.queryRepositoryContentStatistics(
+                    new RepositoryContentStatisticsByRepositoryConstraint( repo, startDateInDF,
endDateInDF ) );
 
                 if ( contentStats == null || contentStats.isEmpty() )
                 {
@@ -455,15 +463,16 @@
                     // TODO set repo's stats to 0
                     continue;
                 }
-                
-                if( useLimits )
+
+                if ( useLimits )
                 {
-                    repositoryStatistics.addAll( generator.generateReport( contentStats,
repo, startDateInDF, endDateInDF,
-                                                                       limits ) );
+                    repositoryStatistics.addAll(
+                        generator.generateReport( contentStats, repo, startDateInDF, endDateInDF,
limits ) );
                 }
                 else
                 {
-                    repositoryStatistics.addAll( generator.generateReport( contentStats,
repo, startDateInDF, endDateInDF, true ) );
+                    repositoryStatistics.addAll(
+                        generator.generateReport( contentStats, repo, startDateInDF, endDateInDF,
true ) );
                 }
             }
             catch ( ObjectNotFoundException oe )
@@ -506,89 +515,91 @@
         {
             endDateInDF = DateUtils.parseDate( endDate, datePatterns );
         }
-        
+
         return endDateInDF;
     }
-    
+
     private StringBuffer getInput()
     {
         StringBuffer input = null;
-        
-        if( selectedRepositories.size() == 1 )
-        {        	
-        	input = new StringBuffer( "Date of Scan,Total File Count,Total Size,Artifact Count,Group
Count,Project Count," +
-        			"Plugins,Archetypes,Jars,Wars,Deployments,Downloads\n" );
-        	
-        	for( RepositoryStatistics stats : repositoryStatistics )
-        	{
-        		input.append( stats.getDateOfScan() ).append( "," );
-        		input.append( stats.getFileCount() ).append( "," );
-        		input.append( stats.getTotalSize() ).append( "," );
-        		input.append( stats.getArtifactCount() ).append( "," );
-        		input.append( stats.getGroupCount() ).append( "," );
-        		input.append( stats.getProjectCount() ).append( "," );
-        		input.append( stats.getPluginCount() ).append( "," );
-        		input.append( stats.getArchetypeCount() ).append( "," );
-        		input.append( stats.getJarCount() ).append( "," );
-        		input.append( stats.getWarCount() ).append( "," );
-        		input.append( stats.getDeploymentCount() ).append( "," );
-        		input.append( stats.getDownloadCount() ).append( "\n" );
-        	}        	
-        }            
-        else if( selectedRepositories.size() > 1 )
-        {
-        	input = new StringBuffer( "Repository,Total File Count,Total Size,Artifact Count,Group
Count,Project Count," +
-					"Plugins,Archetypes,Jars,Wars,Deployments,Downloads\n" );
-			
-			for( RepositoryStatistics stats : repositoryStatistics )
-			{
-				input.append( stats.getRepositoryId() ).append( "," );
-				input.append( stats.getFileCount() ).append( "," );
-				input.append( stats.getTotalSize() ).append( "," );
-				input.append( stats.getArtifactCount() ).append( "," );
-				input.append( stats.getGroupCount() ).append( "," );
-				input.append( stats.getProjectCount() ).append( "," );
-				input.append( stats.getPluginCount() ).append( "," );
-				input.append( stats.getArchetypeCount() ).append( "," );
-				input.append( stats.getJarCount() ).append( "," );
-				input.append( stats.getWarCount() ).append( "," );
-				input.append( stats.getDeploymentCount() ).append( "," );
-				input.append( stats.getDownloadCount() ).append( "\n" );
-			}
+
+        if ( selectedRepositories.size() == 1 )
+        {
+            input = new StringBuffer(
+                "Date of Scan,Total File Count,Total Size,Artifact Count,Group Count,Project
Count," +
+                    "Plugins,Archetypes,Jars,Wars,Deployments,Downloads\n" );
+
+            for ( RepositoryStatistics stats : repositoryStatistics )
+            {
+                input.append( stats.getDateOfScan() ).append( "," );
+                input.append( stats.getFileCount() ).append( "," );
+                input.append( stats.getTotalSize() ).append( "," );
+                input.append( stats.getArtifactCount() ).append( "," );
+                input.append( stats.getGroupCount() ).append( "," );
+                input.append( stats.getProjectCount() ).append( "," );
+                input.append( stats.getPluginCount() ).append( "," );
+                input.append( stats.getArchetypeCount() ).append( "," );
+                input.append( stats.getJarCount() ).append( "," );
+                input.append( stats.getWarCount() ).append( "," );
+                input.append( stats.getDeploymentCount() ).append( "," );
+                input.append( stats.getDownloadCount() ).append( "\n" );
+            }
+        }
+        else if ( selectedRepositories.size() > 1 )
+        {
+            input = new StringBuffer(
+                "Repository,Total File Count,Total Size,Artifact Count,Group Count,Project
Count," +
+                    "Plugins,Archetypes,Jars,Wars,Deployments,Downloads\n" );
+
+            for ( RepositoryStatistics stats : repositoryStatistics )
+            {
+                input.append( stats.getRepositoryId() ).append( "," );
+                input.append( stats.getFileCount() ).append( "," );
+                input.append( stats.getTotalSize() ).append( "," );
+                input.append( stats.getArtifactCount() ).append( "," );
+                input.append( stats.getGroupCount() ).append( "," );
+                input.append( stats.getProjectCount() ).append( "," );
+                input.append( stats.getPluginCount() ).append( "," );
+                input.append( stats.getArchetypeCount() ).append( "," );
+                input.append( stats.getJarCount() ).append( "," );
+                input.append( stats.getWarCount() ).append( "," );
+                input.append( stats.getDeploymentCount() ).append( "," );
+                input.append( stats.getDownloadCount() ).append( "\n" );
+            }
         }
-        
+
         return input;
     }
-    
+
     private Date getDefaultStartDate()
     {
         Calendar cal = Calendar.getInstance();
         cal.clear();
         cal.set( 1900, 1, 1, 0, 0, 0 );
-        
+
         return cal.getTime();
     }
-    
+
     private Date getDefaultEndDate()
     {
         return Calendar.getInstance().getTime();
     }
-    
+
     public String execute()
         throws Exception
-    {   
-        if( repositoryId == null )
+    {
+        if ( repositoryId == null )
         {
-            addFieldError( "repositoryId", "You must provide a repository id.");        
   
+            addFieldError( "repositoryId", "You must provide a repository id." );
             return INPUT;
         }
-        
-        if( rowCount < 10 )
+
+        if ( rowCount < 10 )
         {
             addFieldError( "rowCount", "Row count must be larger than 10." );
             return INPUT;
         }
-        
+
         List problemArtifacts =
             dao.getRepositoryProblemDAO().queryRepositoryProblems( configureConstraint()
);
 
@@ -606,11 +617,11 @@
                 contextPath + "/browse/" + problemArtifact.getGroupId() + "/" + problemArtifact.getArtifactId()
);
 
             addToList( problemArtifactReport );
-            
+
             // retained the reports list because this is the datasource for the jasper report
           
             reports.add( problemArtifactReport );
         }
-        
+
         if ( reports.size() <= rowCount )
         {
             isLastPage = true;
@@ -638,7 +649,7 @@
             return SUCCESS;
         }
     }
-    
+
     private static boolean isJasperPresent()
     {
         if ( jasperPresent == null )
@@ -689,32 +700,32 @@
 
         return constraint;
     }
-    
+
     public SecureActionBundle getSecureActionBundle()
         throws SecureActionException
     {
         SecureActionBundle bundle = new SecureActionBundle();
-    
+
         bundle.setRequiresAuthentication( true );
         bundle.addRequiredAuthorization( ArchivaRoleConstants.OPERATION_ACCESS_REPORT, Resource.GLOBAL
);
-    
+
         return bundle;
     }
-    
+
     private void addToList( RepositoryProblemReport repoProblemReport )
     {
         List problemsList = null;
-        
+
         if ( repositoriesMap.containsKey( repoProblemReport.getRepositoryId() ) )
         {
-            problemsList = ( List ) repositoriesMap.get( repoProblemReport.getRepositoryId()
);
+            problemsList = (List) repositoriesMap.get( repoProblemReport.getRepositoryId()
);
         }
         else
         {
             problemsList = new ArrayList();
             repositoriesMap.put( repoProblemReport.getRepositoryId(), problemsList );
         }
-        
+
         problemsList.add( repoProblemReport );
     }
 
@@ -785,14 +796,14 @@
 
     public void setRepositoriesMap( Map>
repositoriesMap )
     {
-    	this.repositoriesMap = repositoriesMap;
+        this.repositoriesMap = repositoriesMap;
     }
-    
+
     public Map> getRepositoriesMap()
     {
-    	return repositoriesMap;
+        return repositoriesMap;
     }
-    
+
     public List getSelectedRepositories()
     {
         return selectedRepositories;
@@ -842,7 +853,7 @@
     {
         this.repositoryStatistics = repositoryStatistics;
     }
-    
+
     public int getReposSize()
     {
         return reposSize;
@@ -872,9 +883,9 @@
     {
         this.limits = limits;
     }
-    
+
     public InputStream getInputStream()
     {
-    	return inputStream;
+        return inputStream;
     }
 }

svn commit: r886669 - in /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action: admin/repositories/ reports/

2009-12-03T03:37:01Z

Author: brett
Date: Thu Dec  3 03:36:57 2009
New Revision: 886669

URL: http://svn.apache.org/viewvc?rev=886669&view=rev
Log:
[MRM-1293] some clean up in preparation for changes to repository statistics

Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java?rev=886669&r1=886668&r2=886669&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java
Thu Dec  3 03:36:57 2009
@@ -139,7 +139,8 @@
         removeRepositoryRoles( cleanupRepository );
         cleanupDatabase( cleanupRepository.getId() );
         cleanupScanStats( cleanupRepository.getId() );
-        
+        // TODO: delete all content for a repository from the content API?
+
         List proxyConnectors = getProxyConnectors();
         for ( ProxyConnectorConfiguration proxyConnector : proxyConnectors )
         {

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java?rev=886669&r1=886668&r2=886669&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java
Thu Dec  3 03:36:57 2009
@@ -19,9 +19,12 @@
  * under the License.
  */
 
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
 import com.opensymphony.xwork2.Preparable;
 import com.opensymphony.xwork2.Validateable;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
@@ -35,15 +38,10 @@
 import org.codehaus.plexus.redback.role.RoleManagerException;
 import org.codehaus.plexus.scheduler.CronExpressionValidator;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
 /**
- * AddManagedRepositoryAction 
+ * AddManagedRepositoryAction
  *
  * @version $Id$
- * 
  * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="editManagedRepositoryAction"
instantiation-strategy="per-lookup"
  */
 public class EditManagedRepositoryAction
@@ -56,7 +54,7 @@
     private ManagedRepositoryConfiguration repository;
 
     private String repoid;
-    
+
     private final String action = "editRepository";
 
     /**
@@ -90,10 +88,10 @@
 
     public String confirmUpdate()
     {
-    	// location was changed
+        // location was changed
         return save( true );
     }
-    
+
     public String commit()
     {
         ManagedRepositoryConfiguration existingConfig =
@@ -102,17 +100,17 @@
         boolean resetStats = false;
 
         // check if the location was changed
-        if( !StringUtils.equalsIgnoreCase( existingConfig.getLocation().trim(), repository.getLocation().trim()
) )
+        if ( !StringUtils.equalsIgnoreCase( existingConfig.getLocation().trim(), repository.getLocation().trim()
) )
         {
             resetStats = true;
 
             File dir = new File( repository.getLocation() );
-            if( dir.exists() )
+            if ( dir.exists() )
             {
                 return CONFIRM;
             }
         }
-        
+
         return save( resetStats );
     }
 
@@ -120,7 +118,7 @@
     {
         // Ensure that the fields are valid.
         Configuration configuration = archivaConfiguration.getConfiguration();
-        
+
         // We are in edit mode, remove the old repository configuration.
         removeRepository( repository.getId(), configuration );
 
@@ -132,7 +130,10 @@
             triggerAuditEvent( repository.getId(), null, AuditEvent.MODIFY_MANAGED_REPO );
             addRepositoryRoles( repository );
             result = saveConfiguration( configuration );
-            resetStatistics( resetStats );
+            if ( resetStats )
+            {
+                resetStatistics();
+            }
         }
         catch ( IOException e )
         {
@@ -157,7 +158,7 @@
 
         return result;
     }
-    
+
     @Override
     public void validate()
     {
@@ -169,14 +170,9 @@
         }
     }
 
-    private void resetStatistics( boolean reset )
+    private void resetStatistics()
         throws ObjectNotFoundException, ArchivaDatabaseException
     {
-        if ( !reset )
-        {
-            return;
-        }
-
         RepositoryContentStatisticsDAO repoContentStatsDao = archivaDAO.getRepositoryContentStatisticsDAO();
 
         List contentStats = repoContentStatsDao.queryRepositoryContentStatistics(
@@ -189,7 +185,7 @@
                 repoContentStatsDao.deleteRepositoryContentStatistics( stats );
             }
         }
-	} 
+	}
 
     public String getRepoid()
     {
@@ -210,7 +206,7 @@
     {
         this.repository = repository;
     }
-    
+
     public String getAction()
     {
         return action;

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java?rev=886669&r1=886668&r2=886669&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java
Thu Dec  3 03:36:57 2009
@@ -19,8 +19,21 @@
  * under the License.
  */
 
-import com.opensymphony.xwork2.Preparable;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import javax.servlet.http.HttpServletRequest;
 
+import com.opensymphony.xwork2.Preparable;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
@@ -44,29 +57,14 @@
 import org.apache.maven.archiva.reporting.RepositoryStatistics;
 import org.apache.maven.archiva.reporting.RepositoryStatisticsReportGenerator;
 import org.apache.maven.archiva.security.ArchivaRoleConstants;
-import org.codehaus.plexus.redback.rbac.Resource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.servlet.http.HttpServletRequest;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
 import org.apache.maven.archiva.web.action.PlexusActionSupport;
 import org.apache.struts2.interceptor.ServletRequestAware;
+import org.codehaus.plexus.redback.rbac.Resource;
 import org.codehaus.redback.integration.interceptor.SecureAction;
 import org.codehaus.redback.integration.interceptor.SecureActionBundle;
 import org.codehaus.redback.integration.interceptor.SecureActionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="generateReport" instantiation-strategy="per-lookup"
@@ -76,19 +74,17 @@
     implements SecureAction, ServletRequestAware, Preparable
 {
     private Logger log = LoggerFactory.getLogger( GenerateReportAction.class );
-    
+
     /**
      * @plexus.requirement role-hint="jdo"
      */
     protected ArchivaDAO dao;
-    
+
     /**
      * @plexus.requirement
      */
     private ArchivaConfiguration archivaConfiguration;
 
-    protected Constraint constraint;
-
     protected HttpServletRequest request;
 
     protected List reports = new ArrayList();
@@ -357,8 +353,8 @@
                 	    addFieldError( "startDate", "Start Date must be earlier than the End
Date" );
                 	    return INPUT;
                     }
-                	
-                    List contentStats = repoContentStatsDao.queryRepositoryContentStatistics(

+
+                    List contentStats = repoContentStatsDao.queryRepositoryContentStatistics(
                            new RepositoryContentStatisticsByRepositoryConstraint( selectedRepo,
startDateInDF, endDateInDF ) );
                                         
                     if( contentStats == null || contentStats.isEmpty() )

svn commit: r886134 - /archiva/sandbox/content-model.zip

2009-12-02T12:50:14Z

Author: brett
Date: Wed Dec  2 12:50:11 2009
New Revision: 886134

URL: http://svn.apache.org/viewvc?rev=886134&view=rev
Log:
update stats in content model

Modified:
    archiva/sandbox/content-model.zip

Modified: archiva/sandbox/content-model.zip
URL: http://svn.apache.org/viewvc/archiva/sandbox/content-model.zip?rev=886134&r1=886133&r2=886134&view=diff
==============================================================================
Binary files - no diff available.

svn commit: r886132 - /archiva/sandbox/content-model.zip

2009-12-02T12:32:42Z

Author: brett
Date: Wed Dec  2 12:32:36 2009
New Revision: 886132

URL: http://svn.apache.org/viewvc?rev=886132&view=rev
Log:
updated content model for stats

Modified:
    archiva/sandbox/content-model.zip

Modified: archiva/sandbox/content-model.zip
URL: http://svn.apache.org/viewvc/archiva/sandbox/content-model.zip?rev=886132&r1=886131&r2=886132&view=diff
==============================================================================
Binary files - no diff available.

svn commit: r886126 - in /archiva/branches/MRM-1025/archiva-modules: archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ ...

2009-12-02T11:54:29Z

Author: brett
Date: Wed Dec  2 11:54:28 2009
New Revision: 886126

URL: http://svn.apache.org/viewvc?rev=886126&view=rev
Log:
[MRM-1025] fill out more of the information in the metadata creation consumer to make it consistent
with the current database record creation consumer

Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
    archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ArtifactMetadata.java
    archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java?rev=886126&r1=886125&r2=886126&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
Wed Dec  2 11:54:28 2009
@@ -20,14 +20,18 @@
  */
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import org.apache.archiva.checksum.ChecksumAlgorithm;
+import org.apache.archiva.checksum.ChecksummedFile;
 import org.apache.archiva.metadata.model.ArtifactMetadata;
-import org.apache.archiva.metadata.model.ProjectVersionMetadata;
 import org.apache.archiva.metadata.model.ProjectMetadata;
+import org.apache.archiva.metadata.model.ProjectVersionMetadata;
 import org.apache.archiva.metadata.repository.MetadataRepository;
+import org.apache.maven.archiva.common.utils.VersionUtil;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.ConfigurationNames;
 import org.apache.maven.archiva.configuration.FileTypes;
@@ -42,13 +46,15 @@
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.registry.Registry;
 import org.codehaus.plexus.registry.RegistryListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Take an artifact off of disk and put it into the metadata repository.
- * 
+ *
  * @version $Id: ArtifactUpdateDatabaseConsumer.java 718864 2008-11-19 06:33:35Z brett $
  * @plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
- *                   role-hint="create-archiva-metadata" instantiation-strategy="per-lookup"
+ * role-hint="create-archiva-metadata" instantiation-strategy="per-lookup"
  */
 public class ArchivaMetadataCreationConsumer
     extends AbstractMonitoredConsumer
@@ -88,6 +94,8 @@
      */
     private MetadataRepository metadataRepository;
 
+    private static final Logger log = LoggerFactory.getLogger( ArchivaMetadataCreationConsumer.class
);
+
     public String getId()
     {
         return this.id;
@@ -143,22 +151,41 @@
         project.setId( artifact.getArtifactId() );
 
         ProjectVersionMetadata versionMetadata = new ProjectVersionMetadata();
-        versionMetadata.setId( artifact.getVersion() ); // TODO: this should be the version
from the POM, not the timestamped version
+        versionMetadata.setId( VersionUtil.getBaseVersion( artifact.getVersion() ) );
 
         ArtifactMetadata artifactMeta = new ArtifactMetadata();
         artifactMeta.setId( file.getName() );
-        artifactMeta.setUpdated( file.lastModified() );
+        artifactMeta.setFileLastModified( file.lastModified() );
         artifactMeta.setSize( file.length() );
         artifactMeta.setVersion( artifact.getVersion() );
+        artifactMeta.setWhenGathered( whenGathered );
 
-        // TODO: read the POM and fill in the rest of the information
+        ChecksummedFile checksummedFile = new ChecksummedFile( file );
+        try
+        {
+            artifactMeta.setMd5( checksummedFile.calculateChecksum( ChecksumAlgorithm.MD5
) );
+        }
+        catch ( IOException e )
+        {
+            log.error( "Error attempting to get MD5 checksum for " + file + ": " + e.getMessage()
);
+        }
+        try
+        {
+            artifactMeta.setSha1( checksummedFile.calculateChecksum( ChecksumAlgorithm.SHA1
) );
+        }
+        catch ( IOException e )
+        {
+            log.error( "Error attempting to get SHA-1 checksum for " + file + ": " + e.getMessage()
);
+        }
 
-        // TODO: store "whenGathered"
+        // TODO: read the POM and fill in the rest of the information
 
         // TODO: transaction
         // read the metadata and update it if it is newer or doesn't exist
-        metadataRepository.updateArtifact( repository.getId(), project.getNamespace(), project.getId(),
versionMetadata.getId(), artifactMeta );
-        metadataRepository.updateProjectVersion( repository.getId(), project.getNamespace(),
project.getId(), versionMetadata );
+        metadataRepository.updateArtifact( repository.getId(), project.getNamespace(), project.getId(),
+                                           versionMetadata.getId(), artifactMeta );
+        metadataRepository.updateProjectVersion( repository.getId(), project.getNamespace(),
project.getId(),
+                                                 versionMetadata );
         metadataRepository.updateProject( repository.getId(), project );
     }
 

Modified: archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ArtifactMetadata.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ArtifactMetadata.java?rev=886126&r1=886125&r2=886126&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ArtifactMetadata.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ArtifactMetadata.java
Wed Dec  2 11:54:28 2009
@@ -25,12 +25,18 @@
 {
     private String id;
     
-    private Date updated;
-    
     private long size;
 
     private String version;
 
+    private Date fileLastModified;
+
+    private Date whenGathered;
+
+    private String md5;
+
+    private String sha1;
+
     public String getId()
     {
         return id;
@@ -41,38 +47,64 @@
         this.id = id;
     }
 
-    public Date getUpdated()
+    public long getSize()
     {
-        return updated;
+        return size;
     }
 
-    public void setUpdated( Date updated )
+    public void setSize( long size )
     {
-        this.updated = updated;
+        this.size = size;
     }
 
-    public void setUpdated( long updated )
+    public String getVersion()
     {
-        this.updated = new Date( updated );
+        return version;
     }
 
-    public long getSize()
+    public void setVersion( String version )
     {
-        return size;
+        this.version = version;
     }
 
-    public void setSize( long size )
+    public void setFileLastModified( long fileLastModified )
     {
-        this.size = size;
+        this.fileLastModified = new Date( fileLastModified );
     }
 
-    public String getVersion()
+    public void setWhenGathered( Date whenGathered )
     {
-        return version;
+        this.whenGathered = whenGathered;
     }
 
-    public void setVersion( String version )
+    public void setMd5( String md5 )
     {
-        this.version = version;
+        this.md5 = md5;
+    }
+
+    public void setSha1( String sha1 )
+    {
+        this.sha1 = sha1;
+    }
+
+    public Date getWhenGathered()
+    {
+        return whenGathered;
+    }
+
+    public String getMd5()
+    {
+        return md5;
+    }
+
+    public String getSha1()
+    {
+        return sha1;
+    }
+
+    public Date getFileLastModified()
+    {
+
+        return fileLastModified;
     }
 }

Modified: archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java?rev=886126&r1=886125&r2=886126&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
Wed Dec  2 11:54:28 2009
@@ -268,8 +268,12 @@
         Properties properties = readProperties( directory, PROJECT_VERSION_METADATA_KEY );
 
         properties.setProperty( "artifact:updated:" + artifact.getId(),
-                                Long.toString( artifact.getUpdated().getTime() ) );
+                                Long.toString( artifact.getFileLastModified().getTime() )
);
+        properties.setProperty( "artifact:whenGathered:" + artifact.getId(),
+                                Long.toString( artifact.getWhenGathered().getTime() ) );
         properties.setProperty( "artifact:size:" + artifact.getId(), Long.toString( artifact.getSize()
) );
+        properties.setProperty( "artifact:md5:" + artifact.getId(), artifact.getMd5() );
+        properties.setProperty( "artifact:sha1:" + artifact.getId(), artifact.getMd5() );
         properties.setProperty( "artifact:version:" + artifact.getId(), artifact.getVersion()
);
 
         try

svn commit: r886110 - in /archiva/branches/MRM-1025/archiva-modules: archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/functors/ archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/ archiva-database/src/main/...

2009-12-02T10:45:13Z

Author: brett
Date: Wed Dec  2 10:45:10 2009
New Revision: 886110

URL: http://svn.apache.org/viewvc?rev=886110&view=rev
Log:
[MRM-1025] remove empty directories and unused class

Removed:
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/functors/
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/project/
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/updater/
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/resources/META-INF/
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/resources/org/

svn commit: r886101 - in /archiva/branches/MRM-1025/archiva-modules: archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ archiva-base/archiva-model/ archiva-base/archiva-model/src/main/md...

2009-12-02T10:24:00Z

Author: brett
Date: Wed Dec  2 10:23:42 2009
New Revision: 886101

URL: http://svn.apache.org/viewvc?rev=886101&view=rev
Log:
[MRM-1025] remove model fields that are not used for clarity

Removed:
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/maven/archiva/model/ArchivaArtifactTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraintTest.java
Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReader.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraint.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/AllTests.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoArtifactDAOTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java?rev=886101&r1=886100&r2=886101&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
Wed Dec  2 10:23:42 2009
@@ -19,6 +19,11 @@
  * under the License.
  */
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.ConfigurationNames;
 import org.apache.maven.archiva.configuration.FileTypes;
@@ -41,11 +46,6 @@
 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;
-
 /**
  * ArtifactUpdateDatabaseConsumer - Take an artifact off of disk and put it into the repository.
  *
@@ -193,8 +193,6 @@
 
             artifact.getModel().setLastModified( new Date( artifactFile.lastModified() )
);
             artifact.getModel().setSize( artifactFile.length() );
-            artifact.getModel().setOrigin( "FileSystem" );
-            artifact.getModel().setWhenProcessed( null );
             
             // set this to when the artifact was first discovered in the repo
             if ( artifact.getModel().getWhenGathered() == null )

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml?rev=886101&r1=886100&r2=886101&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/pom.xml Wed Dec 
2 10:23:42 2009
@@ -70,7 +70,7 @@
         org.codehaus.modello
         modello-maven-plugin
         
-          1.2.1
+          1.3.0
           false
           
             src/main/mdo/archiva-base.xml

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml?rev=886101&r1=886100&r2=886101&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
Wed Dec  2 10:23:42 2009
@@ -5,7 +5,10 @@
        xsd.target-namespace="http://archiva.apache.org/model/1.2.0">
   archiva-base-model
   ArchivaBaseModel
-  1.2.1
+  
+  1.3.0
   Archiva Model
   
     
@@ -220,47 +223,6 @@
             The size of the artifact on disk.
           
         
-        
-          platform
-          false
-          1.0.0+
-          String
-          true
-          
-            The platform of this artifact. (default: "java")
-          
-          java
-        
-        
-          whenIndexed
-          false
-          1.0.0+
-          Date
-          false
-          
-            The timestamp when this artifact was indexed.
-          
-        
-        
-          whenProcessed
-          false
-          1.0.0+
-          Date
-          false
-          
-            When this artifact's contents was processed.
-          
-        
-        
-          origin
-          false
-          1.0.0+
-          String
-          false
-          
-            The origin of this artifact. (Filesystem, Proxy, Deploy)
-          
-        
         
           whenGathered
           false
@@ -279,20 +241,6 @@
     private static final long serialVersionUID = -6292417108113887384L;
           ]]>
         
-        
-          1.0.0+
-          
-        
       
     
 
@@ -443,26 +391,6 @@
             The size of the artifact on disk.
           
         
-        
-          whenIndexed
-          false
-          1.0.0+
-          Date
-          false
-          
-            The timestamp when this artifact was indexed.
-          
-        
-        
-          origin
-          false
-          1.0.0+
-          String
-          false
-          
-            The origin of this artifact. (Filesystem, Proxy, Deploy)
-          
-        
       
       
         

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReader.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReader.java?rev=886101&r1=886100&r2=886101&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReader.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReader.java
Wed Dec  2 10:23:42 2009
@@ -19,6 +19,9 @@
  * under the License.
  */
 
+import java.io.File;
+import java.util.Date;
+
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
 import org.apache.maven.archiva.model.Plugin;
@@ -27,9 +30,6 @@
 import org.apache.maven.archiva.xml.XMLReader;
 import org.dom4j.Element;
 
-import java.io.File;
-import java.util.Date;
-
 /**
  * RepositoryMetadataReader - read maven-metadata.xml files.
  *
@@ -60,7 +60,6 @@
             metadata.setVersion( xml.getElementText( "//metadata/version" ) );
             metadata.setFileLastModified( new Date( metadataFile.lastModified() ) );
             metadata.setFileSize( metadataFile.length() );
-            metadata.setWhenIndexed( null );
 
             metadata.setLastUpdated( xml.getElementText( "//metadata/versioning/lastUpdated"
) );
             metadata.setLatestVersion( xml.getElementText( "//metadata/versioning/latest"
) );

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraint.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraint.java?rev=886101&r1=886100&r2=886101&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraint.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ArtifactsProcessedConstraint.java
Wed Dec  2 10:23:42 2009
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import org.apache.maven.archiva.database.Constraint;
-
 import java.util.Date;
 
+import org.apache.maven.archiva.database.Constraint;
+
 /**
  * ArtifactsProcessedConstraint 
  *
@@ -34,18 +34,6 @@
 {
     private String whereClause;
 
-    public ArtifactsProcessedConstraint( boolean isProcessed )
-    {
-        if ( isProcessed )
-        {
-            whereClause = "whenProcessed != null";
-        }
-        else
-        {
-            whereClause = "whenProcessed == null";
-        }
-    }
-
     /**
      * A Constraint showing artifacts processed since date provided.
      * @param since

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/AllTests.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/AllTests.java?rev=886101&r1=886100&r2=886101&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/AllTests.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/AllTests.java
Wed Dec  2 10:23:42 2009
@@ -34,7 +34,6 @@
     {
         TestSuite suite = new TestSuite( "Test for org.apache.maven.archiva.database.constraints"
);
         //$JUnit-BEGIN$
-        suite.addTestSuite( ArtifactsProcessedConstraintTest.class );
         suite.addTestSuite( ArtifactsByChecksumConstraintTest.class );
         suite.addTestSuite( OlderArtifactsByAgeConstraintTest.class );
         suite.addTestSuite( UniqueGroupIdConstraintTest.class );

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoArtifactDAOTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoArtifactDAOTest.java?rev=886101&r1=886100&r2=886101&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoArtifactDAOTest.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoArtifactDAOTest.java
Wed Dec  2 10:23:42 2009
@@ -21,7 +21,6 @@
 
 import java.util.Date;
 import java.util.List;
-
 import javax.jdo.JDOHelper;
 import javax.jdo.spi.JDOImplHelper;
 
@@ -67,7 +66,6 @@
 
         // Set some mandatory values
         artifact.getModel().setLastModified( new Date() );
-        artifact.getModel().setOrigin( "test" );
 
         // Save it.
         ArchivaArtifact savedArtifact = artiDao.saveArtifact( artifact );
@@ -90,7 +88,7 @@
         assertEquals( "jar", firstArtifact.getType() );
 
         // Change value and save.
-        savedArtifact.getModel().setOrigin( "changed" );
+        savedArtifact.getModel().setLastModified( new Date() );
         artiDao.saveArtifact( savedArtifact );
 
         // Test that only 1 object is saved.
@@ -103,7 +101,6 @@
 
         // Test expected values.
         assertEquals( "archiva-test-module", actualArtifact.getArtifactId() );
-        assertEquals( "changed", actualArtifact.getModel().getOrigin() );
 
         // Test that only 1 object is saved.
         assertEquals( 1, artiDao.queryArtifacts( null ).size() );

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java?rev=886101&r1=886100&r2=886101&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java
Wed Dec  2 10:23:42 2009
@@ -32,7 +32,6 @@
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
 import org.apache.maven.archiva.database.ArchivaDAO;
 import org.apache.maven.archiva.database.ArtifactDAO;
-import org.apache.maven.archiva.database.constraints.ArtifactsProcessedConstraint;
 import org.apache.maven.archiva.model.ArchivaArtifact;
 import org.apache.maven.archiva.model.RepositoryContentStatistics;
 import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
@@ -174,7 +173,7 @@
         taskExecutor.executeTask( repoTask );
 
         ArtifactDAO adao = dao.getArtifactDAO();
-        List unprocessedResultList = adao.queryArtifacts( new ArtifactsProcessedConstraint(
false ) );
+        List unprocessedResultList = adao.queryArtifacts( null );
         
         assertNotNull( unprocessedResultList );
         assertEquals("Incorrect number of unprocessed artifacts detected.", 8, unprocessedResultList.size()
);
@@ -215,7 +214,7 @@
         taskExecutor.executeTask( repoTask );
 
         ArtifactDAO adao = dao.getArtifactDAO();
-        List unprocessedResultList = adao.queryArtifacts( new ArtifactsProcessedConstraint(
false ) );
+        List unprocessedResultList = adao.queryArtifacts( null );
         
         assertNotNull( unprocessedResultList );
         assertEquals("Incorrect number of unprocessed artifacts detected. No new artifacts
should have been found.", 0, unprocessedResultList.size() );
@@ -232,7 +231,7 @@
         
         taskExecutor.executeTask( repoTask );
         
-        unprocessedResultList = adao.queryArtifacts( new ArtifactsProcessedConstraint( false
) );
+        unprocessedResultList = adao.queryArtifacts( null );
         assertNotNull( unprocessedResultList );
         assertEquals( "Incorrect number of unprocessed artifacts detected. One new artifact
should have been found.", 1, unprocessedResultList.size() );        
     }
@@ -272,7 +271,7 @@
         taskExecutor.executeTask( repoTask );
 
         ArtifactDAO adao = dao.getArtifactDAO();
-        List unprocessedResultList = adao.queryArtifacts( new ArtifactsProcessedConstraint(
false ) );
+        List unprocessedResultList = adao.queryArtifacts( null );
         
         assertNotNull( unprocessedResultList );
         assertEquals("Incorrect number of unprocessed artifacts detected.", 8, unprocessedResultList.size()
);

svn commit: r886054 - /archiva/sandbox/content-model.zip

2009-12-02T05:34:36Z

Author: brett
Date: Wed Dec  2 05:34:36 2009
New Revision: 886054

URL: http://svn.apache.org/viewvc?rev=886054&view=rev
Log:
updated model template

Modified:
    archiva/sandbox/content-model.zip

Modified: archiva/sandbox/content-model.zip
URL: http://svn.apache.org/viewvc/archiva/sandbox/content-model.zip?rev=886054&r1=886053&r2=886054&view=diff
==============================================================================
Binary files - no diff available.

svn commit: r886053 - /archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt

2009-12-02T05:34:27Z

Author: brett
Date: Wed Dec  2 05:34:27 2009
New Revision: 886053

URL: http://svn.apache.org/viewvc?rev=886053&view=rev
Log:
[MRM-1025] add other properties to the content model from maven metadata and filesystem

Modified:
    archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt

Modified: archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt?rev=886053&r1=886052&r2=886053&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt (original)
+++ archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt Wed Dec  2 05:34:27
2009
@@ -10,83 +10,90 @@
         |-- content/
         |   `-- org/
         |       `-- apache/
-        |           `-- archiva/
-        |               `-- platform/
-        |                   |-- scanner/
-        |                   |   |-- 1.0-SNAPSHOT/
-        |                   |   |   |-- scanner-1.0-20091120.012345-1.pom/
-        |                   |   |   |   |-- asc=
-        |                   |   |   |   |-- created=
-        |                   |   |   |   |-- maven:buildNumber=
-        |                   |   |   |   |-- maven:classifier
-        |                   |   |   |   |-- maven:timestamp=
-        |                   |   |   |   |-- maven:type=
-        |                   |   |   |   |-- md5=
-        |                   |   |   |   |-- sha1=
-        |                   |   |   |   |-- size=
-        |                   |   |   |   |-- updated=
-        |                   |   |   |   `-- version=
-        |                   |   |   |-- ciManagement.system=
-        |                   |   |   |-- ciManagement.url=
-        |                   |   |   |-- created=
-        |                   |   |   |-- dependencies.0.artifactId=
-        |                   |   |   |-- dependencies.0.classifier=
-        |                   |   |   |-- dependencies.0.groupId=
-        |                   |   |   |-- dependencies.0.optional=
-        |                   |   |   |-- dependencies.0.scope=
-        |                   |   |   |-- dependencies.0.systemPath=
-        |                   |   |   |-- dependencies.0.type=
-        |                   |   |   |-- dependencies.0.version=
-        |                   |   |   |-- description=
-        |                   |   |   |-- individuals.0.email=
-        |                   |   |   |-- individuals.0.name=
-        |                   |   |   |-- individuals.0.properties.scmId=
-        |                   |   |   |-- individuals.0.roles.0=
-        |                   |   |   |-- individuals.0.timezone=
-        |                   |   |   |-- issueManagement.system=
-        |                   |   |   |-- issueManagement.url=
-        |                   |   |   |-- licenses.0.name=
-        |                   |   |   |-- licenses.0.url=
-        |                   |   |   |-- mailingLists.0.mainArchiveUrl=
-        |                   |   |   |-- mailingLists.0.name=
-        |                   |   |   |-- mailingLists.0.otherArchives.0=
-        |                   |   |   |-- mailingLists.0.postAddress=
-        |                   |   |   |-- mailingLists.0.subscribeAddress=
-        |                   |   |   |-- mailingLists.0.unsubscribeAddress=
-        |                   |   |   |-- maven:buildExtensions.0.artifactId=
-        |                   |   |   |-- maven:buildExtensions.0.groupId=
-        |                   |   |   |-- maven:buildExtensions.0.version=
-        |                   |   |   |-- maven:packaging=
-        |                   |   |   |-- maven:parent.artifactId=
-        |                   |   |   |-- maven:parent.groupId=
-        |                   |   |   |-- maven:parent.version=
-        |                   |   |   |-- maven:plugins.0.artifactId=
-        |                   |   |   |-- maven:plugins.0.groupId=
-        |                   |   |   |-- maven:plugins.0.reporting=
-        |                   |   |   |-- maven:plugins.0.version=
-        |                   |   |   |-- maven:properties.mavenVersion=
-        |                   |   |   |-- maven:repositories.0.id=
-        |                   |   |   |-- maven:repositories.0.layout=
-        |                   |   |   |-- maven:repositories.0.name=
-        |                   |   |   |-- maven:repositories.0.plugins=
-        |                   |   |   |-- maven:repositories.0.releases=
-        |                   |   |   |-- maven:repositories.0.snapshots=
-        |                   |   |   |-- maven:repositories.0.url=
-        |                   |   |   |-- name=
-        |                   |   |   |-- organization.favicon=
-        |                   |   |   |-- organization.logo=
-        |                   |   |   |-- organization.name=
-        |                   |   |   |-- organization.url=
-        |                   |   |   |-- relocatedTo.namespace=
-        |                   |   |   |-- relocatedTo.project=
-        |                   |   |   |-- relocatedTo.projectVersion=
-        |                   |   |   |-- scm.connection=
-        |                   |   |   |-- scm.developerConnection=
-        |                   |   |   |-- scm.url=
-        |                   |   |   |-- updated=
-        |                   |   |   `-- url=
-        |                   |   `-- maven:artifactId=
-        |                   `-- maven:groupId=
+        |           |-- archiva/
+        |           |   `-- platform/
+        |           |       |-- scanner/
+        |           |       |   |-- 1.0-SNAPSHOT/
+        |           |       |   |   |-- scanner-1.0-20091120.012345-1.pom/
+        |           |       |   |   |   |-- asc=
+        |           |       |   |   |   |-- created=
+        |           |       |   |   |   |-- fileCreated=
+        |           |       |   |   |   |-- fileLastModified=
+        |           |       |   |   |   |-- maven:buildNumber=
+        |           |       |   |   |   |-- maven:classifier
+        |           |       |   |   |   |-- maven:timestamp=
+        |           |       |   |   |   |-- maven:type=
+        |           |       |   |   |   |-- md5=
+        |           |       |   |   |   |-- sha1=
+        |           |       |   |   |   |-- size=
+        |           |       |   |   |   |-- updated=
+        |           |       |   |   |   `-- version=
+        |           |       |   |   |-- ciManagement.system=
+        |           |       |   |   |-- ciManagement.url=
+        |           |       |   |   |-- created=
+        |           |       |   |   |-- dependencies.0.artifactId=
+        |           |       |   |   |-- dependencies.0.classifier=
+        |           |       |   |   |-- dependencies.0.groupId=
+        |           |       |   |   |-- dependencies.0.optional=
+        |           |       |   |   |-- dependencies.0.scope=
+        |           |       |   |   |-- dependencies.0.systemPath=
+        |           |       |   |   |-- dependencies.0.type=
+        |           |       |   |   |-- dependencies.0.version=
+        |           |       |   |   |-- description=
+        |           |       |   |   |-- individuals.0.email=
+        |           |       |   |   |-- individuals.0.name=
+        |           |       |   |   |-- individuals.0.properties.scmId=
+        |           |       |   |   |-- individuals.0.roles.0=
+        |           |       |   |   |-- individuals.0.timezone=
+        |           |       |   |   |-- issueManagement.system=
+        |           |       |   |   |-- issueManagement.url=
+        |           |       |   |   |-- licenses.0.name=
+        |           |       |   |   |-- licenses.0.url=
+        |           |       |   |   |-- mailingLists.0.mainArchiveUrl=
+        |           |       |   |   |-- mailingLists.0.name=
+        |           |       |   |   |-- mailingLists.0.otherArchives.0=
+        |           |       |   |   |-- mailingLists.0.postAddress=
+        |           |       |   |   |-- mailingLists.0.subscribeAddress=
+        |           |       |   |   |-- mailingLists.0.unsubscribeAddress=
+        |           |       |   |   |-- maven:buildExtensions.0.artifactId=
+        |           |       |   |   |-- maven:buildExtensions.0.groupId=
+        |           |       |   |   |-- maven:buildExtensions.0.version=
+        |           |       |   |   |-- maven:packaging=
+        |           |       |   |   |-- maven:parent.artifactId=
+        |           |       |   |   |-- maven:parent.groupId=
+        |           |       |   |   |-- maven:parent.version=
+        |           |       |   |   |-- maven:plugins.0.artifactId=
+        |           |       |   |   |-- maven:plugins.0.groupId=
+        |           |       |   |   |-- maven:plugins.0.reporting=
+        |           |       |   |   |-- maven:plugins.0.version=
+        |           |       |   |   |-- maven:properties.mavenVersion=
+        |           |       |   |   |-- maven:repositories.0.id=
+        |           |       |   |   |-- maven:repositories.0.layout=
+        |           |       |   |   |-- maven:repositories.0.name=
+        |           |       |   |   |-- maven:repositories.0.plugins=
+        |           |       |   |   |-- maven:repositories.0.releases=
+        |           |       |   |   |-- maven:repositories.0.snapshots=
+        |           |       |   |   |-- maven:repositories.0.url=
+        |           |       |   |   |-- name=
+        |           |       |   |   |-- organization.favicon=
+        |           |       |   |   |-- organization.logo=
+        |           |       |   |   |-- organization.name=
+        |           |       |   |   |-- organization.url=
+        |           |       |   |   |-- relocatedTo.namespace=
+        |           |       |   |   |-- relocatedTo.project=
+        |           |       |   |   |-- relocatedTo.projectVersion=
+        |           |       |   |   |-- scm.connection=
+        |           |       |   |   |-- scm.developerConnection=
+        |           |       |   |   |-- scm.url=
+        |           |       |   |   |-- updated=
+        |           |       |   |   `-- url=
+        |           |       |   `-- maven:artifactId=
+        |           |       `-- maven:groupId=
+        |           `-- maven/
+        |               `-- plugins/
+        |                   |-- maven:groupId=
+        |                   |-- maven:plugins.compiler.artifactId=
+        |                   `-- maven:plugins.compiler.name=
         `-- references/
             `-- org/
                 `-- apache/
@@ -117,10 +124,9 @@
                                                             `-- 1.0-SNAPSHOT/
                                                                 `-- referenceType=dependency
 
-
 (To update - run "tree --dirstfirst -F" on the unpacked content-model.zip from the sandbox)
 
-Notes: 
+Notes:
 
 *) config should be reflected to an external configuration file and only stored in the content
repository for purposes
    of accessing through a REST API, for example
@@ -162,7 +168,10 @@
    maven:artifactId), for convenience when loaded by the implementation it may all be pushed
into the projectVersion's
    information. The metadata repository implementation can decide how best to store and retrieve
the information.
 
-*) created/updated timestamps may be maintained by the metadata repository implementation
+*) created/updated timestamps may be maintained by the metadata repository implementation
for the metadata itself.
+   Timestamps for individual files are stored as additional properties (fileCreated, fileLastModified).
It may make
+   sense to add a "discovered" timestamp if an artifact is known to be created at a different
time to which it is added
+   to the metadata repository.
 
 *) references are stored outside the main model so that their creation doesn't imply a "stub"
model - we know if the
    project exists whether a reference is created or not. References need not infer referential
integrity.
@@ -180,4 +189,3 @@
 
 *) Future possibilities:
    - audit metadata on artifacts (who uploaded, when, and how), or whether it was discovered
by scanning
-

svn commit: r886050 - /archiva/sandbox/content-model.zip

2009-12-02T04:53:11Z

Author: brett
Date: Wed Dec  2 04:53:11 2009
New Revision: 886050

URL: http://svn.apache.org/viewvc?rev=886050&view=rev
Log:
update the content model template

Modified:
    archiva/sandbox/content-model.zip

Modified: archiva/sandbox/content-model.zip
URL: http://svn.apache.org/viewvc/archiva/sandbox/content-model.zip?rev=886050&r1=886049&r2=886050&view=diff
==============================================================================
Binary files - no diff available.

svn commit: r886049 - /archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt

2009-12-02T04:52:12Z

Author: brett
Date: Wed Dec  2 04:52:12 2009
New Revision: 886049

URL: http://svn.apache.org/viewvc?rev=886049&view=rev
Log:
[MRM-1025] add references to the content model

Modified:
    archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt

Modified: archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt?rev=886049&r1=886048&r2=886049&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt (original)
+++ archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt Wed Dec  2 04:52:12
2009
@@ -18,7 +18,7 @@
         |                   |   |   |   |-- asc=
         |                   |   |   |   |-- created=
         |                   |   |   |   |-- maven:buildNumber=
-        |                   |   |   |   |-- maven:classifier=
+        |                   |   |   |   |-- maven:classifier
         |                   |   |   |   |-- maven:timestamp=
         |                   |   |   |   |-- maven:type=
         |                   |   |   |   |-- md5=
@@ -87,12 +87,44 @@
         |                   |   |   `-- url=
         |                   |   `-- maven:artifactId=
         |                   `-- maven:groupId=
-        `-- metadata/
+        `-- references/
+            `-- org/
+                `-- apache/
+                    `-- archiva/
+                        |-- parent/
+                        |   `-- 1/
+                        |       `-- references/
+                        |           `-- org/
+                        |               `-- apache/
+                        |                   `-- archiva/
+                        |                       |-- platform/
+                        |                       |   `-- scanner/
+                        |                       |       `-- 1.0-SNAPSHOT/
+                        |                       |           `-- referenceType=parent
+                        |                       `-- web/
+                        |                           `-- webapp/
+                        |                               `-- 1.0-SNAPSHOT/
+                        |                                   `-- referenceType=parent
+                        `-- platform/
+                            `-- scanner/
+                                `-- 1.0-SNAPSHOT/
+                                    `-- references/
+                                        `-- org/
+                                            `-- apache/
+                                                `-- archiva/
+                                                    `-- web/
+                                                        `-- webapp/
+                                                            `-- 1.0-SNAPSHOT/
+                                                                `-- referenceType=dependency
+
 
 (To update - run "tree --dirstfirst -F" on the unpacked content-model.zip from the sandbox)
 
 Notes: 
 
+*) config should be reflected to an external configuration file and only stored in the content
repository for purposes
+   of accessing through a REST API, for example
+
 *) In the above example, we have the following coordinates:
    - namespace = org.apache.archiva.platform (namespaces are of arbitrary depth, and are
project namespaces, not to be
                                               confused with JCR's item/node namespaces)
@@ -133,7 +165,7 @@
 *) created/updated timestamps may be maintained by the metadata repository implementation
 
 *) references are stored outside the main model so that their creation doesn't imply a "stub"
model - we know if the
-   project exists whether a reference is created or not. References need not infer referential
integrity
+   project exists whether a reference is created or not. References need not infer referential
integrity.
 
 *) some of the above needs to be reviewed before going into production. For example:
    - the maven specific aspects of dependencies should become a faceted part of the content

svn commit: r886048 - /archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt

2009-12-02T04:45:50Z

Author: brett
Date: Wed Dec  2 04:45:50 2009
New Revision: 886048

URL: http://svn.apache.org/viewvc?rev=886048&view=rev
Log:
[MRM-1025] update the content model with information from the former project model database.
Not all of this is stored in the current implementation as it wasn't previously used.

Modified:
    archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt

Modified: archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt?rev=886048&r1=886047&r2=886048&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt (original)
+++ archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt Wed Dec  2 04:45:50
2009
@@ -11,48 +11,141 @@
         |   `-- org/
         |       `-- apache/
         |           `-- archiva/
-        |               `-- platform/ -- these are known as the namespace, of arbitrary depth.
Equiv to groupId in Maven
-        |                   `-- scanner/ -- this is the project - equivalent to artifactId
in Maven
-        |                       |-- 1.0-SNAPSHOT/ -- this is the version best used to describe
the project ("marketed version")
-        |                       |   |-- scanner-1.0-20091120.012345-1.pom/ -- filename is
a node, each is distinct except for checksums, etc.
-        |                       |   |   |-- asc=
-        |                       |   |   |-- created=
-        |                       |   |   |-- maven:buildNumber=
-        |                       |   |   |-- maven:packaging=
-        |                       |   |   |-- maven:timestamp=
-        |                       |   |   |-- md5=
-        |                       |   |   |-- sha1=
-        |                       |   |   |-- size=
-        |                       |   |   |-- updated=
-        |                       |   |   `-- version= -- the actual version of the file, 1.0-20091120.012345-1
-        |                       |   |-- created=
-        |                       |   |-- description=
-        |                       |   |-- name=
-        |                       |   |-- organization.name=
-        |                       |   |-- organization.url=
-        |                       |   `-- updated=
-        |                       |-- maven:artifactId=
-        |                       `-- maven:groupId=
+        |               `-- platform/
+        |                   |-- scanner/
+        |                   |   |-- 1.0-SNAPSHOT/
+        |                   |   |   |-- scanner-1.0-20091120.012345-1.pom/
+        |                   |   |   |   |-- asc=
+        |                   |   |   |   |-- created=
+        |                   |   |   |   |-- maven:buildNumber=
+        |                   |   |   |   |-- maven:classifier=
+        |                   |   |   |   |-- maven:timestamp=
+        |                   |   |   |   |-- maven:type=
+        |                   |   |   |   |-- md5=
+        |                   |   |   |   |-- sha1=
+        |                   |   |   |   |-- size=
+        |                   |   |   |   |-- updated=
+        |                   |   |   |   `-- version=
+        |                   |   |   |-- ciManagement.system=
+        |                   |   |   |-- ciManagement.url=
+        |                   |   |   |-- created=
+        |                   |   |   |-- dependencies.0.artifactId=
+        |                   |   |   |-- dependencies.0.classifier=
+        |                   |   |   |-- dependencies.0.groupId=
+        |                   |   |   |-- dependencies.0.optional=
+        |                   |   |   |-- dependencies.0.scope=
+        |                   |   |   |-- dependencies.0.systemPath=
+        |                   |   |   |-- dependencies.0.type=
+        |                   |   |   |-- dependencies.0.version=
+        |                   |   |   |-- description=
+        |                   |   |   |-- individuals.0.email=
+        |                   |   |   |-- individuals.0.name=
+        |                   |   |   |-- individuals.0.properties.scmId=
+        |                   |   |   |-- individuals.0.roles.0=
+        |                   |   |   |-- individuals.0.timezone=
+        |                   |   |   |-- issueManagement.system=
+        |                   |   |   |-- issueManagement.url=
+        |                   |   |   |-- licenses.0.name=
+        |                   |   |   |-- licenses.0.url=
+        |                   |   |   |-- mailingLists.0.mainArchiveUrl=
+        |                   |   |   |-- mailingLists.0.name=
+        |                   |   |   |-- mailingLists.0.otherArchives.0=
+        |                   |   |   |-- mailingLists.0.postAddress=
+        |                   |   |   |-- mailingLists.0.subscribeAddress=
+        |                   |   |   |-- mailingLists.0.unsubscribeAddress=
+        |                   |   |   |-- maven:buildExtensions.0.artifactId=
+        |                   |   |   |-- maven:buildExtensions.0.groupId=
+        |                   |   |   |-- maven:buildExtensions.0.version=
+        |                   |   |   |-- maven:packaging=
+        |                   |   |   |-- maven:parent.artifactId=
+        |                   |   |   |-- maven:parent.groupId=
+        |                   |   |   |-- maven:parent.version=
+        |                   |   |   |-- maven:plugins.0.artifactId=
+        |                   |   |   |-- maven:plugins.0.groupId=
+        |                   |   |   |-- maven:plugins.0.reporting=
+        |                   |   |   |-- maven:plugins.0.version=
+        |                   |   |   |-- maven:properties.mavenVersion=
+        |                   |   |   |-- maven:repositories.0.id=
+        |                   |   |   |-- maven:repositories.0.layout=
+        |                   |   |   |-- maven:repositories.0.name=
+        |                   |   |   |-- maven:repositories.0.plugins=
+        |                   |   |   |-- maven:repositories.0.releases=
+        |                   |   |   |-- maven:repositories.0.snapshots=
+        |                   |   |   |-- maven:repositories.0.url=
+        |                   |   |   |-- name=
+        |                   |   |   |-- organization.favicon=
+        |                   |   |   |-- organization.logo=
+        |                   |   |   |-- organization.name=
+        |                   |   |   |-- organization.url=
+        |                   |   |   |-- relocatedTo.namespace=
+        |                   |   |   |-- relocatedTo.project=
+        |                   |   |   |-- relocatedTo.projectVersion=
+        |                   |   |   |-- scm.connection=
+        |                   |   |   |-- scm.developerConnection=
+        |                   |   |   |-- scm.url=
+        |                   |   |   |-- updated=
+        |                   |   |   `-- url=
+        |                   |   `-- maven:artifactId=
+        |                   `-- maven:groupId=
         `-- metadata/
 
 (To update - run "tree --dirstfirst -F" on the unpacked content-model.zip from the sandbox)
 
 Notes: 
 
-1) Projects are just a single code project. They do not have subprojects - if such modeling
needs to be done, then we can create a products
-tree that will map what "Archiva 1.0" contains from the other repositories.
+*) In the above example, we have the following coordinates:
+   - namespace = org.apache.archiva.platform (namespaces are of arbitrary depth, and are
project namespaces, not to be
+                                              confused with JCR's item/node namespaces)
+   - project = scanner
+   - version = 1.0-SNAPSHOT
+   - artifact = scanner-1.0-20091120.012345-1.pom
+
+*) filename (scanner-1.0-20091120.012345-1.pom) is a node, and each is distinct except for
checksums, etc.
+
+*) the top level version (1.0-SNAPSHOT) is the version best used to describe the project
(the "marketed version"). It
+   must still be unique for lookup and comparing project versions to each other, but can
contain several different
+   "build" artifacts.
+
+*) Projects are just a single code project. They do not have subprojects - if such modeling
needs to be done, then we
+   can create a products tree that will map what "Archiva 1.0" contains from the other repositories.
+
+*) There is not Maven-native information here, other than that in the maven: namespace. pom
& other files are not
+   treated as special - they are each stored and it is up to the reader to interpret
+
+*) artifact data is not stored in the metadata repository (there is no data= property on
the file). The information here
+   is enough to locate the file in the original storageUrl when it is requested
+
+*) The API will still use separate namespace and project identifiers (the namespace can be
null if there isn't one).
+   This is chosen to allow splitting the namespace on '.', and also allowing '.' in the project
identifier without
+   splitting
+
+*) properties with '.' may be nested in other representations such as Java models or XML,
if appropriate
+
+*) we only keep one set of project information for a "version" - this differs from Maven's
storage of one POM per
+   snapshot. The Maven 2 module will take the latest. Those that need Maven's behaviour should
retrieve the POM
+   directly. Implementations are also free to store as much information as desired within
the artifact node in addition
+   to whatever is shared in the project version node.
+
+*) while some information is stored at the most generic level in the metadata repository
(eg maven:groupId,
+   maven:artifactId), for convenience when loaded by the implementation it may all be pushed
into the projectVersion's
+   information. The metadata repository implementation can decide how best to store and retrieve
the information.
+
+*) created/updated timestamps may be maintained by the metadata repository implementation
+
+*) references are stored outside the main model so that their creation doesn't imply a "stub"
model - we know if the
+   project exists whether a reference is created or not. References need not infer referential
integrity
+
+*) some of the above needs to be reviewed before going into production. For example:
+   - the maven specific aspects of dependencies should become a faceted part of the content
+   - more of the metadata might be faceted in general, keeping the content model basic by
default
+   - the storing of metadata as 0-indexed lists would be better in as child nodes. This might
require additional levels
+     in the current repository (.../scanner/versions/1.0-SNAPSHOT/artifacts/scanner-1.0-20091120.012345-1.pom),
or
+     for listed information to be in a separate tree
+     (/metadata/org/apache/archiva/platform/scanner/1.0-SNAPSHOT/mailingLists/users), or
to use some 'reserved names'
+     for nodes (by using a content repository's namespacing capabilities). The first has
the advantage of
+     keeping information together but a longer path name and less familiarity to Maven users.
The second arbitrarily
+     divides metadata. The third option seems preferable but needs more investigation at
this stage.
 
-2) There is not Maven-native information here, other than that in the maven: namespace. pom
& other files are not treated as special - they are
-each stored and it is up to the reader to interpret
+*) Future possibilities:
+   - audit metadata on artifacts (who uploaded, when, and how), or whether it was discovered
by scanning
 
-3) artifact data is not stored in the content repository (there is no data= property on the
file). The information here is enough to locate the
-file in the original storageUrl when it is requested
-
-4) The API will still use separate namespace and project identifiers (the namespace can be
null if there isn't one). This is chosen to allow
-splitting the namespace on '.', and also allowing '.' in the project identifier without splitting
-
-5) properties with '.' may be nested in other representations such as Java models or XML,
if appropriate
-
-6) we only keep one set of project information for a "version" - this differs from Maven's
storage of one POM per snapshot. The Maven 2 module will
-   take the latest. Those that need Maven's behaviour should retrieve the POM directly. Implementations
are also free to store as much information
-   as desired within the artifact node in addition to whatever is shared in the project version
node.
\ No newline at end of file

svn commit: r886037 [1/2] - in /archiva/branches/MRM-1025: ./ archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ archiva-modules/archiva-base/archiva-consumers/archiva-da...

2009-12-02T02:33:07Z

Author: brett
Date: Wed Dec  2 02:33:02 2009
New Revision: 886037

URL: http://svn.apache.org/viewvc?rev=886037&view=rev
Log:
[MRM-1025] remove project model as this is all now in the metadata repository

Removed:
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/AbstractDatabaseCleanupTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumerTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/test/resources/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumerTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractProjectKey.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/DependencyScope.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/functors/UnprocessedArtifactPredicate.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/jpox/ArchivaProjectModelKey.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/jpox/ProjectReferenceKey.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/maven/archiva/model/ArchivaModelClonerTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/maven/archiva/model/DependencyScopeTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelException.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelFilter.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMerge.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelMonitor.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelReader.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelResolver.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelResolverFactory.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/ProjectModelWriter.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionFilter.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300Reader.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400Reader.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/FalseProjectResolver.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/FilesystemBasedResolver.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/ManagedRepositoryProjectResolver.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/NopProjectResolver.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/ProjectModelResolutionListener.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/resolvers/ProjectModelResolverStack.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/writers/ProjectModel400Writer.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/main/resources/META-INF/plexus/components-fragment.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/ProjectModelMergeTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilterTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionExpanderTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300ReaderTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400ReaderTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/resolvers/ManagedRepositoryProjectResolverTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/writers/ProjectModel400WriterTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilterTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/ProjectModelDAO.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/BrowsingResults.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/GroupIdFilter.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/constraints/ProjectsByArtifactUsageConstraint.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoProjectModelDAO.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/project/DatabaseProjectModelResolver.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/project/ProjectModelToDatabaseListener.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/updater/DatabaseConsumers.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/updater/DatabaseUnprocessedArtifactConsumer.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/updater/DatabaseUpdater.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/updater/JdoDatabaseUpdater.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/updater/ProcessArchivaArtifactClosure.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/resources/META-INF/spring-context.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/constraints/ProjectsByArtifactUsageConstraintTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoProjectModelDAOTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/DatabaseConsumersTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/DatabaseUpdaterTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/TestDatabaseUnprocessedConsumer.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/resources/org/apache/maven/archiva/database/updater/DatabaseConsumersTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/resources/org/apache/maven/archiva/database/updater/DatabaseUpdaterTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutor.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseArchivaTaskScheduler.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseTask.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/java/org/apache/archiva/scheduler/database/DatabaseTaskJob.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/main/resources/META-INF/plexus/components.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutorTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/java/org/apache/archiva/scheduler/database/TestDatabaseUnprocessedConsumer.java
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/repositories/default-repository/javax/maven-metadata.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/repositories/default-repository/javax/sql/jdbc/2.0/maven-metadata-repository.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/repositories/default-repository/javax/sql/jdbc/maven-metadata-repository.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/repositories/default-repository/javax/sql/maven-metadata-repository.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/repositories/default-repository/org/apache/maven/A/1.0/A-1.0.pom
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/repositories/default-repository/org/apache/maven/B/1.0/B-1.0.pom
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/repositories/default-repository/org/apache/maven/B/2.0/B-2.0.pom
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/repositories/default-repository/org/apache/maven/C/1.0/C-1.0.pom
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/repositories/default-repository/org/apache/maven/maven-metadata.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/discovery-1.0.pom
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/repositories/default-repository/org/apache/testgroup/discovery/1.0/maven-metadata.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/repositories/default-repository/org/apache/testgroup/discovery/maven-metadata.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/archiva-test.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/archiva-scheduler-database/src/test/resources/org/apache/archiva/scheduler/database/ArchivaDatabaseUpdateTaskExecutorTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/AddAdminDatabaseConsumerClosure.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/AdminDatabaseConsumer.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/AdminDatabaseConsumerComparator.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ResolverFactoryInit.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/maven/archiva/web/action/admin/database/DatabaseAction-validation.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/database/DatabaseActionTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ProjectModelDAOStub.java
Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractArtifactKey.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractVersionedKey.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/Keys.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/maven/archiva/proxy/stubs/ArchivaDAOStub.java
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/ArchivaDAO.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/RepositoryDatabaseEventListener.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoArchivaDAO.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoArchivaDAOTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/resources/META-INF/plexus/components.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-scheduler/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaStartup.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoryArchivaDAOStub.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/DeleteArtifactActionTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
    archiva/branches/MRM-1025/pom.xml

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractArtifactKey.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractArtifactKey.java?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractArtifactKey.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractArtifactKey.java Wed Dec  2 02:33:02 2009
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import org.apache.commons.lang.StringUtils;
-
 import java.io.Serializable;
 
+import org.apache.commons.lang.StringUtils;
+
 /**
  * 
  * AbstractArtifactKey - a artifact reference to a versioned project.
@@ -44,14 +44,6 @@
  *     Type
  *   
  *   
- *     {@link AbstractProjectKey}
- *     Yes
- *     Yes
- *      
- *      
- *      
- *   
- *   
  *     {@link AbstractVersionedKey}
  *     Yes
  *     Yes

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractVersionedKey.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractVersionedKey.java?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractVersionedKey.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/AbstractVersionedKey.java Wed Dec  2 02:33:02 2009
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import org.apache.commons.lang.StringUtils;
-
 import java.io.Serializable;
 
+import org.apache.commons.lang.StringUtils;
+
 /**
  * 

  * AbstractVersionedKey - a versioned reference to a Project.
@@ -44,14 +44,6 @@
  *     Type
  *   
  *   
- *     {@link AbstractProjectKey}
- *     Yes
- *     Yes
- *      
- *      
- *      
- *   
- *   
  *     {@link AbstractVersionedKey}
  *     Yes
  *     Yes

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java Wed Dec  2 02:33:02 2009
@@ -21,7 +21,6 @@
 
 import java.util.ArrayList;
 import java.util.Enumeration;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
@@ -32,43 +31,6 @@
  */
 public class ArchivaModelCloner
 {
-    public static ArchivaProjectModel clone( ArchivaProjectModel model )
-    {
-        if ( model == null )
-        {
-            return null;
-        }
-
-        ArchivaProjectModel cloned = new ArchivaProjectModel();
-
-        cloned.setGroupId( model.getGroupId() );
-        cloned.setArtifactId( model.getArtifactId() );
-        cloned.setVersion( model.getVersion() );
-
-        cloned.setParentProject( clone( model.getParentProject() ) );
-
-        cloned.setName( model.getName() );
-        cloned.setDescription( model.getDescription() );
-        cloned.setUrl( model.getUrl() );
-        cloned.setPackaging( model.getPackaging() );
-        cloned.setOrigin( model.getOrigin() );
-
-        cloned.setMailingLists( cloneMailingLists( model.getMailingLists() ) );
-        cloned.setCiManagement( clone( model.getCiManagement() ) );
-        cloned.setIndividuals( cloneIndividuals( model.getIndividuals() ) );
-        cloned.setIssueManagement( clone( model.getIssueManagement() ) );
-        cloned.setLicenses( cloneLicenses( model.getLicenses() ) );
-        cloned.setOrganization( clone( model.getOrganization() ) );
-        cloned.setScm( clone( model.getScm() ) );
-        cloned.setRepositories( cloneRepositories( model.getRepositories() ) );
-        cloned.setDependencies( cloneDependencies( model.getDependencies() ) );
-        cloned.setPlugins( clonePlugins( model.getPlugins() ) );
-        cloned.setReports( cloneReports( model.getReports() ) );
-        cloned.setDependencyManagement( cloneDependencies( model.getDependencyManagement() ) );
-        cloned.setProperties( clone(model.getProperties() ) );
-
-        return cloned;
-    }
 
     public static ArtifactReference clone( ArtifactReference artifactReference )
     {
@@ -88,101 +50,6 @@
         return cloned;
     }
 
-    public static CiManagement clone( CiManagement ciManagement )
-    {
-        if ( ciManagement == null )
-        {
-            return null;
-        }
-
-        CiManagement cloned = new CiManagement();
-
-        cloned.setSystem( ciManagement.getSystem() );
-        cloned.setUrl( ciManagement.getUrl() );
-        cloned.setCiUrl( ciManagement.getCiUrl() );
-
-        return cloned;
-    }
-
-    public static Dependency clone( Dependency dependency )
-    {
-        if ( dependency == null )
-        {
-            return null;
-        }
-
-        Dependency cloned = new Dependency();
-
-        // Identification
-        cloned.setGroupId( dependency.getGroupId() );
-        cloned.setArtifactId( dependency.getArtifactId() );
-        cloned.setVersion( dependency.getVersion() );
-        cloned.setClassifier( dependency.getClassifier() );
-        cloned.setType( dependency.getType() );
-
-        // The rest.
-        cloned.setTransitive( dependency.isTransitive() );
-        cloned.setScope( dependency.getScope() );
-        cloned.setOptional( dependency.isOptional() );
-        cloned.setSystemPath( dependency.getSystemPath() );
-        cloned.setUrl( dependency.getUrl() );
-        cloned.setExclusions( cloneExclusions( dependency.getExclusions() ) );
-
-        return cloned;
-    }
-
-    public static IssueManagement clone( IssueManagement issueManagement )
-    {
-        if ( issueManagement == null )
-        {
-            return null;
-        }
-
-        IssueManagement cloned = new IssueManagement();
-
-        cloned.setIssueManagementUrl( issueManagement.getIssueManagementUrl() );
-        cloned.setSystem( issueManagement.getSystem() );
-        cloned.setUrl( issueManagement.getUrl() );
-
-        return cloned;
-    }
-
-    public static MailingList clone( MailingList mailingList )
-    {
-        if ( mailingList == null )
-        {
-            return null;
-        }
-
-        MailingList cloned = new MailingList();
-
-        cloned.setName( mailingList.getName() );
-        cloned.setSubscribeAddress( mailingList.getSubscribeAddress() );
-        cloned.setUnsubscribeAddress( mailingList.getUnsubscribeAddress() );
-        cloned.setPostAddress( mailingList.getPostAddress() );
-        cloned.setMainArchiveUrl( mailingList.getMainArchiveUrl() );
-        cloned.setOtherArchives( cloneSimpleStringList( mailingList.getOtherArchives() ) );
-
-        return cloned;
-    }
-
-    public static Organization clone( Organization organization )
-    {
-        if ( organization == null )
-        {
-            return null;
-        }
-
-        Organization cloned = new Organization();
-
-        cloned.setFavicon( organization.getFavicon() );
-        cloned.setName( organization.getName() );
-        cloned.setUrl( organization.getUrl() );
-        cloned.setOrganizationName( organization.getOrganizationName() );
-
-        return cloned;
-    }
-
     @SuppressWarnings("unchecked")
     public static Properties clone( Properties properties )
     {
@@ -204,22 +71,6 @@
         return cloned;
     }
 
-    public static Scm clone( Scm scm )
-    {
-        if ( scm == null )
-        {
-            return null;
-        }
-
-        Scm cloned = new Scm();
-
-        cloned.setConnection( scm.getConnection() );
-        cloned.setDeveloperConnection( scm.getDeveloperConnection() );
-        cloned.setUrl( scm.getUrl() );
-
-        return cloned;
-    }
-
     public static SnapshotVersion clone( SnapshotVersion snapshotVersion )
     {
         if ( snapshotVersion == null )
@@ -268,174 +119,6 @@
         return ret;
     }
 
-    public static List cloneDependencies( List dependencies )
-    {
-        if ( dependencies == null )
-        {
-            return null;
-        }
-
-        List ret = new ArrayList();
-
-        for ( Dependency dep : dependencies )
-        {
-            if ( dep == null )
-            {
-                // Skip null dependency.
-                continue;
-            }
-
-            ret.add( clone( dep ) );
-        }
-
-        return ret;
-    }
-
-    public static List cloneExclusions( List exclusions )
-    {
-        if ( exclusions == null )
-        {
-            return null;
-        }
-
-        List ret = new ArrayList();
-
-        for ( Exclusion exclusion : exclusions )
-        {
-            Exclusion cloned = new Exclusion();
-
-            cloned.setGroupId( exclusion.getGroupId() );
-            cloned.setArtifactId( exclusion.getArtifactId() );
-
-            ret.add( cloned );
-        }
-
-        return ret;
-    }
-
-    public static List cloneIndividuals( List individuals )
-    {
-        if ( individuals == null )
-        {
-            return individuals;
-        }
-
-        List ret = new ArrayList();
-
-        Iterator it = individuals.iterator();
-        while ( it.hasNext() )
-        {
-            Individual individual = it.next();
-            Individual cloned = new Individual();
-
-            cloned.setPrincipal( individual.getPrincipal() );
-
-            cloned.setEmail( individual.getEmail() );
-            cloned.setName( individual.getName() );
-            cloned.setOrganization( individual.getOrganization() );
-            cloned.setOrganizationUrl( individual.getOrganizationUrl() );
-            cloned.setUrl( individual.getUrl() );
-            cloned.setTimezone( individual.getTimezone() );
-            cloned.setIndividualEmail( individual.getIndividualEmail() );
-
-            cloned.setRoles( cloneRoles( individual.getRoles() ) );
-            cloned.setProperties( clone( individual.getProperties() ) );
-
-            ret.add( cloned );
-        }
-
-        return ret;
-    }
-
-    public static List cloneLicenses( List licenses )
-    {
-        if ( licenses == null )
-        {
-            return null;
-        }
-
-        List ret = new ArrayList();
-
-        for ( License license : licenses )
-        {
-            License cloned = new License();
-
-            cloned.setId( license.getId() );
-            cloned.setName( license.getName() );
-            cloned.setUrl( license.getUrl() );
-            cloned.setComments( license.getComments() );
-
-            ret.add( cloned );
-        }
-
-        return ret;
-    }
-
-    public static List cloneMailingLists( List mailingLists )
-    {
-        if ( mailingLists == null )
-        {
-            return null;
-        }
-
-        List ret = new ArrayList();
-
-        for ( MailingList mailingList : mailingLists )
-        {
-            if ( mailingList == null )
-            {
-                // Skip null mailing list.
-                continue;
-            }
-
-            ret.add( clone( mailingList ) );
-        }
-
-        return ret;
-    }
-
-    public static List clonePlugins( List plugins )
-    {
-        return cloneArtifactReferences( plugins );
-    }
-
-    public static List cloneReports( List reports )
-    {
-        return cloneArtifactReferences( reports );
-    }
-
-    public static List cloneRepositories( List repositories )
-    {
-        if ( repositories == null )
-        {
-            return null;
-        }
-
-        List ret = new ArrayList();
-
-        for ( ProjectRepository repository : repositories )
-        {
-            ProjectRepository cloned = new ProjectRepository();
-
-            cloned.setId( repository.getId() );
-            cloned.setName( repository.getName() );
-            cloned.setUrl( repository.getUrl() );
-            cloned.setLayout( repository.getLayout() );
-            cloned.setPlugins( repository.isPlugins() );
-            cloned.setReleases( repository.isReleases() );
-            cloned.setSnapshots( repository.isSnapshots() );
-
-            ret.add( cloned );
-        }
-
-        return ret;
-    }
-
-    public static List cloneRoles( List roles )
-    {
-        return cloneSimpleStringList( roles );
-    }
-
     private static List cloneSimpleStringList( List simple )
     {
         if ( simple == null )

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/Keys.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/Keys.java?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/Keys.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/Keys.java Wed Dec  2 02:33:02 2009
@@ -28,11 +28,6 @@
  */
 public class Keys
 {
-    public static String toKey( ArchivaProjectModel model )
-    {
-        return toKey( model.getGroupId(), model.getArtifactId(), model.getVersion() );
-    }
-    
     public static String toKey( String groupId, String artifactId, String version, String classifier, String type )
     {
         StringBuffer key = new StringBuffer();

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml Wed Dec  2 02:33:02 2009
@@ -25,16 +25,6 @@
         This object is not serialized to the Database.
       
       
-        
         
           artifacts
           1.0.0+
@@ -52,14 +42,6 @@
           
         
         
-          projects
-          1.0.0+
-          
-            ArchivaProjectModel
-            *
-          
-        
-        
           repositoryProblems
           1.0.0+
           
@@ -87,127 +69,6 @@
     
 
     
-    
-
-    
-
-    
-      ArchivaProjectModel
-      1.0.0+
-      
-        
-          groupId
-          true
-          1.0.0+
-          String
-          true
-          
-            The Group ID of the repository content.
-          
-        
-        
-          artifactId
-          true
-          1.0.0+
-          String
-          true
-          
-            The Artifact ID of the repository content.
-          
-        
-        
-          version
-          true
-          1.0.0+
-          String
-          true
-          
-            The version of the repository content.
-          
-        
-        
-          parentProject
-          false
-          1.0.0+
-          false
-          
-            VersionedReference
-            1
-          
-          
-            The content key for a parent reference.
-          
-        
-        
-          packaging
-          false
-          1.0.0+
-          true
-          String
-          
-            The declared packaging for this project model.
-          
-        
-        
-          name
-          false
-          1.0.0+
-          false
-          String
-          
-            The name of this project.
-          
-        
-        
-          description
-          false
-          1.0.0+
-          false
-          String
-          
-            The description of this project.
-          
-        
-        
-          origin
-          false
-          1.0.0+
-          true
-          String
-          
-            The Origin of this Model. (Filesystem, Proxy, or Deploy)
-          
-        
-        
-          whenIndexed
-          false
-          1.0.0+
-          false
-          Date
-          
-            The timestamp when this model was indexed.
-          
-        
-        
-          url
-          false
-          1.0.0+
-          false
-          String
-          
-            The URL for the project's homepage.
-          
-        
-        
-          organization
-          false
-          1.0.0+
-          false
-          
-            Organization
-          
-        
-        
-          licenses
-          false
-          1.0.0+
-          false
-          
-            License
-            *
-          
-        
-        
-          mailingLists
-          1.0.0+
-          The mailing lists.
-          false
-          
-            MailingList
-            *
-          
-        
-        
-          issueManagement
-          1.0.0+
-          
-          
-            IssueManagement
-          
-        
-        
-          ciManagement
-          1.0.0+
-          
-          
-            CiManagement
-          
-        
-        
-          scm
-          1.0.0+
-          
-            
-          
-            Scm
-          
-        
-        
-          individuals
-          1.0.0+
-          
-            The list of individuals around this project.
-          
-          
-            Individual
-            *
-          
-        
-        
-          dependencies
-          1.0.0+
-          
-          
-            Dependency
-            *
-          
-        
-        
-          dependencyManagement
-          1.0.0+
-          
-            The list of dependency management settings.
-          
-          
-            Dependency
-            *
-          
-        
-        
-          repositories
-          1.0.0+
-          
-            The list project repositories in use by this project.
-          
-          
-            ProjectRepository
-            *
-          
-        
-        
-          plugins
-          1.0.0+
-          
-            The list of plugins that this project uses.
-          
-          
-            ArtifactReference
-            *
-          
-        
-        
-          reports
-          1.0.0+
-          
-            The list of reports that this project uses.
-          
-          
-            ArtifactReference
-            *
-          
-        
-        
-          buildExtensions
-          1.0.0+
-          
-            The list of build extensions that this project uses.
-          
-          
-            ArtifactReference
-            *
-          
-        
-        
-          properties
-          1.0.0+
-          
-          Properties
-          
-            String
-            *
-          
-        
-        
-          relocation
-          1.0.0+
-          If relocated, this is the new location reference
-          
-            VersionedReference
-            1
-          
-        
-      
-      
-        
-          1.0.0+
-          
-        
-        
-          1.0.0+
-          
-        
-      
-    
-
-    
-      MailingList
-      A Mailing List
-      1.0.0+
-      
-        
-          name
-          1.0.0+
-          The name of the mailing list.
-          String
-        
-        
-          subscribeAddress
-          1.0.0+
-          The email address to subscribe to this mailing list.
-          String
-        
-        
-          unsubscribeAddress
-          1.0.0+
-          The email address to unsubscribe to this mailing list.
-          String
-        
-        
-          postAddress
-          1.0.0+
-          The email address to post to this mailing list.
-          String
-        
-        
-          mainArchiveUrl
-          1.0.0+
-          The url to the archive for this mailing list.
-          String
-        
-        
-          otherArchives
-          1.0.0+
-          The email address to subscribe to this mailing list.
-          
-            String
-            *
-          
-        
-      
-      
-        
-          1.0.0+
-          
-        
-      
-    
-
-    
-      Organization
-      Specifies the organization that produces this project.
-      1.0.0+
-      
-        
-          name
-          true
-          1.0.0+
-          
-          String
-        
-        
-          organizationName
-          1.2.1+
-          
-          String          
-        
-        
-          url
-          1.0.0+
-          
-          String
-        
-        
-          favicon
-          1.0.0+
-          /images/org-logo.png) or an absolute URL
-            (e.g., http://my.corp/logo.png).  This value is used
-            when generating the project documentation.
-          ]]>
-          String
-        
-      
-      
-        
-          1.0.0+
-          
-        
-      
-    
-
-    
-      License
-      
-      1.0.0+
-      
-        
-          id
-          true
-          1.0.0+
-          int
-          
-            The type of license.
-          
-        
-        
-          name
-          1.0.0+
-          
-          String
-        
-        
-          url
-          1.0.0+
-          
-          String
-        
-        
-          comments
-          
-            Addendum information pertaining to this license.
-          
-          1.0.0+
-          String
-        
-      
-      
-        
-          1.0.0+
-          
-        
-      
-    
-
-    
-      IssueManagement
-      
-        Information about the issue tracking (or bug tracking) system used to manage this project.
-      
-      1.0.0+
-      
-        
-          url
-          true
-          1.0.0+
-          
-          String
-        
-        
-          issueManagementUrl
-          1.2.1+
-          
-          String
-        
-        
-          system
-          1.0.0+
-          
-          String
-        
-      
-      
-        
-          1.0.0+
-          
-        
-      
-    
-
-    
-      CiManagement
-      1.0.0+
-      
-        
-          url
-          1.0.0+
-          true
-          
-            
-          String
-        
-        
-          ciUrl
-          1.2.1+
-          
-            
-          String
-        
-        
-          system
-          1.0.0+
-          
-            continuum.]]>
-          String
-        
-      
-      
-        
-          1.0.0+
-          
-        
-      
-    
-
-    
-      Individual
-      
-        Description of a person who has contributed to the project.
-        This includes contributors and commitors.
-      
-      1.0.0+
-      
-        
-          email
-          true
-          1.0.0+
-          
-          String
-        
-        
-          individualEmail
-          1.2.1+
-          
-          String
-        
-        
-          name
-          1.0.0+
-          
-          String
-        
-        
-          principal
-          1.0.0+
-          
-            The RedBack (plexus security) principal associated with this Invididual.
-          
-          String
-        
-        
-          commitor
-          1.0.0+
-          
-            The flag if this user is a developer and/or commitor.
-          
-          boolean
-        
-        
-          url
-          1.0.0+
-          
-          String
-        
-        
-        
-          organization
-          organisation
-          1.0.0+
-          
-          String
-        
-        
-          organizationUrl
-          organisationUrl
-          1.0.0+
-          
-          String
-        
-        
-          roles
-          1.0.0+
-          role element, the body of which is a
-            role name. This can also be used to describe the contribution.
-          ]]>
-          
-            String
-            *
-          
-        
-        
-          timezone
-          1.0.0+
-          
-          String
-        
-        
-          properties
-          1.0.0+
-          
-          Properties
-          
-            String
-            *
-          
-        
-      
-      
-        
-          1.0.0+
-          
-        
-      
-    
-
-    
-      Dependency
-      1.0.0+
-      
-        
-          groupId
-          1.0.0+
-          String
-          true
-          
-            The Group ID of the repository content.
-          
-        
-        
-          artifactId
-          1.0.0+
-          String
-          true
-          
-            The Artifact ID of the repository content.
-          
-        
-        
-          version
-          1.0.0+
-          String
-          false
-          
-            The version of the repository content.
-          
-        
-        
-          classifier
-          1.0.0+
-          String
-          false
-          
-          jdk14 and jdk15.
-          ]]>
-        
-        
-          type
-          1.0.0+
-          String
-          true
-          jar. While it usually represents the extension on
-            the filename of the dependency, that is not always the case. A type can be mapped to a different
-            extension and a classifier.
-            The type often correspongs to the packaging used, though this is also not always the case.
-            Some examples are jar, war, ejb-client and test-jar.
-            New types can be defined by plugins that set
-            extensions to true, so this is not a complete list.
-          ]]>
-          jar
-        
-        
-          transitive
-          1.0.0+
-          false
-          True if the dependency is only here due a transitive resolution
-          boolean
-          
-        
-        
-          fromParent
-          1.0.0+
-          false
-          True if the dependency is only here due a parent pom
-          boolean
-          
-        
-        
-          url
-          1.0.0+
-          
-          String
-        
-        
-          scope
-          1.0.0+
-          compile, runtime, test,
-            system, and provided. Used to
-            calculate the various classpaths used for compilation, testing, and so on. It also assists in determining
-            which artifacts to include in a distribution of this project. For more information, see
-            the
-            dependency mechanism.
-            ]]>
-          
-          String
-        
-        
-          systemPath
-          1.0.0+
-          discouraged and may be replaced in later
-            versions. This specifies the path on the filesystem for this dependency.
-            Requires an absolute path for the value, not relative.
-            Use a property that gives the machine specific absolute path,
-            e.g. ${java.home}.
-          ]]>
-          String
-        
-        
-          exclusions
-          1.0.0+
-          
-            Lists a set of artifacts that should be excluded from this dependency's artifact list when it comes to
-            calculating transitive dependencies.
-          
-          
-            Exclusion
-            *
-          
-        
-        
-          optional
-          1.0.0+
-          
-            Indicates the dependency is optional for use of this library. While the version of the dependency will be
-            taken into account for dependency calculation if the library is used elsewhere, it will not be passed on
-            transitively.
-          
-          boolean
-          false
-        
-      
-      
-        
-          1.0.0+
-          
-        
-        
-          1.0.0+
-          
-        
-      
-    
-
-    
-      Exclusion
-      1.0.0+
-      
-        
-          groupId
-          1.0.0+
-          
-          String
-          true
-        
-        
-          artifactId
-          1.0.0+
-          
-          String
-          true
-        
-      
-      
-        
-          1.0.0+
-          
-        
-      
-    
-
-    
-      Scm
-      1.0.0+
-      
-        
-          connection
-          1.0.0+
-          URL format
-              and list of supported SCMs.
-              This connection is read-only.
-          ]]>
-          String
-        
-        
-          developerConnection
-          1.0.0+
-          connection, but for developers, i.e. this scm connection
-            will not be read only.
-          ]]>
-          String
-        
-        
-          url
-          1.0.0+
-          
-            
-          String
-        
-      
-      
-        
-          1.0.0+
-          
-        
-      
-    
-
-    
-      ProjectRepository
-      1.0.0+
-      
-        
-          id
-          1.0.0+
-          settings.xml file, for example.
-          ]]>
-          String
-        
-        
-          name
-          1.0.0+
-          
-          String
-        
-        
-          url
-          1.0.0+
-          protocol://hostname/path.
-          ]]>
-          String
-        
-        
-          layout
-          1.0.0+
-          legacy or
-            default.
-          ]]>
-          String
-          default
-        
-        
-          plugins
-          1.0.0+
-          
-            Flag indicating if this repository is for plugin resolution.
-          
-          boolean
-        
-        
-          releases
-          1.0.0+
-          
-            Flag indicating if this repository has release versioned artifacts.
-          
-          boolean
-        
-        
-          snapshots
-          1.0.0+
-          
-            Flag indicating if this repository has snapshot versioned artifacts.
-          
-          boolean
-        
-      
-      
-        
-          1.0.0+
-          
-        
-      
-    
-
-    
-
-    
-      /WEB-INF/jsp/admin/database.jsp
-      
-        database
-      
-    
-
-    
-      database
-    
-
     
 
     

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml Wed Dec  2 02:33:02 2009
@@ -51,10 +51,8 @@
   
     
     
-    
     
     
-    
     
     
       

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp Wed Dec  2 02:33:02 2009
@@ -24,8 +24,8 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
 <%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
-<%@ page import="org.apache.maven.archiva.web.startup.ArchivaVersion" %>
 <%@ page import="java.util.Calendar" %>
+<%@ page import="org.apache.maven.archiva.web.startup.ArchivaVersion" %>
 
 
 
@@ -141,9 +141,6 @@
         

           Repository Scanning
         
-        
-          Database
-        
           <%-- TODO: future options here.
                * Repository Syncing Connectors. (rsync, ftp, scp, etc...)
                * Web Services (enable / disable), role based?

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoryArchivaDAOStub.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoryArchivaDAOStub.java?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoryArchivaDAOStub.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoryArchivaDAOStub.java Wed Dec  2 02:33:02 2009
@@ -24,7 +24,6 @@
 
 import org.apache.maven.archiva.database.ArchivaDAO;
 import org.apache.maven.archiva.database.ArtifactDAO;
-import org.apache.maven.archiva.database.ProjectModelDAO;
 import org.apache.maven.archiva.database.RepositoryContentStatisticsDAO;
 import org.apache.maven.archiva.database.RepositoryProblemDAO;
 import org.apache.maven.archiva.database.SimpleConstraint;
@@ -41,11 +40,6 @@
     /**
      * @plexus.requirement role-hint="jdo"
      */
-    private ProjectModelDAO projectModelDAO;
-
-    /**
-     * @plexus.requirement role-hint="jdo"
-     */
     private ArtifactDAO artifactDAO;
 
     /**
@@ -68,11 +62,6 @@
         return artifactDAO;
     }
 
-    public ProjectModelDAO getProjectModelDAO()
-    {
-        return projectModelDAO;
-    }
-
     public RepositoryProblemDAO getRepositoryProblemDAO()
     {
         throw new UnsupportedOperationException( "query not implemented for stub" );

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ArchivaDAOStub.java Wed Dec  2 02:33:02 2009
@@ -8,7 +8,6 @@
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.database.ArchivaDAO;
 import org.apache.maven.archiva.database.ArtifactDAO;
-import org.apache.maven.archiva.database.ProjectModelDAO;
 import org.apache.maven.archiva.database.RepositoryContentStatisticsDAO;
 import org.apache.maven.archiva.database.RepositoryProblemDAO;
 import org.apache.maven.archiva.database.SimpleConstraint;
@@ -48,8 +47,6 @@
 
     private ArtifactDAO artifactDao;
 
-    private ProjectModelDAO projectDao;
-
     private List versions;
 
     private List groups;
@@ -95,11 +92,6 @@
         return artifactDao;
     }
 
-    public ProjectModelDAO getProjectModelDAO()
-    {
-        return projectDao;
-    }
-
     public RepositoryProblemDAO getRepositoryProblemDAO()
     {
         throw new UnsupportedOperationException( "method not implemented for stub" );
@@ -115,11 +107,6 @@
         this.artifactDao = artifactDao;
     }
 
-    public void setProjectDao( ProjectModelDAO projectDao )
-    {
-        this.projectDao = projectDao;
-    }
-
     public void setVersions( List versions )
     {
         this.versions = versions;

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java Wed Dec  2 02:33:02 2009
@@ -19,6 +19,11 @@
  * under the License.
  */
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import com.opensymphony.xwork2.Action;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.Configuration;
@@ -27,21 +32,15 @@
 import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
 import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
 import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration;
-import org.apache.maven.archiva.model.ArchivaProjectModel;
 import org.apache.maven.archiva.security.ArchivaRoleConstants;
 import org.codehaus.plexus.redback.role.RoleManager;
 import org.codehaus.plexus.redback.role.RoleManagerException;
-import org.codehaus.redback.integration.interceptor.SecureActionBundle;
-import org.codehaus.redback.integration.interceptor.SecureActionException;
 import org.codehaus.plexus.registry.RegistryException;
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
+import org.codehaus.redback.integration.interceptor.SecureActionBundle;
+import org.codehaus.redback.integration.interceptor.SecureActionException;
 import org.easymock.MockControl;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 /**
  * DeleteManagedRepositoryActionTest 
  *
@@ -319,14 +318,4 @@
         roleManager.removeTemplatedRole( ArchivaRoleConstants.TEMPLATE_REPOSITORY_MANAGER, REPO_ID );
         roleManagerControl.replay();
     }
-    
-    protected ArchivaProjectModel createProjectModel( String groupId, String artifactId, String version )
-    {
-        ArchivaProjectModel projectModel = new ArchivaProjectModel();
-        projectModel.setGroupId( groupId );
-        projectModel.setArtifactId( artifactId );
-        projectModel.setVersion( version );
-
-        return projectModel;
-    }   
 }

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/DeleteArtifactActionTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/DeleteArtifactActionTest.xml?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/DeleteArtifactActionTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/DeleteArtifactActionTest.xml Wed Dec  2 02:33:02 2009
@@ -36,11 +36,6 @@
       org.apache.maven.archiva.web.action.admin.repositories.RepositoryProblemDAOStub
     
     
-      org.apache.maven.archiva.database.ProjectModelDAO
-      jdo
-      org.apache.maven.archiva.web.action.admin.repositories.ProjectModelDAOStub
-    
-    
       org.apache.maven.archiva.database.ArtifactDAO
       jdo
       org.apache.maven.archiva.web.action.admin.repositories.ArtifactDAOStub

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesActionTest.xml Wed Dec  2 02:33:02 2009
@@ -61,11 +61,6 @@
           artifactDAO
         
         
-          org.apache.maven.archiva.database.ProjectModelDAO
-          jdo
-          projectModelDAO
-        
-        
           org.apache.maven.archiva.database.RepositoryContentStatisticsDAO
           jdo
           repoContentStatisticsDAO
@@ -78,11 +73,6 @@
       org.apache.maven.archiva.web.action.admin.repositories.ArtifactDAOStub
             
     
-      org.apache.maven.archiva.database.ProjectModelDAO
-      jdo
-      org.apache.maven.archiva.web.action.admin.repositories.ProjectModelDAOStub
-       
-    
       org.apache.maven.archiva.database.RepositoryContentStatisticsDAO
       jdo
       org.apache.maven.archiva.web.action.admin.repositories.RepositoryContentStatisticsDAOStub

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.xml Wed Dec  2 02:33:02 2009
@@ -48,11 +48,6 @@
       		artifactDAO
       	
       	
-      		org.apache.maven.archiva.database.ProjectModelDAO
-      		jdo
-      		projectModelDAO
-      	
-      	
       		org.apache.maven.archiva.database.RepositoryContentStatisticsDAO
       		jdo
       		repoContentStatisticsDAO
@@ -65,11 +60,6 @@
       org.apache.maven.archiva.web.action.admin.repositories.ArtifactDAOStub
             
     
-      org.apache.maven.archiva.database.ProjectModelDAO
-      jdo
-      org.apache.maven.archiva.web.action.admin.repositories.ProjectModelDAOStub
-       
-    
       org.apache.maven.archiva.database.RepositoryContentStatisticsDAO
       jdo
       org.apache.maven.archiva.web.action.admin.repositories.RepositoryContentStatisticsDAOStub

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/AdministrationService.java Wed Dec  2 02:33:02 2009
@@ -21,11 +21,10 @@
 
 import java.util.List;
 
+import com.atlassian.xmlrpc.ServiceObject;
 import org.apache.archiva.web.xmlrpc.api.beans.ManagedRepository;
 import org.apache.archiva.web.xmlrpc.api.beans.RemoteRepository;
 
-import com.atlassian.xmlrpc.ServiceObject;
-
 @ServiceObject( "AdministrationService" )
 public interface AdministrationService
 {    
@@ -37,30 +36,6 @@
      * @throws Exception
      */
     public Boolean executeRepositoryScanner( String repoId ) throws Exception;
-   
-    /**
-     * Executes the database scanner.
-     * 
-     * @return
-     * @throws Exception
-     */
-    public Boolean executeDatabaseScanner() throws Exception;
-
-    /**
-     * Gets all available database consumers.
-     * @return
-     */
-    public List getAllDatabaseConsumers();
-   
-    /**
-     * Configures (enable or disable) database consumer.
-     * 
-     * @param consumerId id of the database consumer
-     * @param enable flag whether to enable or disable the specified consumer
-     * @return
-     * @throws Exception
-     */
-    public Boolean configureDatabaseConsumer( String consumerId, boolean enable ) throws Exception;
 
     /**
      * Gets all available repository consumers.

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-client/src/main/java/org/apache/archiva/web/xmlrpc/client/SampleClient.java Wed Dec  2 02:33:02 2009
@@ -22,15 +22,14 @@
 import java.net.URL;
 import java.util.List;
 
-import org.apache.archiva.web.xmlrpc.api.AdministrationService;
-import org.apache.archiva.web.xmlrpc.api.PingService;
-import org.apache.archiva.web.xmlrpc.api.beans.ManagedRepository;
-import org.apache.archiva.web.xmlrpc.api.beans.RemoteRepository;
-
 import com.atlassian.xmlrpc.AuthenticationInfo;
 import com.atlassian.xmlrpc.Binder;
 import com.atlassian.xmlrpc.BindingException;
 import com.atlassian.xmlrpc.DefaultBinder;
+import org.apache.archiva.web.xmlrpc.api.AdministrationService;
+import org.apache.archiva.web.xmlrpc.api.PingService;
+import org.apache.archiva.web.xmlrpc.api.beans.ManagedRepository;
+import org.apache.archiva.web.xmlrpc.api.beans.RemoteRepository;
 
 /**
  * TestClient
@@ -92,28 +91,14 @@
                 System.out.println( consumer );
             }
             
-            System.out.println( "\n******** Database Consumers ********" );
-            List dbConsumers = adminService.getAllDatabaseConsumers();
-            for( String consumer : dbConsumers )
-            {
-                System.out.println( consumer );
-            }
-            
             Boolean success = adminService.configureRepositoryConsumer( "internal", "repository-purge", true );
             System.out.println( "\nConfigured repo consumer 'repository-purge' : " +
                 ( (Boolean) success ).booleanValue() );
             
-            success = adminService.configureDatabaseConsumer( "update-db-bytecode-stats", false );
-            System.out.println( "\nConfigured db consumer 'update-db-bytecode-stats' : " +
-                ( (Boolean) success ).booleanValue() );
-            
             success = adminService.executeRepositoryScanner( "internal" );
             System.out.println( "\nExecuted repo scanner of repository 'internal' : " +
                 ( (Boolean) success ).booleanValue() );
             
-            success = adminService.executeDatabaseScanner();
-            System.out.println( "\nExecuted database scanner : " + ( (Boolean) success ).booleanValue() );
-           
             /* delete artifact */
             /* 
              * NOTE: before enabling & invoking deleteArtifact, make sure that the repository and artifact exists first!

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml Wed Dec  2 02:33:02 2009
@@ -60,10 +60,6 @@
     
     
       org.apache.archiva
-      archiva-scheduler-database
-    
-    
-      org.apache.archiva
       archiva-security
     
     

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java Wed Dec  2 02:33:02 2009
@@ -24,8 +24,6 @@
 import java.util.List;
 
 import org.apache.archiva.repository.scanner.RepositoryContentConsumers;
-import org.apache.archiva.scheduler.database.DatabaseArchivaTaskScheduler;
-import org.apache.archiva.scheduler.database.DatabaseTask;
 import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler;
 import org.apache.archiva.scheduler.repository.RepositoryTask;
 import org.apache.archiva.web.xmlrpc.api.AdministrationService;
@@ -33,7 +31,6 @@
 import org.apache.archiva.web.xmlrpc.api.beans.RemoteRepository;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.Configuration;
-import org.apache.maven.archiva.configuration.DatabaseScanningConfiguration;
 import org.apache.maven.archiva.configuration.IndeterminateConfigurationException;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
 import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
@@ -43,8 +40,6 @@
 import org.apache.maven.archiva.database.ArchivaDatabaseException;
 import org.apache.maven.archiva.database.ArtifactDAO;
 import org.apache.maven.archiva.database.constraints.ArtifactVersionsConstraint;
-import org.apache.maven.archiva.database.updater.DatabaseConsumers;
-import org.apache.maven.archiva.database.updater.DatabaseUnprocessedArtifactConsumer;
 import org.apache.maven.archiva.model.ArchivaArtifact;
 import org.apache.maven.archiva.model.VersionedReference;
 import org.apache.maven.archiva.repository.ContentNotFoundException;
@@ -71,70 +66,28 @@
 
     private RepositoryContentConsumers repoConsumersUtil;
 
-    private DatabaseConsumers dbConsumersUtil;
-
     private RepositoryContentFactory repoFactory;
 
     private ArtifactDAO artifactDAO;
 
-    private DatabaseArchivaTaskScheduler databaseTaskScheduler;
-
     private RepositoryArchivaTaskScheduler repositoryTaskScheduler;
 
     private Collection listeners;
 
     public AdministrationServiceImpl( ArchivaConfiguration archivaConfig, RepositoryContentConsumers repoConsumersUtil,
-                                      DatabaseConsumers dbConsumersUtil, RepositoryContentFactory repoFactory,
-                                      ArtifactDAO artifactDAO, DatabaseArchivaTaskScheduler databaseTaskScheduler,
+                                      RepositoryContentFactory repoFactory, ArtifactDAO artifactDAO,
                                       RepositoryArchivaTaskScheduler repositoryTaskScheduler,
                                       Collection listeners )
     {
         this.archivaConfiguration = archivaConfig;
         this.repoConsumersUtil = repoConsumersUtil;
-        this.dbConsumersUtil = dbConsumersUtil;
         this.repoFactory = repoFactory;
         this.artifactDAO = artifactDAO;
-        this.databaseTaskScheduler = databaseTaskScheduler;
         this.repositoryTaskScheduler = repositoryTaskScheduler;
         this.listeners = listeners;
     }
 
     /**
-     * @see AdministrationService#configureDatabaseConsumer(String, boolean)
-     */
-    public Boolean configureDatabaseConsumer( String consumerId, boolean enable ) throws Exception
-    {
-        List unprocessedConsumers =
-            dbConsumersUtil.getAvailableUnprocessedConsumers();
-
-        boolean found = false;
-
-        for( DatabaseUnprocessedArtifactConsumer consumer : unprocessedConsumers )
-        {
-            if( consumer.getId().equals( consumerId ) )
-            {
-                found = true;
-                break;
-            }
-        }
-
-        if( !found )
-        {
-            throw new Exception( "Invalid database consumer." );
-        }
-
-        Configuration config = archivaConfiguration.getConfiguration();
-        DatabaseScanningConfiguration dbScanningConfig = config.getDatabaseScanning();
-
-        dbScanningConfig.addUnprocessedConsumer( consumerId );
-
-        config.setDatabaseScanning( dbScanningConfig );
-        saveConfiguration( config );
-
-        return new Boolean( true );
-    }
-
-    /**
      * @see AdministrationService#configureRepositoryConsumer(String, String, boolean)
      */
     public Boolean configureRepositoryConsumer( String repoId, String consumerId, boolean enable )
@@ -260,24 +213,6 @@
     }
 
     /**
-     * @see AdministrationService#executeDatabaseScanner()
-     */
-    public Boolean executeDatabaseScanner() throws Exception
-    {
-        if ( databaseTaskScheduler.isProcessingDatabaseTask() )
-        {
-            return false;
-        }
-
-        log.info( "Queueing database task on request from administration service" );
-        DatabaseTask task = new DatabaseTask();
-
-        databaseTaskScheduler.queueTask( task );
-
-        return new Boolean( true );
-    }
-
-    /**
      * @see AdministrationService#executeRepositoryScanner(String)
      */
     public Boolean executeRepositoryScanner( String repoId ) throws Exception
@@ -302,23 +237,6 @@
     }
 
     /**
-     * @see AdministrationService#getAllDatabaseConsumers()
-     */
-    public List getAllDatabaseConsumers()
-    {
-        List consumers = new ArrayList();
-
-        List unprocessedConsumers = dbConsumersUtil.getAvailableUnprocessedConsumers();
-
-        for( DatabaseUnprocessedArtifactConsumer consumer : unprocessedConsumers )
-        {
-            consumers.add( consumer.getId() );
-        }
-
-        return consumers;
-    }
-
-    /**
      * @see AdministrationService#getAllRepositoryConsumers()
      */
     public List getAllRepositoryConsumers()

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java Wed Dec  2 02:33:02 2009
@@ -26,8 +26,6 @@
 import java.util.List;
 
 import org.apache.archiva.repository.scanner.RepositoryContentConsumers;
-import org.apache.archiva.scheduler.database.DatabaseArchivaTaskScheduler;
-import org.apache.archiva.scheduler.database.DatabaseTask;
 import org.apache.archiva.scheduler.repository.RepositoryArchivaTaskScheduler;
 import org.apache.archiva.scheduler.repository.RepositoryTask;
 import org.apache.archiva.web.xmlrpc.api.beans.ManagedRepository;
@@ -36,7 +34,6 @@
 import org.apache.commons.io.filefilter.FileFilterUtils;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.Configuration;
-import org.apache.maven.archiva.configuration.DatabaseScanningConfiguration;
 import org.apache.maven.archiva.configuration.FileTypes;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
 import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
@@ -44,8 +41,6 @@
 import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
 import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
 import org.apache.maven.archiva.database.ArtifactDAO;
-import org.apache.maven.archiva.database.updater.DatabaseConsumers;
-import org.apache.maven.archiva.database.updater.DatabaseUnprocessedArtifactConsumer;
 import org.apache.maven.archiva.model.ArchivaArtifact;
 import org.apache.maven.archiva.model.ArchivaArtifactModel;
 import org.apache.maven.archiva.model.ArtifactReference;
@@ -83,8 +78,6 @@
     
     private RepositoryArchivaTaskScheduler repositoryTaskScheduler;
     
-    private DatabaseArchivaTaskScheduler databaseTaskScheduler;
-
     // repository consumers
     private MockControl repoConsumerUtilsControl;
     
@@ -102,18 +95,7 @@
 
     private InvalidRepositoryContentConsumer checkMetadataConsumer;
     
-    // database consumers
-    private MockControl dbConsumersUtilControl;
-    
-    private DatabaseConsumers dbConsumersUtil;
-    
-    private MockControl unprocessedConsumersControl;
-    
-    private DatabaseUnprocessedArtifactConsumer processArtifactConsumer;
-    
-    private DatabaseUnprocessedArtifactConsumer processPomConsumer;
-    
-    // delete artifact    
+    // delete artifact
     private MockControl repoFactoryControl;
     
     private RepositoryContentFactory repositoryFactory;
@@ -139,9 +121,6 @@
         configControl = MockClassControl.createControl( Configuration.class );
         config = ( Configuration ) configControl.getMock();      
         
-        databaseTaskSchedulerControl = MockClassControl.createControl( DatabaseArchivaTaskScheduler.class );
-        databaseTaskScheduler = (DatabaseArchivaTaskScheduler) databaseTaskSchedulerControl.getMock();
-        
         repositoryTaskSchedulerControl = MockClassControl.createControl( RepositoryArchivaTaskScheduler.class );
         repositoryTaskScheduler = (RepositoryArchivaTaskScheduler) repositoryTaskSchedulerControl.getMock();
 
@@ -157,14 +136,6 @@
         checkPomConsumer = ( InvalidRepositoryContentConsumer ) invalidContentConsumerControl.getMock();
         checkMetadataConsumer = ( InvalidRepositoryContentConsumer ) invalidContentConsumerControl.getMock();
         
-        // db consumers
-        dbConsumersUtilControl = MockClassControl.createControl( DatabaseConsumers.class );
-        dbConsumersUtil = ( DatabaseConsumers ) dbConsumersUtilControl.getMock();
-                
-        unprocessedConsumersControl = MockControl.createControl( DatabaseUnprocessedArtifactConsumer.class );
-        processArtifactConsumer = ( DatabaseUnprocessedArtifactConsumer ) unprocessedConsumersControl.getMock();
-        processPomConsumer = ( DatabaseUnprocessedArtifactConsumer ) unprocessedConsumersControl.getMock();
-        
         // delete artifact
         repoFactoryControl = MockClassControl.createControl( RepositoryContentFactory.class );
         repositoryFactory = ( RepositoryContentFactory ) repoFactoryControl.getMock();
@@ -176,137 +147,12 @@
         listener = (RepositoryListener) listenerControl.getMock();
         
         service =
-            new AdministrationServiceImpl( archivaConfig, repoConsumersUtil, dbConsumersUtil, repositoryFactory,
-                                           artifactDao, databaseTaskScheduler, repositoryTaskScheduler,
+            new AdministrationServiceImpl( archivaConfig, repoConsumersUtil, repositoryFactory,
+                                           artifactDao, repositoryTaskScheduler,
                                            Collections.singletonList( listener ) );
     }
   
-/* Tests for database consumers  */
-    
-    public void testGetAllDbConsumers()
-        throws Exception
-    {   
-        recordDbConsumers();
-        
-        dbConsumersUtilControl.replay();
-        unprocessedConsumersControl.replay();
-        
-        List dbConsumers = service.getAllDatabaseConsumers();
-        
-        dbConsumersUtilControl.verify();
-        unprocessedConsumersControl.verify();
-        
-        assertNotNull( dbConsumers );
-        assertEquals( 2, dbConsumers.size() );
-        assertTrue( dbConsumers.contains( "process-artifact" ) );
-        assertTrue( dbConsumers.contains( "process-pom" ) );
-    }
-    
-    public void testConfigureValidDatabaseConsumer()
-        throws Exception
-    {
-        DatabaseScanningConfiguration dbScanning = new DatabaseScanningConfiguration();
-        dbScanning.addCleanupConsumer( "cleanup-index" );
-        dbScanning.addCleanupConsumer( "cleanup-database" );
-        dbScanning.addUnprocessedConsumer( "process-artifact" );
-        
-        recordDbConsumers();
-        
-        // test enable "process-pom" db consumer
-        archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config );
-        configControl.expectAndReturn( config.getDatabaseScanning(), dbScanning );
-        
-        config.setDatabaseScanning( dbScanning );
-        configControl.setMatcher( MockControl.ALWAYS_MATCHER );
-        configControl.setVoidCallable();
-        
-        archivaConfig.save( config );
-        archivaConfigControl.setVoidCallable();
-        
-        dbConsumersUtilControl.replay();
-        unprocessedConsumersControl.replay();
-        archivaConfigControl.replay();
-        configControl.replay();
-        
-        try
-        {
-            boolean success = service.configureDatabaseConsumer( "process-pom", true );
-            assertTrue( success );
-        }
-        catch ( Exception e )
-        {
-            fail( "An exception should not have been thrown." );
-        }
-        
-        dbConsumersUtilControl.verify();
-        unprocessedConsumersControl.verify();
-        archivaConfigControl.verify();
-        configControl.verify();
-                
-        // test disable "process-pom" db consumer        
-        dbConsumersUtilControl.reset();
-        unprocessedConsumersControl.reset();
-        archivaConfigControl.reset();
-        configControl.reset();
-                
-        dbScanning.addUnprocessedConsumer( "process-pom" );
-        
-        recordDbConsumers();
-        
-        archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config );
-        configControl.expectAndReturn( config.getDatabaseScanning(), dbScanning );
-        
-        config.setDatabaseScanning( dbScanning );
-        configControl.setMatcher( MockControl.ALWAYS_MATCHER );
-        configControl.setVoidCallable();
-        
-        archivaConfig.save( config );
-        archivaConfigControl.setVoidCallable();
-        
-        dbConsumersUtilControl.replay();
-        unprocessedConsumersControl.replay();
-        archivaConfigControl.replay();
-        configControl.replay();
-        
-        try
-        {
-            boolean success = service.configureDatabaseConsumer( "process-pom", false );
-            assertTrue( success );
-        }
-        catch ( Exception e )
-        {
-            fail( "An exception should not have been thrown." );
-        }
-        
-        dbConsumersUtilControl.verify();
-        unprocessedConsumersControl.verify();
-        archivaConfigControl.verify();
-        configControl.verify();
-    }
-    
-    public void testConfigureInvalidDatabaseConsumer()
-        throws Exception
-    {
-        recordDbConsumers();
-        
-        dbConsumersUtilControl.replay();
-        unprocessedConsumersControl.replay();
-        
-        try
-        {
-            service.configureDatabaseConsumer( "invalid-consumer", true );
-            fail( "An exception should have been thrown." );
-        }
-        catch ( Exception e )
-        {
-            assertEquals( "Invalid database consumer.", e.getMessage() );
-        }
-        
-        dbConsumersUtilControl.verify();
-        unprocessedConsumersControl.verify();
-    }
-        
-/* Tests for repository consumers  */
+    /* Tests for repository consumers  */
     
     public void testGetAllRepoConsumers()
         throws Exception
@@ -707,43 +553,7 @@
         configControl.verify();
     }
     
-/* Tests for db scanning  */
-    
-    public void testExecuteDbScannerDbNotBeingScanned()
-        throws Exception
-    {
-        DatabaseTask task = new DatabaseTask();
-        
-        databaseTaskSchedulerControl.expectAndReturn( databaseTaskScheduler.isProcessingDatabaseTask(), false );
-                
-        databaseTaskScheduler.queueTask( task );
-        databaseTaskSchedulerControl.setMatcher( MockControl.ALWAYS_MATCHER );
-        databaseTaskSchedulerControl.setVoidCallable();
-        
-        databaseTaskSchedulerControl.replay();
-
-        boolean success = service.executeDatabaseScanner();
-        
-        databaseTaskSchedulerControl.verify();
-        
-        assertTrue( success );
-    }
-    
-    public void testExecuteDbScannerDbIsBeingScanned()
-        throws Exception
-    {        
-        databaseTaskSchedulerControl.expectAndReturn( databaseTaskScheduler.isProcessingDatabaseTask(), true );
-                
-        databaseTaskSchedulerControl.replay();
-
-        boolean success = service.executeDatabaseScanner();
-        
-        databaseTaskSchedulerControl.verify();        
-        
-        assertFalse( success );
-    }
-     
-/* Tests for querying repositories  */
+    /* Tests for querying repositories  */
     
     public void testGetAllManagedRepositories()
         throws Exception
@@ -859,19 +669,7 @@
         invalidContentConsumerControl.expectAndReturn( checkPomConsumer.getId(), "check-pom" );
         invalidContentConsumerControl.expectAndReturn( checkMetadataConsumer.getId(), "check-metadata" );
     }
-    
-    private void recordDbConsumers()
-    {
-        List unprocessedConsumers =
-            new ArrayList();
-        unprocessedConsumers.add( processArtifactConsumer );
-        unprocessedConsumers.add( processPomConsumer );
-        
-        dbConsumersUtilControl.expectAndReturn( dbConsumersUtil.getAvailableUnprocessedConsumers(), unprocessedConsumers );
-        unprocessedConsumersControl.expectAndReturn( processArtifactConsumer.getId(), "process-artifact" );
-        unprocessedConsumersControl.expectAndReturn( processPomConsumer.getId(), "process-pom" );
-    }    
-    
+
     private void recordInManagedLegacyRepoContent( MockControl fileTypesControl, FileTypes fileTypes,
                                                    MockControl pathParserControl, PathParser parser )
         throws LayoutException
@@ -936,4 +734,4 @@
         
         return aRef;
     }
-}
\ No newline at end of file
+}

Modified: archiva/branches/MRM-1025/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/pom.xml?rev=886037&r1=886036&r2=886037&view=diff
==============================================================================
--- archiva/branches/MRM-1025/pom.xml (original)
+++ archiva/branches/MRM-1025/pom.xml Wed Dec  2 02:33:02 2009
@@ -350,11 +350,6 @@
       
       
         org.apache.archiva
-        archiva-dependency-graph
-        1.3-SNAPSHOT
-      
-      
-        org.apache.archiva
         archiva-core-consumers
         1.3-SNAPSHOT
       
@@ -420,11 +415,6 @@
       
       
         org.apache.archiva
-        archiva-scheduler-database
-        1.3-SNAPSHOT
-      
-      
-        org.apache.archiva
         archiva-scheduler-indexing
         1.3-SNAPSHOT

svn commit: r886035 - in /archiva/branches/MRM-1025/archiva-modules: archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ archiva-reporting/archiva-artifact-reports/ archiva-reporting/arch...

2009-12-02T02:21:06Z

Author: brett
Date: Wed Dec  2 02:21:05 2009
New Revision: 886035

URL: http://svn.apache.org/viewvc?rev=886035&view=rev
Log:
[MRM-1025] change duplicate artifact reporting to be a repository scanned consumer to facilitate
removing the database unprocessed consumers

Removed:
    archiva/branches/MRM-1025/archiva-modules/archiva-reporting/archiva-project-reports/src/main/java/org/apache/maven/archiva/reporting/project/ProjectDependenciesConsumer.java
Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
    archiva/branches/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactsConsumer.java
    archiva/branches/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReportTest.java

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java?rev=886035&r1=886034&r2=886035&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ProjectModelToDatabaseConsumer.java
Wed Dec  2 02:21:05 2009
@@ -9,7 +9,7 @@
  * "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
+ *   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
@@ -34,10 +34,7 @@
 import org.apache.maven.archiva.model.ArchivaArtifact;
 import org.apache.maven.archiva.model.ArchivaModelCloner;
 import org.apache.maven.archiva.model.ArchivaProjectModel;
-import org.apache.maven.archiva.model.CiManagement;
-import org.apache.maven.archiva.model.IssueManagement;
 import org.apache.maven.archiva.model.Keys;
-import org.apache.maven.archiva.model.Organization;
 import org.apache.maven.archiva.model.RepositoryProblem;
 import org.apache.maven.archiva.reporting.artifact.CorruptArtifactReport;
 import org.apache.maven.archiva.repository.ManagedRepositoryContent;

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml?rev=886035&r1=886034&r2=886035&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml
Wed Dec  2 02:21:05 2009
@@ -42,6 +42,10 @@
     
     
       org.codehaus.plexus
+      plexus-digest
+    
+    
+      org.codehaus.plexus
       plexus-utils
     
     

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactsConsumer.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactsConsumer.java?rev=886035&r1=886034&r2=886035&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactsConsumer.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactsConsumer.java
Wed Dec  2 02:21:05 2009
@@ -19,25 +19,32 @@
  * under the License.
  */
 
+import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.ConfigurationNames;
 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.apache.maven.archiva.database.ArchivaDAO;
 import org.apache.maven.archiva.database.ArchivaDatabaseException;
 import org.apache.maven.archiva.database.ObjectNotFoundException;
 import org.apache.maven.archiva.database.constraints.ArtifactsByChecksumConstraint;
-import org.apache.maven.archiva.database.updater.ArchivaArtifactConsumer;
 import org.apache.maven.archiva.model.ArchivaArtifact;
 import org.apache.maven.archiva.model.RepositoryProblem;
 import org.apache.maven.archiva.repository.ManagedRepositoryContent;
 import org.apache.maven.archiva.repository.RepositoryContentFactory;
 import org.apache.maven.archiva.repository.RepositoryException;
+import org.apache.maven.archiva.repository.layout.LayoutException;
+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;
@@ -48,17 +55,19 @@
 /**
  * Search the database of known SHA1 Checksums for potential duplicate artifacts.
  *
+ * TODO: no need for this to be a scanner - we can just query the database / content repository
to get a full list
+ *
  * @version $Id$
- * 
- * @plexus.component role="org.apache.maven.archiva.database.updater.ArchivaArtifactConsumer"
- *                   role-hint="duplicate-artifacts"
+ * @plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
+ * role-hint="duplicate-artifacts"
+ * instantiation-strategy="per-lookup"
  */
 public class DuplicateArtifactsConsumer
     extends AbstractMonitoredConsumer
-    implements ArchivaArtifactConsumer, RegistryListener, Initializable
+    implements KnownRepositoryContentConsumer, RegistryListener, Initializable
 {
     private Logger log = LoggerFactory.getLogger( DuplicateArtifactsConsumer.class );
-    
+
     /**
      * @plexus.configuration default-value="duplicate-artifacts"
      */
@@ -89,9 +98,19 @@
      */
     private RepositoryContentFactory repositoryFactory;
 
-    // TODO: why is this not used? If it should be, what about excludes?
     private List includes = new ArrayList();
 
+    private File repositoryDir;
+
+    /**
+     * @plexus.requirement role-hint="sha1"
+     */
+    private Digester digestSha1;
+
+    private String repoId;
+
+    private ManagedRepositoryContent repository;
+
     public String getId()
     {
         return id;
@@ -107,40 +126,62 @@
         return false;
     }
 
-    public void beginScan()
+    public List getIncludes()
     {
-        /* do nothing */
+        return includes;
     }
 
-    public void completeScan()
+    public List getExcludes()
     {
-        /* do nothing */
+        return Collections.emptyList();
     }
 
-    public List getIncludedTypes()
+    public void beginScan( ManagedRepositoryConfiguration repo, Date whenGathered )
+        throws ConsumerException
     {
-        return null;
+        try
+        {
+            repoId = repo.getId();
+            repository = repositoryFactory.getManagedRepositoryContent( repoId );
+            this.repositoryDir = new File( repository.getRepoRoot() );
+        }
+        catch ( RepositoryException e )
+        {
+            throw new ConsumerException( e.getMessage(), e );
+        }
     }
 
-    public void processArchivaArtifact( ArchivaArtifact artifact )
+    public void processFile( String path )
         throws ConsumerException
     {
-        String checksumSha1 = artifact.getModel().getChecksumSHA1();
+        File artifactFile = new File( this.repositoryDir, path );
 
-        List results = null;
+        // TODO: would be quicker to somehow make sure it ran after the update database consumer,
or as a part of that
+        //  perhaps could use an artifact context that is retained for all consumers? First
in can set the SHA-1
+        String checksumSha1;
         try
         {
-            results = dao.getArtifactDAO().queryArtifacts( new ArtifactsByChecksumConstraint(
-                checksumSha1, ArtifactsByChecksumConstraint.SHA1 ) );
+            checksumSha1 = digestSha1.calc( artifactFile );
+        }
+        catch ( DigesterException e )
+        {
+            throw new ConsumerException( e.getMessage(), e );
+        }
+
+        List results;
+        try
+        {
+            results = dao.getArtifactDAO().queryArtifacts(
+                new ArtifactsByChecksumConstraint( checksumSha1, ArtifactsByChecksumConstraint.SHA1
) );
         }
         catch ( ObjectNotFoundException e )
         {
-            log.debug( "No duplicates for artifact: " + artifact );
+            log.debug( "No duplicates for artifact: " + path + " (repository " + repoId +
")" );
             return;
         }
         catch ( ArchivaDatabaseException e )
         {
-            log.warn( "Unable to query DB for potential duplicates with : " + artifact );
+            log.warn( "Unable to query DB for potential duplicates with: " + path + " (repository
" + repoId + "): " + e.getMessage(), e );
             return;
         }
 
@@ -149,10 +190,20 @@
             if ( results.size() <= 1 )
             {
                 // No duplicates detected.
-                log.debug( "Found no duplicate artifact results on: " + artifact );
+                log.debug( "Found no duplicate artifact results on: " + path + " (repository
" + repoId + ")" );
                 return;
             }
 
+            ArchivaArtifact artifact;
+            try
+            {
+                artifact = new ArchivaArtifact( repository.toArtifactReference( path ), repoId
);
+            }
+            catch ( LayoutException e )
+            {
+                log.warn( "Unable to report problem for path: " + path );
+                return;
+            }
             for ( ArchivaArtifact dupArtifact : results )
             {
                 if ( dupArtifact.equals( artifact ) )
@@ -163,7 +214,7 @@
 
                 RepositoryProblem problem = new RepositoryProblem();
                 problem.setRepositoryId( dupArtifact.getModel().getRepositoryId() );
-                problem.setPath( toPath( dupArtifact ) );
+                problem.setPath( path );
                 problem.setGroupId( artifact.getGroupId() );
                 problem.setArtifactId( artifact.getArtifactId() );
                 problem.setVersion( artifact.getVersion() );
@@ -186,19 +237,9 @@
         }
     }
 
-    private String toPath( ArchivaArtifact artifact )
+    public void completeScan()
     {
-        try
-        {
-            String repoId = artifact.getModel().getRepositoryId();
-            ManagedRepositoryContent repo = repositoryFactory.getManagedRepositoryContent(
repoId );
-            return repo.toPath( artifact );
-        }
-        catch ( RepositoryException e )
-        {
-            log.warn( "Unable to calculate path for artifact: " + artifact );
-            return "";
-        }
+        // nothing to do
     }
 
     public void afterConfigurationChange( Registry registry, String propertyName, Object
propertyValue )

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReportTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReportTest.java?rev=886035&r1=886034&r2=886035&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReportTest.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/DuplicateArtifactReportTest.java
Wed Dec  2 02:21:05 2009
@@ -20,17 +20,20 @@
  */
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
 import org.apache.maven.archiva.database.ArtifactDAO;
-import org.apache.maven.archiva.database.updater.ArchivaArtifactConsumer;
 import org.apache.maven.archiva.model.ArchivaArtifact;
 import org.apache.maven.archiva.model.RepositoryProblem;
 import org.apache.maven.archiva.reporting.DynamicReportSource;
+import org.apache.maven.archiva.repository.ManagedRepositoryContent;
+import org.apache.maven.archiva.repository.RepositoryContentFactory;
 
 /**
  * DuplicateArtifactReportTest
@@ -42,14 +45,18 @@
 {
     private static final String TESTABLE_REPO = "testable";
 
-    private static final String HASH3 = "f3f653289f3217c65324830ab3415bc92feddefa";
+    private static final String HASH3 = "94ca33031e37aa3f3b67e5b921c729f08a6bba75";
 
-    private static final String HASH2 = "a49810ad3eba8651677ab57cd40a0f76fdef9538";
+    private static final String HASH2 = "43f7aa390f1a0265fc2de7010133951c0718a67e";
 
-    private static final String HASH1 = "232f01b24b1617c46a3d4b0ab3415bc9237dcdec";
+    private static final String HASH1 = "8107759ababcbfa34bcb02bc4309caf6354982ab";
 
     private ArtifactDAO artifactDao;
 
+    private ManagedRepositoryConfiguration repoConfig;
+
+    private ManagedRepositoryContent content;
+
     @Override
     protected void setUp()
         throws Exception
@@ -60,19 +67,41 @@
 
         ArchivaConfiguration config = (ArchivaConfiguration) lookup( ArchivaConfiguration.class.getName(),
"default" );
 
-        ManagedRepositoryConfiguration repoConfig = new ManagedRepositoryConfiguration();
+        repoConfig = new ManagedRepositoryConfiguration();
         repoConfig.setId( TESTABLE_REPO );
         repoConfig.setLayout( "default" );
         File testRepoDir = new File( getBasedir(), "target/test-repository" );
         FileUtils.forceMkdir( testRepoDir );
         repoConfig.setLocation( testRepoDir.getAbsolutePath() );
         config.getConfiguration().addManagedRepository( repoConfig );
+
+        RepositoryContentFactory factory = (RepositoryContentFactory) lookup( RepositoryContentFactory.class
);
+        content = factory.getManagedRepositoryContent( TESTABLE_REPO );
+
+        createArtifactFile( testRepoDir, "test-one", "1.0", "value1" );
+        createArtifactFile( testRepoDir, "test-one", "1.1", "value1" );
+        createArtifactFile( testRepoDir, "test-one", "1.2", "value1" );
+        createArtifactFile( testRepoDir, "test-two", "1.0", "value1" );
+        createArtifactFile( testRepoDir, "test-two", "2.0", "value3" );
+        createArtifactFile( testRepoDir, "test-two", "2.1", "value2" );
+        createArtifactFile( testRepoDir, "test-two", "3.0", "value2" );
+    }
+
+    private void createArtifactFile( File testRepoDir, String artifactId, String version,
String value )
+        throws IOException
+    {
+        File file = new File( testRepoDir,
+                              "org/apache/maven/archiva/test/" + artifactId + "/" + version
+ "/" + artifactId + "-" +
+                                  version + ".jar" );
+        file.getParentFile().mkdirs();
+        FileUtils.writeStringToFile( file, value );
     }
 
     public ArchivaArtifact createArtifact( String artifactId, String version )
     {
         ArchivaArtifact artifact =
-            artifactDao.createArtifact( "org.apache.maven.archiva.test", artifactId, version,
"", "jar", TESTABLE_REPO );
+            artifactDao.createArtifact( "org.apache.maven.archiva.test", artifactId, version,
"", "jar",
+                                        TESTABLE_REPO );
         artifact.getModel().setLastModified( new Date() );
         return artifact;
     }
@@ -142,14 +171,15 @@
         throws Exception
     {
         List artifacts = dao.getArtifactDAO().queryArtifacts( null
);
-        ArchivaArtifactConsumer consumer =
-            (ArchivaArtifactConsumer) lookup( ArchivaArtifactConsumer.class.getName(), "duplicate-artifacts"
);
-        consumer.beginScan();
+        KnownRepositoryContentConsumer consumer =
+            (KnownRepositoryContentConsumer) lookup( KnownRepositoryContentConsumer.class.getName(),
+                                                     "duplicate-artifacts" );
+        consumer.beginScan( repoConfig, new Date() );
         try
         {
             for ( ArchivaArtifact artifact : artifacts )
             {
-                consumer.processArchivaArtifact( artifact );
+                consumer.processFile( content.toPath( artifact ) );
             }
         }
         finally

svn commit: r885817 - /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java

2009-12-01T16:17:48Z

Author: brett
Date: Tue Dec  1 16:17:48 2009
New Revision: 885817

URL: http://svn.apache.org/viewvc?rev=885817&view=rev
Log:
[MRM-1025] switch upload action to use the maven-model writer instead

Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java?rev=885817&r1=885816&r2=885817&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
Tue Dec  1 16:17:48 2009
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -45,7 +46,6 @@
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.model.ArchivaProjectModel;
 import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
 import org.apache.maven.archiva.model.ArtifactReference;
 import org.apache.maven.archiva.model.SnapshotVersion;
@@ -59,14 +59,14 @@
 import org.apache.maven.archiva.repository.metadata.RepositoryMetadataException;
 import org.apache.maven.archiva.repository.metadata.RepositoryMetadataReader;
 import org.apache.maven.archiva.repository.metadata.RepositoryMetadataWriter;
-import org.apache.maven.archiva.repository.project.ProjectModelException;
-import org.apache.maven.archiva.repository.project.ProjectModelWriter;
-import org.apache.maven.archiva.repository.project.writers.ProjectModel400Writer;
 import org.apache.maven.archiva.security.AccessDeniedException;
 import org.apache.maven.archiva.security.ArchivaSecurityException;
 import org.apache.maven.archiva.security.PrincipalNotFoundException;
 import org.apache.maven.archiva.security.UserRepositories;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
 import org.codehaus.plexus.taskqueue.TaskQueueException;
+import org.codehaus.plexus.util.IOUtil;
 
 /**
  * Upload an artifact using Jakarta file upload in webwork. If set by the user a pom will
also be generated. Metadata
@@ -150,8 +150,6 @@
 
     private ChecksumAlgorithm[] algorithms = new ChecksumAlgorithm[]{ChecksumAlgorithm.SHA1,
ChecksumAlgorithm.MD5};
 
-    private ProjectModelWriter pomWriter = new ProjectModel400Writer();
-
     public void setArtifact( File file )
     {
         this.artifactFile = file;
@@ -391,11 +389,6 @@
                     addActionError( "Error encountered while writing pom file: " + ie.getMessage()
);
                     return ERROR;
                 }
-                catch ( ProjectModelException pe )
-                {
-                    addActionError( "Error encountered while generating pom file: " + pe.getMessage()
);
-                    return ERROR;
-                }
             }
 
             if ( pomFile != null && pomFile.length() > 0 )
@@ -475,16 +468,26 @@
     }
 
     private File createPom( File targetPath, String filename )
-        throws IOException, ProjectModelException
+        throws IOException
     {
-        ArchivaProjectModel projectModel = new ArchivaProjectModel();
+        Model projectModel = new Model();
+        projectModel.setModelVersion( "4.0.0" );
         projectModel.setGroupId( groupId );
         projectModel.setArtifactId( artifactId );
         projectModel.setVersion( version );
         projectModel.setPackaging( packaging );
 
         File pomFile = new File( targetPath, filename );
-        pomWriter.write( projectModel, pomFile );
+        MavenXpp3Writer writer = new MavenXpp3Writer();
+        FileWriter w = new FileWriter( pomFile );
+        try
+        {
+            writer.write( w, projectModel );
+        }
+        finally
+        {
+            IOUtil.close( w );
+        }
 
         return pomFile;
     }

svn commit: r885816 - /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java

2009-12-01T16:17:09Z

Author: brett
Date: Tue Dec  1 16:17:08 2009
New Revision: 885816

URL: http://svn.apache.org/viewvc?rev=885816&view=rev
Log:
formatting only

Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java?rev=885816&r1=885815&r2=885816&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
Tue Dec  1 16:17:08 2009
@@ -292,8 +292,7 @@
         try
         {
             Configuration config = configuration.getConfiguration();
-            ManagedRepositoryConfiguration repoConfig =
-                config.findManagedRepositoryById( repositoryId );
+            ManagedRepositoryConfiguration repoConfig = config.findManagedRepositoryById(
repositoryId );
 
             ArtifactReference artifactReference = new ArtifactReference();
             artifactReference.setArtifactId( artifactId );
@@ -345,20 +344,22 @@
                 filename = filename.replaceAll( "SNAPSHOT", timestamp + "-" + newBuildNumber
);
             }
 
-            boolean fixChecksums = !( config.getRepositoryScanning().getKnownContentConsumers().contains(
"create-missing-checksums" ) );
-            
+            boolean fixChecksums =
+                !( config.getRepositoryScanning().getKnownContentConsumers().contains( "create-missing-checksums"
) );
+
             try
-            {   
+            {
                 File targetFile = new File( targetPath, filename );
-                if( targetFile.exists() && !VersionUtil.isSnapshot( version ) &&
repoConfig.isBlockRedeployments() )
+                if ( targetFile.exists() && !VersionUtil.isSnapshot( version ) &&
repoConfig.isBlockRedeployments() )
                 {
-                    addActionError( "Overwriting released artifacts in repository '" + repoConfig.getId()
+ "' is not allowed." );
+                    addActionError(
+                        "Overwriting released artifacts in repository '" + repoConfig.getId()
+ "' is not allowed." );
                     return ERROR;
                 }
                 else
                 {
                     copyFile( artifactFile, targetPath, filename, fixChecksums );
-                    queueRepositoryTask( repository.getId(), repository.toFile( artifactReference
) );                    
+                    queueRepositoryTask( repository.getId(), repository.toFile( artifactReference
) );
                 }
             }
             catch ( IOException ie )
@@ -373,17 +374,17 @@
                 pomFilename = StringUtils.remove( pomFilename, "-" + classifier );
             }
             pomFilename = FilenameUtils.removeExtension( pomFilename ) + ".pom";
-            
+
             if ( generatePom )
             {
                 try
                 {
                     File generatedPomFile = createPom( targetPath, pomFilename );
-                    if( fixChecksums )
+                    if ( fixChecksums )
                     {
                         fixChecksums( generatedPomFile );
                     }
-                    queueRepositoryTask( repoConfig.getId(), generatedPomFile );        
           
+                    queueRepositoryTask( repoConfig.getId(), generatedPomFile );
                 }
                 catch ( IOException ie )
                 {
@@ -400,7 +401,7 @@
             if ( pomFile != null && pomFile.length() > 0 )
             {
                 try
-                {   
+                {
                     copyFile( pomFile, targetPath, pomFilename, fixChecksums );
                     queueRepositoryTask( repoConfig.getId(), new File( targetPath, pomFilename
) );
                 }
@@ -413,7 +414,7 @@
             }
 
             // explicitly update only if metadata-updater consumer is not enabled!
-            if( !config.getRepositoryScanning().getKnownContentConsumers().contains( "metadata-updater"
) )
+            if ( !config.getRepositoryScanning().getKnownContentConsumers().contains( "metadata-updater"
) )
             {
                 updateMetadata( metadata, metadataFile, lastUpdatedTimestamp, timestamp,
newBuildNumber, fixChecksums );
             }
@@ -439,13 +440,13 @@
             return ERROR;
         }
     }
-    
+
     private void fixChecksums( File file )
     {
         ChecksummedFile checksum = new ChecksummedFile( file );
         checksum.fixChecksums( algorithms );
     }
-    
+
     private void copyFile( File sourceFile, File targetPath, String targetFilename, boolean
fixChecksums )
         throws IOException
     {
@@ -466,8 +467,8 @@
             out.close();
             input.close();
         }
-        
-        if( fixChecksums )
+
+        if ( fixChecksums )
         {
             fixChecksums( new File( targetPath, targetFilename ) );
         }
@@ -507,7 +508,7 @@
     }
 
     /**
-     * Update artifact level metadata. If it does not exist, create the metadata and 
+     * Update artifact level metadata. If it does not exist, create the metadata and
      * fix checksums if necessary.
      */
     private void updateMetadata( ArchivaRepositoryMetadata metadata, File metadataFile, Date
lastUpdatedTimestamp,
@@ -563,8 +564,8 @@
         }
 
         RepositoryMetadataWriter.write( metadata, metadataFile );
-        
-        if( fixChecksums )
+
+        if ( fixChecksums )
         {
             fixChecksums( metadataFile );
         }

svn commit: r885812 [2/2] - in /archiva/branches/MRM-1025: ./ archiva-modules/archiva-base/ archiva-modules/archiva-base/archiva-dependency-graph/ archiva-modules/archiva-web/archiva-webapp/ archiva-modules/archiva-web/archiva-webapp/src/main/java/org/...

2009-12-01T16:01:33Z

Added: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java (added)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java Tue Dec  1 16:01:31 2009
@@ -0,0 +1,268 @@
+package org.apache.archiva.dependency.tree.maven2;
+
+/*
+ * 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.Collections;
+
+import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.configuration.Configuration;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.shared.dependency.tree.DependencyNode;
+import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
+import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
+import org.easymock.MockControl;
+
+public class DependencyTreeBuilderTest
+    extends PlexusInSpringTestCase
+{
+    private DependencyTreeBuilder builder;
+
+    private static final String TEST_REPO_ID = "test";
+
+    private static final String TEST_VERSION = "1.2.1";
+
+    private static final String TEST_ARTIFACT_ID = "archiva-common";
+
+    private static final String TEST_GROUP_ID = "org.apache.archiva";
+
+    private ArtifactFactory artifactFactory;
+
+    @Override
+    protected void setUp()
+        throws Exception
+    {
+        super.setUp();
+
+        ArchivaConfiguration config = (ArchivaConfiguration) lookup( ArchivaConfiguration.class );
+
+        Configuration configuration = new Configuration();
+        ManagedRepositoryConfiguration repoConfig = new ManagedRepositoryConfiguration();
+        repoConfig.setId( TEST_REPO_ID );
+        repoConfig.setLocation( getTestPath( "src/test/repositories/test" ) );
+        configuration.addManagedRepository( repoConfig );
+        config.save( configuration );
+
+        builder = (DependencyTreeBuilder) lookup( DependencyTreeBuilder.class, "maven2" );
+        artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.class );
+    }
+
+    public void testBuilder()
+        throws DependencyTreeBuilderException
+    {
+        MockControl control = MockControl.createStrictControl( DependencyNodeVisitor.class );
+        DependencyNodeVisitor visitor = (DependencyNodeVisitor) control.getMock();
+
+        DependencyNode springContext =
+            new DependencyNode( createArtifact( "org.springframework", "spring-context", "2.5.6" ) );
+        springContext.setPremanagedVersion( "2.5.5" );
+        DependencyNode springTest =
+            new DependencyNode( createArtifact( "org.springframework", "spring-test", "2.5.5", "test" ) );
+        DependencyNode plexusUtils =
+            new DependencyNode( createArtifact( "org.codehaus.plexus", "plexus-utils", "1.4.5" ) );
+        plexusUtils.setPremanagedVersion( "1.5.1" );
+        DependencyNode slf4jLog4j12 =
+            new DependencyNode( createArtifact( "org.slf4j", "slf4j-log4j12", "1.5.0", "runtime" ) );
+        slf4jLog4j12.setPremanagedScope( "test" );
+        DependencyNode plexusLog4j = new DependencyNode(
+            createArtifact( "org.codehaus.plexus", "plexus-log4j-logging", "1.1-alpha-3", "test" ) );
+        DependencyNode log4j = new DependencyNode( createArtifact( "log4j", "log4j", "1.2.14", "test" ) );
+        DependencyNode mavenArtifact =
+            new DependencyNode( createArtifact( "org.apache.maven", "maven-artifact", "2.0.8", "test" ) );
+        DependencyNode mavenProject =
+            new DependencyNode( createArtifact( "org.apache.maven", "maven-project", "2.0.8", "test" ) );
+        DependencyNode mavenCore =
+            new DependencyNode( createArtifact( "org.apache.maven", "maven-core", "2.0.8", "test" ) );
+        DependencyNode mavenSettings =
+            new DependencyNode( createArtifact( "org.apache.maven", "maven-settings", "2.0.8", "test" ) );
+        DependencyNode mavenModel =
+            new DependencyNode( createArtifact( "org.apache.maven", "maven-model", "2.0.8", "test" ) );
+        DependencyNode plexusCommandLine =
+            new DependencyNode( createArtifact( "org.codehaus.plexus", "plexus-command-line", "1.0-alpha-2", "test" ) );
+        DependencyNode plexusRegistryCommons = new DependencyNode(
+            createArtifact( "org.codehaus.plexus.registry", "plexus-registry-commons", "1.0-alpha-2", "test" ) );
+        plexusRegistryCommons.setPremanagedVersion( "1.0-alpha-3" );
+        DependencyNode plexusRegistryApi = new DependencyNode(
+            createArtifact( "org.codehaus.plexus.registry", "plexus-registry-api", "1.0-alpha-2", "test" ) );
+        plexusRegistryApi.setPremanagedVersion( "1.0-alpha-3" );
+
+        DependencyNode plexusSpring =
+            new DependencyNode( createArtifact( "org.codehaus.plexus", "plexus-spring", "1.2", "test" ) );
+        plexusSpring.addChild( springContext );
+        plexusSpring.addChild( springTest );
+        plexusSpring.addChild( plexusUtils );
+        plexusSpring.addChild( slf4jLog4j12 );
+        plexusSpring.addChild( plexusLog4j );
+        plexusSpring.addChild( log4j );
+        plexusSpring.addChild( mavenArtifact );
+        plexusSpring.addChild( mavenProject );
+        plexusSpring.addChild( mavenCore );
+        plexusSpring.addChild( mavenSettings );
+        plexusSpring.addChild( mavenModel );
+        plexusSpring.addChild( plexusCommandLine );
+        plexusSpring.addChild( plexusRegistryCommons );
+        plexusSpring.addChild( plexusRegistryApi );
+
+        DependencyNode commonsLang = new DependencyNode( createArtifact( "commons-lang", "commons-lang", "2.2" ) );
+        DependencyNode commonsIO = new DependencyNode( createArtifact( "commons-io", "commons-io", "1.4" ) );
+        DependencyNode slf4j = new DependencyNode( createArtifact( "org.slf4j", "slf4j-api", "1.5.0" ) );
+        DependencyNode plexusAPI =
+            new DependencyNode( createArtifact( "org.codehaus.plexus", "plexus-component-api", "1.0-alpha-22" ) );
+        DependencyNode xalan = new DependencyNode( createArtifact( "xalan", "xalan", "2.7.0" ) );
+        DependencyNode dom4j = new DependencyNode( createArtifact( "dom4j", "dom4j", "1.6.1", "test" ) );
+        dom4j.setFailedUpdateScope( "compile" );
+        DependencyNode junit = new DependencyNode( createArtifact( "junit", "junit", "3.8.1", "test" ) );
+        DependencyNode easymock = new DependencyNode( createArtifact( "easymock", "easymock", "1.2_Java1.3", "test" ) );
+        DependencyNode easymockExt =
+            new DependencyNode( createArtifact( "easymock", "easymockclassextension", "1.2", "test" ) );
+
+        DependencyNode mainNode =
+            new DependencyNode( createProjectArtifact( TEST_GROUP_ID, TEST_ARTIFACT_ID, TEST_VERSION ) );
+        mainNode.addChild( commonsLang );
+        mainNode.addChild( commonsIO );
+        mainNode.addChild( slf4j );
+        mainNode.addChild( plexusAPI );
+        mainNode.addChild( plexusSpring );
+        mainNode.addChild( xalan );
+        mainNode.addChild( dom4j );
+        mainNode.addChild( junit );
+        mainNode.addChild( easymock );
+        mainNode.addChild( easymockExt );
+
+        control.expectAndReturn( visitor.visit( mainNode ), true );
+
+        control.expectAndReturn( visitor.visit( commonsLang ), true );
+        control.expectAndReturn( visitor.endVisit( commonsLang ), true );
+
+        control.expectAndReturn( visitor.visit( commonsIO ), true );
+        control.expectAndReturn( visitor.endVisit( commonsIO ), true );
+
+        control.expectAndReturn( visitor.visit( slf4j ), true );
+        control.expectAndReturn( visitor.endVisit( slf4j ), true );
+
+        control.expectAndReturn( visitor.visit( plexusAPI ), true );
+        control.expectAndReturn( visitor.endVisit( plexusAPI ), true );
+
+        control.expectAndReturn( visitor.visit( plexusSpring ), true );
+
+        control.expectAndReturn( visitor.visit( springContext ), true );
+        control.expectAndReturn( visitor.endVisit( springContext ), true );
+
+        control.expectAndReturn( visitor.visit( springTest ), true );
+        control.expectAndReturn( visitor.endVisit( springTest ), true );
+
+        control.expectAndReturn( visitor.visit( plexusUtils ), true );
+        control.expectAndReturn( visitor.endVisit( plexusUtils ), true );
+
+        control.expectAndReturn( visitor.visit( slf4jLog4j12 ), true );
+        control.expectAndReturn( visitor.endVisit( slf4jLog4j12 ), true );
+
+        control.expectAndReturn( visitor.visit( plexusLog4j ), true );
+        control.expectAndReturn( visitor.endVisit( plexusLog4j ), true );
+
+        control.expectAndReturn( visitor.visit( log4j ), true );
+        control.expectAndReturn( visitor.endVisit( log4j ), true );
+
+        control.expectAndReturn( visitor.visit( mavenArtifact ), true );
+        control.expectAndReturn( visitor.endVisit( mavenArtifact ), true );
+
+        control.expectAndReturn( visitor.visit( mavenProject ), true );
+        control.expectAndReturn( visitor.endVisit( mavenProject ), true );
+
+        control.expectAndReturn( visitor.visit( mavenCore ), true );
+        control.expectAndReturn( visitor.endVisit( mavenCore ), true );
+
+        control.expectAndReturn( visitor.visit( mavenSettings ), true );
+        control.expectAndReturn( visitor.endVisit( mavenSettings ), true );
+
+        control.expectAndReturn( visitor.visit( mavenModel ), true );
+        control.expectAndReturn( visitor.endVisit( mavenModel ), true );
+
+        control.expectAndReturn( visitor.visit( plexusCommandLine ), true );
+        control.expectAndReturn( visitor.endVisit( plexusCommandLine ), true );
+
+        control.expectAndReturn( visitor.visit( plexusRegistryCommons ), true );
+        control.expectAndReturn( visitor.endVisit( plexusRegistryCommons ), true );
+
+        control.expectAndReturn( visitor.visit( plexusRegistryApi ), true );
+        control.expectAndReturn( visitor.endVisit( plexusRegistryApi ), true );
+
+        control.expectAndReturn( visitor.endVisit( plexusSpring ), true );
+
+        control.expectAndReturn( visitor.visit( xalan ), true );
+        control.expectAndReturn( visitor.endVisit( xalan ), true );
+
+        control.expectAndReturn( visitor.visit( dom4j ), true );
+        control.expectAndReturn( visitor.endVisit( dom4j ), true );
+
+        control.expectAndReturn( visitor.visit( junit ), true );
+        control.expectAndReturn( visitor.endVisit( junit ), true );
+
+        control.expectAndReturn( visitor.visit( easymock ), true );
+        control.expectAndReturn( visitor.endVisit( easymock ), true );
+
+        control.expectAndReturn( visitor.visit( easymockExt ), true );
+        control.expectAndReturn( visitor.endVisit( easymockExt ), true );
+
+        control.expectAndReturn( visitor.endVisit( mainNode ), true );
+
+        control.replay();
+
+        builder.buildDependencyTree( Collections.singletonList( TEST_REPO_ID ), TEST_GROUP_ID, TEST_ARTIFACT_ID,
+                                     TEST_VERSION, visitor );
+
+        control.verify();
+    }
+
+    private Artifact createProjectArtifact( String groupId, String artifactId, String version )
+    {
+        return artifactFactory.createProjectArtifact( groupId, artifactId, version );
+    }
+
+    private Artifact createArtifact( String groupId, String artifactId, String version, String scope )
+    {
+        return artifactFactory.createDependencyArtifact( groupId, artifactId, VersionRange.createFromVersion( version ),
+                                                         "jar", null, scope );
+    }
+
+    private Artifact createArtifact( String groupId, String artifactId, String version )
+    {
+        return createArtifact( groupId, artifactId, version, Artifact.SCOPE_COMPILE );
+    }
+
+    public void testBuilderMissingDependency()
+        throws DependencyTreeBuilderException
+    {
+        MockControl control = MockControl.createStrictControl( DependencyNodeVisitor.class );
+        DependencyNodeVisitor visitor = (DependencyNodeVisitor) control.getMock();
+
+        // not visited
+
+        control.replay();
+
+        builder.buildDependencyTree( Collections.singletonList( TEST_REPO_ID ), TEST_GROUP_ID, TEST_ARTIFACT_ID,
+                                     "not-a-version", visitor );
+
+        control.verify();
+    }
+}

Added: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java (added)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java Tue Dec  1 16:01:31 2009
@@ -0,0 +1,75 @@
+package org.apache.archiva.metadata.repository;
+
+import java.util.Collection;
+
+import org.apache.archiva.metadata.model.ProjectMetadata;
+import org.apache.archiva.metadata.model.ProjectVersionMetadata;
+import org.apache.archiva.metadata.model.ProjectVersionReference;
+
+/*
+ * 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.
+ */
+
+public class TestMetadataResolver
+    implements MetadataResolver
+{
+    public ProjectMetadata getProject( String repoId, String namespace, String projectId )
+    {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public ProjectVersionMetadata getProjectVersion( String repoId, String namespace, String projectId,
+                                                     String projectVersion )
+        throws MetadataResolverException
+    {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Collection getArtifactVersions( String repoId, String namespace, String projectId,
+                                                   String projectVersion )
+    {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Collection getProjectReferences( String repoId, String namespace, String projectId,
+                                                                     String projectVersion )
+    {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Collection getRootNamespaces( String repoId )
+    {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Collection getNamespaces( String repoId, String namespace )
+    {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Collection getProjects( String repoId, String namespace )
+    {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    public Collection getProjectVersions( String repoId, String namespace, String projectId )
+        throws MetadataResolverException
+    {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+}

Modified: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java?rev=885812&r1=885811&r2=885812&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java Tue Dec  1 16:01:31 2009
@@ -231,7 +231,7 @@
         assertEquals( Arrays.asList( "test" ), resolver.getNamespaces( TEST_REPO_ID, "com.example" ) );
         assertEquals( Collections.emptyList(), resolver.getNamespaces( TEST_REPO_ID, "com.example.test" ) );
 
-        assertEquals( Arrays.asList( "apache" ), resolver.getNamespaces( TEST_REPO_ID, "org" ) );
+        assertEquals( Arrays.asList( "apache", "codehaus" ), resolver.getNamespaces( TEST_REPO_ID, "org" ) );
         assertEquals( Arrays.asList( "archiva", "maven" ), resolver.getNamespaces( TEST_REPO_ID, "org.apache" ) );
         assertEquals( Collections.emptyList(), resolver.getNamespaces( TEST_REPO_ID, "org.apache.archiva" ) );
         assertEquals( Arrays.asList( "plugins", "shared" ),
@@ -240,6 +240,9 @@
                       resolver.getNamespaces( TEST_REPO_ID, "org.apache.maven.plugins" ) );
         assertEquals( Collections.emptyList(),
                       resolver.getNamespaces( TEST_REPO_ID, "org.apache.maven.shared" ) );
+
+        assertEquals( Arrays.asList( "plexus" ), resolver.getNamespaces( TEST_REPO_ID, "org.codehaus" ) );
+        assertEquals( Collections.emptyList(), resolver.getNamespaces( TEST_REPO_ID, "org.codehaus.plexus" ) );
     }
 
     public void testGetProjects()

Added: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom (added)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom Tue Dec  1 16:01:31 2009
@@ -0,0 +1,88 @@
+
+  4.0.0
+  
+    plexus
+    org.codehaus.plexus
+    1.0.10
+    ../pom/pom.xml
+  
+  org.codehaus.plexus
+  plexus-components
+  pom
+  1.1.12
+  Plexus Components Parent Project
+  http://plexus.codehaus.org/plexus-components
+  
+    
+      org.codehaus.plexus
+      plexus-component-api
+      1.0-alpha-20
+    
+    
+      org.codehaus.plexus
+      plexus-container-default
+      1.0-alpha-20
+      test
+    
+  
+  
+    plexus-action
+    plexus-archiver
+    plexus-bayesian
+    plexus-command
+    plexus-compiler
+    plexus-drools
+    plexus-formica
+    plexus-formica-web
+    plexus-hibernate
+    plexus-i18n
+    plexus-interactivity
+    plexus-ircbot
+    plexus-jdo
+    plexus-jetty-httpd
+    plexus-jetty
+    plexus-mimetyper
+    plexus-mail-sender
+    plexus-notification
+    plexus-resources
+    plexus-taskqueue
+    plexus-velocity
+    plexus-xmlrpc
+  
+  
+    scm:svn:http://svn.codehaus.org/plexus/plexus-components/trunk/
+    scm:svn:https://svn.codehaus.org/plexus/plexus-components/trunk
+    http://fisheye.codehaus.org/browse/plexus/plexus-components/trunk/
+  
+  
+    
+      
+        org.codehaus.plexus
+        plexus-maven-plugin
+        1.3.4
+        
+          
+            
+              descriptor
+            
+          
+        
+      
+    
+  
+  
+    
+      
+        maven-javadoc-plugin
+      
+      
+        maven-jxr-plugin
+      
+      
+        org.codehaus.plexus
+        plexus-maven-plugin
+        1.3.4
+            
+    
+    
+

Added: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus-spring/1.2/plexus-spring-1.2.pom
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus-spring/1.2/plexus-spring-1.2.pom?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus-spring/1.2/plexus-spring-1.2.pom (added)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus-spring/1.2/plexus-spring-1.2.pom Tue Dec  1 16:01:31 2009
@@ -0,0 +1,232 @@
+
+
+
+  
+    org.codehaus.plexus
+    plexus-components
+    1.1.12
+  
+  4.0.0
+  org.codehaus.plexus
+  plexus-spring
+  1.2
+  Plexus to Spring Adapter
+
+  Bridge utility to use plexus components in a SpringFramework context.
+  
+    2.5.5
+  
+  
+    
+      org.springframework
+      spring-context
+      ${springVersion}
+    
+    
+      org.springframework
+      spring-web
+      ${springVersion}
+      true
+    
+    
+      org.springframework
+      spring-test
+      ${springVersion}
+      test
+    
+    
+      commons-lang
+      commons-lang
+      2.4
+    
+    
+      org.codehaus.plexus
+      plexus-component-api
+      1.0-alpha-22
+    
+    
+      dom4j
+      dom4j
+      1.6.1
+    
+    
+      com.opensymphony
+      webwork
+      2.2.6
+      true
+    
+    
+      javax.servlet
+      servlet-api
+      2.3
+      true
+    
+    
+      org.codehaus.plexus
+      plexus-utils
+      1.5.1
+    	
+
+    
+    
+      org.apache.struts
+      struts2-spring-plugin
+      2.1.2
+      true
+    
+    
+    
+      org.slf4j
+      slf4j-api
+      1.5.0
+          
+    
+      org.slf4j
+      slf4j-log4j12
+      1.5.0
+      test
+    
+
+    
+      junit
+      junit
+      3.8.2
+      compile
+      true
+    
+    
+      org.codehaus.plexus
+      plexus-log4j-logging
+      1.1-alpha-3
+      test
+      
+      	      		 
+          log4j
+          log4j
+        	      
+      
+    
+    
+      log4j
+      log4j
+      1.2.14
+      test
+    
+    
+      org.apache.maven
+      maven-artifact
+      test
+      2.0.8
+    	 
+    
+      org.apache.maven
+      maven-project
+      2.0.8 
+      test
+    
+    
+      org.apache.maven
+      maven-core
+      2.0.8
+      test
+    	   
+    
+      org.apache.maven
+      maven-settings
+      2.0.8
+      test		
+    	  
+    
+      org.apache.maven
+      maven-model
+      2.0.8
+      test		
+    	
+    
+      org.codehaus.plexus
+      plexus-command-line
+      1.0-alpha-2
+      test
+      
+        
+          org.codehaus.plexus
+          plexus-utils	
+        
+      
+    
+    
+      org.codehaus.plexus.registry
+      plexus-registry-commons
+      1.0-alpha-3
+      test
+      
+        
+          ant
+          ant-optional
+        
+        
+          jdom
+          jdom
+        
+        
+          commons-logging
+          commons-logging-api
+        
+      
+        
+    
+      org.codehaus.plexus.registry
+      plexus-registry-api
+      1.0-alpha-3
+      test
+    
+  
+
+  
+    
+      nicolas@apache.org
+      Nicolas De Loof
+    
+  
+
+  
+    
+      
+        maven-compiler-plugin
+        2.0.2
+        
+          1.5
+          1.5
+        
+      
+      
+        maven-release-plugin
+        2.0-beta-7
+        
+          true  
+          https://svn.codehaus.org/plexus/plexus-components/tags/
+          -Prelease
+            
+      
+    
+  
+
+  
+    scm:svn:http://svn.codehaus.org/plexus/plexus-components/tags/plexus-spring-1.2
+    scm:svn:https://svn.codehaus.org/plexus/plexus-components/tags/plexus-spring-1.2
+    http://fisheye.codehaus.org/browse/plexus/plexus-components/tags/plexus-spring-1.2
+  
+  
+

Added: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom (added)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom Tue Dec  1 16:01:31 2009
@@ -0,0 +1,273 @@
+
+  4.0.0
+  org.codehaus.plexus
+  plexus
+  pom
+  Plexus
+  1.0.10
+  
+    
+      
+        mail
+        
+          dev@plexus.codehaus.org
+        
+      
+      
+        irc
+        
+          irc.codehaus.org
+          6667
+          #plexus
+        
+            
+    
+  
+  2001
+  
+    
+      Plexus User List
+      http://xircles.codehaus.org/manage_email/user%40plexus.codehaus.org
+      http://xircles.codehaus.org/manage_email/user%40plexus.codehaus.org
+      http://archive.plexus.codehaus.org/user
+    
+    
+      Plexus Developer List
+      http://xircles.codehaus.org/manage_email/dev%40plexus.codehaus.org
+      http://xircles.codehaus.org/manage_email/dev%40plexus.codehaus.org
+      http://archive.plexus.codehaus.org/dev
+    
+    
+      Plexus Announce List
+      http://xircles.codehaus.org/manage_email/announce%40plexus.codehaus.org
+      http://xircles.codehaus.org/manage_email/announce%40plexus.codehaus.org
+      http://archive.plexus.codehaus.org/announce
+    
+    
+      Plexus Commit List
+      http://xircles.codehaus.org/manage_email/scm%40plexus.codehaus.org
+      http://xircles.codehaus.org/manage_email/scm%40plexus.codehaus.org
+      http://archive.plexus.codehaus.org/scm
+    
+  
+  
+    JIRA
+    http://jira.codehaus.org/browse/PLX
+  
+
+  
+    
+      codehaus.org
+      Plexus Central Repository
+      dav:https://dav.codehaus.org/repository/plexus
+    
+    
+      codehaus.org
+      Plexus Central Development Repository
+      dav:https://dav.codehaus.org/snapshots.repository/plexus
+    
+    
+      codehaus.org
+      dav:https://dav.codehaus.org/plexus
+    
+  
+  
+    
+      codehaus.snapshots
+      Codehaus Snapshot Development Repository
+      http://snapshots.repository.codehaus.org
+      
+        false
+      
+    
+  
+
+  
+    
+      jvanzyl
+      Jason van Zyl
+      jason@maven.org
+      
+        Developer
+        Release Manager
+      
+    
+    
+      kaz
+      Pete Kazmier
+      
+      
+      
+        Developer
+      
+    
+    
+      jtaylor
+      James Taylor
+      james@jamestaylor.org
+      
+      
+        Developer
+      
+    
+    
+      dandiep
+      Dan Diephouse
+      dan@envoisolutions.com
+      Envoi solutions
+      
+        Developer
+      
+    
+    
+      kasper
+      Kasper Nielsen
+      apache@kav.dk
+      
+      
+        Developer
+      
+    
+    
+      bwalding
+      Ben Walding
+      bwalding@codehaus.org
+      Walding Consulting Services
+      
+        Developer
+      
+    
+    
+      mhw
+      Mark Wilkinson
+      mhw@kremvax.net
+      
+        Developer
+      
+    
+    
+      michal
+      Michal Maczka
+      mmaczka@interia.pl
+      
+        Developer
+      
+    
+    
+      evenisse
+      Emmanuel Venisse
+      evenisse@codehaus.org
+      
+        Developer
+      
+    
+    
+      Trygve Laugstol
+      trygvis
+      trygvis@codehaus.org
+      
+        Developer
+      
+    
+    
+      Kenney Westerhof
+      kenney
+      kenney@codehaus.org
+      
+        Developer
+      
+    
+    
+      Carlos Sanchez
+      carlos
+      carlos@codehaus.org
+      
+        Developer
+      
+    
+    
+      Brett Porter
+      brett
+      brett@codehaus.org
+      
+        Developer
+      
+    
+    
+      John Casey
+      jdcasey
+      jdcasey@codehaus.org
+      
+        Developer
+      
+    
+    
+      Andrew Williams
+      handyande
+      andy@handyande.co.uk
+      
+        Developer
+      
+    
+    
+      Rahul Thakur
+      rahul
+      rahul.thakur.xdev@gmail.com
+      
+        Developer
+      
+    
+    
+      Joakim Erdfelt
+      joakime
+      joakim@erdfelt.com
+      
+        Developer
+      
+    
+    
+      Olivier Lamy
+      olamy
+      olamy@codehaus.org
+      
+        Developer
+      
+    
+  
+  
+    
+      junit
+      junit
+      3.8.1
+      test
+    
+  
+  
+    scm:svn:http://svn.codehaus.org/plexus/pom/tags/plexus-1.0.10
+    scm:svn:https://svn.codehaus.org/plexus/pom/tags/plexus-1.0.10
+    http://fisheye.codehaus.org/browse/plexus/pom/tags/plexus-1.0.10
+  
+  
+    Codehaus
+    http://www.codehaus.org/
+  
+  
+    
+      
+        org.apache.maven.plugins
+        maven-compiler-plugin
+        
+          1.4
+          1.4
+        
+      
+    
+    
+      
+        org.apache.maven.wagon
+        wagon-webdav
+        1.0-beta-2
+      
+    
+  
+

Added: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/commons-io/1.4/commons-io-1.4.pom
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/commons-io/1.4/commons-io-1.4.pom?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/commons-io/1.4/commons-io-1.4.pom (added)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/commons-io/1.4/commons-io-1.4.pom Tue Dec  1 16:01:31 2009
@@ -0,0 +1,419 @@
+
+
+
+  
+    org.apache.commons
+    commons-parent
+    7
+  
+  4.0.0
+  commons-io
+  commons-io
+  1.4
+  Commons IO
+
+  2002
+  
+        Commons-IO contains utility classes, stream implementations, file filters, file comparators and endian classes.
+  
+
+  http://commons.apache.org/io/
+
+  
+    jira
+    http://issues.apache.org/jira/browse/IO
+  
+
+  
+    scm:svn:http://svn.apache.org/repos/asf/commons/proper/io/trunk
+    scm:svn:https://svn.apache.org/repos/asf/commons/proper/io/trunk
+    http://svn.apache.org/viewvc/commons/proper/io/trunk
+  
+
+  
+    
+      Scott Sanders
+      sanders
+      sanders@apache.org
+      
+      
+        Java Developer
+      
+    
+    
+      dIon Gillard
+      dion
+      dion@apache.org
+      
+      
+        Java Developer
+      
+    
+    
+      Nicola Ken Barozzi
+      nicolaken
+      nicolaken@apache.org
+      
+      
+        Java Developer
+      
+    
+    
+      Henri Yandell
+      bayard
+      bayard@apache.org
+      
+      
+        Java Developer
+      
+    
+    
+      Stephen Colebourne
+      scolebourne
+      
+      
+        Java Developer
+      
+      0
+    
+    
+      Jeremias Maerki
+      jeremias
+      jeremias@apache.org
+      
+      
+        Java Developer
+      
+      +1
+    
+    
+      Matthew Hawthorne
+      matth
+      matth@apache.org
+      
+      
+        Java Developer
+      
+    
+    
+      Martin Cooper
+      martinc
+      martinc@apache.org
+      
+      
+        Java Developer
+      
+    
+    
+      Rob Oxspring
+      roxspring
+      roxspring@apache.org
+      
+      
+        Java Developer
+      
+    
+    
+      Jochen Wiedmann
+      jochen
+      jochen.wiedmann@gmail.com
+    
+    
+      Niall Pemberton
+      niallp
+      
+        Java Developer
+      
+    
+    
+      Jukka Zitting
+      jukka
+      
+        Java Developer
+      
+    
+  
+
+  
+    
+      Rahul Akolkar
+    
+    
+      Jason Anderson
+    
+    
+      Nathan Beyer
+    
+    
+      Emmanuel Bourg
+    
+    
+      Chris Eldredge
+    
+    
+      Magnus Grimsell
+    
+    
+      Jim Harrington
+    
+    
+      Thomas Ledoux
+    
+    
+      Andy Lehane
+    
+    
+      Marcelo Liberato
+    
+    
+      Alban Peignier
+      alban.peignier at free.fr
+    
+    
+      Ian Springer
+    
+    
+      Masato Tezuka
+    
+    
+      James Urie
+    
+    
+      Frank W. Zammetti
+    
+  
+
+  
+    
+      junit
+      junit
+      3.8.1
+      test
+    
+  
+
+  
+    src/java
+    src/test
+    
+      
+        org.apache.maven.plugins
+        maven-surefire-plugin
+          
+            
+              **/*Test*
+            
+            
+              **/*AbstractTestCase*
+              **/AllIOTestSuite*
+              **/PackageTestSuite*
+              **/testtools/**
+
+              
+              **/*$*
+            
+        
+      
+      
+        maven-assembly-plugin
+        
+          
+            src/main/assembly/bin.xml
+            src/main/assembly/src.xml
+          
+          gnu
+        
+      
+
+      
+        maven-jar-plugin
+        
+          
+            
+            
+              org.apache.commons.io
+              http://www.apache.org/licenses/LICENSE-2.0.txt
+              2
+              Apache Commons IO Bundle
+              ${project.organization.name}
+              ${project.version}
+              
+org.apache.commons.io;version=${project.version},
+org.apache.commons.io.comparator;version=${project.version},
+org.apache.commons.io.filefilter;version=${project.version},
+org.apache.commons.io.input;version=${project.version},
+org.apache.commons.io.output;version=${project.version}
+              
+              
+org.apache.commons.io;version=${project.version},
+org.apache.commons.io.comparator;version=${project.version},
+org.apache.commons.io.filefilter;version=${project.version},
+org.apache.commons.io.input;version=${project.version},
+org.apache.commons.io.output;version=${project.version}
+              
+            
+          
+        
+      
+    
+  
+
+  
+    
+      
+        org.codehaus.mojo
+        cobertura-maven-plugin
+      
+      
+        org.apache.maven.plugins
+        maven-changes-plugin
+        2.0-beta-3
+        
+          %URL%/../%ISSUE%
+          
+          &&resolution=1&fixfor=12312101
+        
+        
+          
+            
+              jira-report
+            
+          
+        
+      
+      
+        org.apache.maven.plugins
+        maven-checkstyle-plugin
+        2.1
+        
+          checkstyle.xml
+          false
+        
+      
+      
+        org.apache.maven.plugins
+        maven-javadoc-plugin
+        2.3
+        
+          1.4
+          
+            http://java.sun.com/j2se/1.4.2/docs/api
+          
+        
+      
+      
+        org.codehaus.mojo
+        clirr-maven-plugin
+        2.1
+        
+          1.3.2
+          info
+        
+      
+    
+  
+
+  
+    
+      release
+      
+        
+          
+            maven-site-plugin
+            
+              
+                
+                  site
+                
+                package
+              
+            
+          
+          
+            maven-antrun-plugin
+            
+              
+                
+                  run
+                
+                package
+                
+                  
+                    
+                      
+                    
+                  
+                
+              
+            
+          
+          
+            maven-assembly-plugin
+            
+              
+                
+                  attached
+                
+                package
+              
+            
+          
+        
+      
+    
+    
+      rc
+      
+        
+          
+            maven-site-plugin
+            
+              
+                
+                  site
+                
+                package
+              
+            
+          
+          
+            maven-assembly-plugin
+            
+              
+                
+                  attached
+                
+                package
+              
+            
+          
+        
+      
+    
+  
+

Added: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml (added)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml Tue Dec  1 16:01:31 2009
@@ -0,0 +1,33 @@
+
+
+
+  
+    
+      org.apache.archiva.metadata.repository.MetadataResolver
+      org.apache.archiva.metadata.repository.TestMetadataResolver
+      default
+      per-lookup
+    
+    
+      org.apache.maven.archiva.configuration.ArchivaConfiguration
+      org.apache.archiva.configuration.TestConfiguration
+    
+  
+
\ No newline at end of file

Modified: archiva/branches/MRM-1025/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/pom.xml?rev=885812&r1=885811&r2=885812&view=diff
==============================================================================
--- archiva/branches/MRM-1025/pom.xml (original)
+++ archiva/branches/MRM-1025/pom.xml Tue Dec  1 16:01:31 2009
@@ -1097,6 +1097,17 @@
         
       
       
+        org.apache.maven.shared
+        maven-dependency-tree
+        1.2
+        
+          
+            org.codehaus.plexus
+            plexus-container-default
+          
+        
+      
+      
         org.apache.maven
         maven-artifact-manager
         ${maven.version}
@@ -1109,6 +1120,11 @@
       
       
         org.apache.maven
+        maven-artifact
+        ${maven.version}
+      
+      
+        org.apache.maven
         maven-repository-metadata
         ${maven.version}

svn commit: r885812 [1/2] - in /archiva/branches/MRM-1025: ./ archiva-modules/archiva-base/ archiva-modules/archiva-base/archiva-dependency-graph/ archiva-modules/archiva-web/archiva-webapp/ archiva-modules/archiva-web/archiva-webapp/src/main/java/org/...

2009-12-01T16:01:33Z

Author: brett
Date: Tue Dec  1 16:01:31 2009
New Revision: 885812

URL: http://svn.apache.org/viewvc?rev=885812&view=rev
Log:
[MRM-1292] replace the dependency graph by a maven-dependency-tree based implementation (maven-project is not used)

Added:
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilder.java
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus-components/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus-components/1.1.12/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus-spring/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus-spring/1.2/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus-spring/1.2/plexus-spring-1.2.pom
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus/1.0.10/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/commons-io/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/commons-io/1.4/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/commons-io/1.4/commons-io-1.4.pom
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml
Removed:
    archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-dependency-graph/
Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-base/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTree.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTreeTag.java
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/pom.xml
    archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
    archiva/branches/MRM-1025/pom.xml

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-base/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/pom.xml?rev=885812&r1=885811&r2=885812&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-base/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-base/pom.xml Tue Dec  1 16:01:31 2009
@@ -38,7 +38,6 @@
     archiva-consumers
     archiva-indexer
     archiva-model
-    archiva-dependency-graph
     archiva-repository-layer
     archiva-xml-tools
     archiva-proxy

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=885812&r1=885811&r2=885812&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml Tue Dec  1 16:01:31 2009
@@ -31,10 +31,6 @@
   
     
       org.apache.archiva
-      archiva-dependency-graph
-    
-    
-      org.apache.archiva
       archiva-report-manager
     
     

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTree.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTree.java?rev=885812&r1=885811&r2=885812&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTree.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTree.java Tue Dec  1 16:01:31 2009
@@ -23,63 +23,54 @@
 import java.util.List;
 import java.util.Stack;
 
-import javax.servlet.jsp.PageContext;
-
+import com.opensymphony.xwork2.ActionContext;
+import org.apache.archiva.dependency.tree.maven2.DependencyTreeBuilder;
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archiva.common.ArchivaException;
-import org.apache.maven.archiva.dependency.DependencyGraphFactory;
-import org.apache.maven.archiva.dependency.graph.DependencyGraph;
-import org.apache.maven.archiva.dependency.graph.DependencyGraphBuilder;
-import org.apache.maven.archiva.dependency.graph.DependencyGraphEdge;
-import org.apache.maven.archiva.dependency.graph.DependencyGraphNode;
-import org.apache.maven.archiva.dependency.graph.GraphTaskException;
-import org.apache.maven.archiva.dependency.graph.walk.BaseVisitor;
-import org.apache.maven.archiva.dependency.graph.walk.DependencyGraphWalker;
-import org.apache.maven.archiva.dependency.graph.walk.WalkDepthFirstSearch;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.DependencyScope;
 import org.apache.maven.archiva.model.Keys;
-import org.apache.maven.archiva.model.VersionedReference;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+import org.apache.maven.archiva.security.ArchivaXworkUser;
+import org.apache.maven.archiva.security.UserRepositories;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.shared.dependency.tree.DependencyNode;
+import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
+import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * DependencyTree 
+ * DependencyTree
  *
  * @version $Id$
- * 
- * @plexus.component role="org.apache.maven.archiva.web.tags.DependencyTree" 
+ * @plexus.component role="org.apache.maven.archiva.web.tags.DependencyTree"
  */
 public class DependencyTree
-    implements Initializable
 {
     private Logger log = LoggerFactory.getLogger( DependencyTree.class );
-    
+
     /**
-     * @plexus.requirement
-     *              role="org.apache.maven.archiva.dependency.graph.DependencyGraphBuilder"
-     *              role-hint="project-model"
+     * @plexus.requirement role-hint="maven2"
      */
-    private DependencyGraphBuilder graphBuilder;
+    private DependencyTreeBuilder dependencyTreeBuilder;
 
-    private DependencyGraphFactory graphFactory = new DependencyGraphFactory();
+    /**
+     * @plexus.requirement
+     */
+    private UserRepositories userRepositories;
 
-    public class TreeEntry
+    public static class TreeEntry
     {
         private String pre = "";
 
         private String post = "";
 
-        private ArtifactReference artifact;
+        private Artifact artifact;
 
-        public void setArtifact( ArtifactReference artifact )
+        public void setArtifact( Artifact artifact )
         {
             this.artifact = artifact;
         }
 
-        public ArtifactReference getArtifact()
+        public Artifact getArtifact()
         {
             return artifact;
         }
@@ -89,21 +80,11 @@
             return post;
         }
 
-        public void setPost( String post )
-        {
-            this.post = post;
-        }
-
         public String getPre()
         {
             return pre;
         }
 
-        public void setPre( String pre )
-        {
-            this.pre = pre;
-        }
-
         public void appendPre( String string )
         {
             this.pre += string;
@@ -115,59 +96,64 @@
         }
     }
 
-    public List gatherTreeList( String groupId, String artifactId, String modelVersion, String nodevar,
-                                PageContext pageContext ) throws ArchivaException
+    public List gatherTreeList( String groupId, String artifactId, String modelVersion )
+        throws ArchivaException
     {
         if ( StringUtils.isBlank( groupId ) )
         {
-            String emsg = "Error generating dependency tree [" + Keys.toKey( groupId, artifactId, modelVersion )
-                + "]: groupId is blank.";
+            String emsg = "Error generating dependency tree [" + Keys.toKey( groupId, artifactId, modelVersion ) +
+                "]: groupId is blank.";
             log.error( emsg );
             throw new ArchivaException( emsg );
         }
 
         if ( StringUtils.isBlank( artifactId ) )
         {
-            String emsg = "Error generating dependency tree [" + Keys.toKey( groupId, artifactId, modelVersion )
-                + "]: artifactId is blank.";
+            String emsg = "Error generating dependency tree [" + Keys.toKey( groupId, artifactId, modelVersion ) +
+                "]: artifactId is blank.";
             log.error( emsg );
             throw new ArchivaException( emsg );
         }
 
         if ( StringUtils.isBlank( modelVersion ) )
         {
-            String emsg = "Error generating dependency tree [" + Keys.toKey( groupId, artifactId, modelVersion )
-                + "]: version is blank.";
+            String emsg = "Error generating dependency tree [" + Keys.toKey( groupId, artifactId, modelVersion ) +
+                "]: version is blank.";
             log.error( emsg );
             throw new ArchivaException( emsg );
         }
 
-        DependencyGraph graph = fetchGraph( groupId, artifactId, modelVersion );
+        // TODO Cache the results to disk, in XML format, in the same place as the artifact is located.
 
-        if ( graph == null )
+        TreeListVisitor visitor = new TreeListVisitor();
+        try
+        {
+            dependencyTreeBuilder.buildDependencyTree( userRepositories.getObservableRepositoryIds( getPrincipal() ),
+                                                       groupId, artifactId, modelVersion, visitor );
+        }
+        catch ( DependencyTreeBuilderException e )
         {
-            throw new ArchivaException( "Graph is unexpectedly null." );
+            throw new ArchivaException( "Unable to build dependency tree: " + e.getMessage(), e );
         }
 
-        TreeListVisitor treeListVisitor = new TreeListVisitor();
-        DependencyGraphWalker walker = new WalkDepthFirstSearch();
-        walker.visit( graph, treeListVisitor );
+        return visitor.getList();
+    }
 
-        return treeListVisitor.getList();
+    private String getPrincipal()
+    {
+        return ArchivaXworkUser.getActivePrincipal( ActionContext.getContext().getSession() );
     }
 
-    class TreeListVisitor
-        extends BaseVisitor
+    private static class TreeListVisitor
+        implements DependencyNodeVisitor
     {
         private List list;
 
-        private int walkDepth;
+        private TreeEntry currentEntry;
 
-        private int outputDepth;
+        boolean firstChild = true;
 
-        private Stack entryStack = new Stack();
-
-        private TreeEntry currentEntry;
+        private DependencyNode firstNode;
 
         public TreeListVisitor()
         {
@@ -179,86 +165,48 @@
             return this.list;
         }
 
-        public void discoverGraph( DependencyGraph graph )
+        public boolean visit( DependencyNode node )
         {
-            super.discoverGraph( graph );
-            this.list.clear();
-            this.entryStack.clear();
-            walkDepth = 0;
-            outputDepth = -1;
-        }
+            if ( firstNode == null )
+            {
+                firstNode = node;
+            }
 
-        public void discoverNode( DependencyGraphNode node )
-        {
-            super.discoverNode( node );
             currentEntry = new TreeEntry();
 
-            while ( walkDepth > outputDepth )
+            if ( firstChild )
             {
                 currentEntry.appendPre( "" );
-                outputDepth++;
             }
+
             currentEntry.appendPre( "" );
             currentEntry.setArtifact( node.getArtifact() );
             currentEntry.appendPost( "" );
             this.list.add( currentEntry );
-            this.entryStack.push( currentEntry );
-        }
-
-        public void finishNode( DependencyGraphNode node )
-        {
-            super.finishNode( node );
 
-            while ( walkDepth < outputDepth )
+            if ( !node.getChildren().isEmpty() )
             {
-                currentEntry.appendPost( "" );
-                outputDepth--;
+                firstChild = true;
             }
 
-            this.entryStack.pop();
-        }
-
-        public void discoverEdge( DependencyGraphEdge edge )
-        {
-            super.discoverEdge( edge );
-            walkDepth++;
+            return true;
         }
 
-        public void finishEdge( DependencyGraphEdge edge )
+        public boolean endVisit( DependencyNode node )
         {
-            super.finishEdge( edge );
-            walkDepth--;
-        }
-    }
-
-    private DependencyGraph fetchGraph( String groupId, String artifactId, String modelVersion )
-        throws ArchivaException
-    {
-        // TODO Cache the results to disk, in XML format, in the same place as the artifact is located.
+            firstChild = false;
 
-        VersionedReference projectRef = new VersionedReference();
-        projectRef.setGroupId( groupId );
-        projectRef.setArtifactId( artifactId );
-        projectRef.setVersion( modelVersion );
+            if ( !node.getChildren().isEmpty() )
+            {
+                currentEntry.appendPost( "" );
+            }
 
-        try
-        {
-            DependencyGraph depGraph = graphFactory.getGraph( projectRef );
+            if ( node == firstNode )
+            {
+                currentEntry.appendPost( "" );
+            }
 
-            return depGraph;
-        }
-        catch ( GraphTaskException e )
-        {
-            String emsg = "Unable to generate graph for [" + Keys.toKey( projectRef ) + "] : " + e.getMessage();
-            log.warn( emsg, e );
-            throw new ArchivaException( emsg, e );
+            return true;
         }
     }
-
-    public void initialize()
-        throws InitializationException
-    {
-        this.graphFactory.setGraphBuilder( graphBuilder );
-        this.graphFactory.setDesiredScope( DependencyScope.TEST );
-    }
 }

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTreeTag.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTreeTag.java?rev=885812&r1=885811&r2=885812&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTreeTag.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DependencyTreeTag.java Tue Dec  1 16:01:31 2009
@@ -83,7 +83,7 @@
 
         if ( treeIterator.hasNext() )
         {
-            currentTreeEntry = (TreeEntry) treeIterator.next();
+            currentTreeEntry = treeIterator.next();
             out( currentTreeEntry.getPre() );
             exposeVariables();
             return EVAL_BODY_AGAIN;
@@ -132,7 +132,7 @@
         out( "" );
         try
         {
-            this.tree = deptree.gatherTreeList( groupId, artifactId, modelVersion, nodevar, pageContext );
+            this.tree = deptree.gatherTreeList( groupId, artifactId, modelVersion );
     
             if ( CollectionUtils.isEmpty( this.tree ) )
             {
@@ -141,7 +141,7 @@
     
             treeIterator = tree.iterator();
     
-            currentTreeEntry = (TreeEntry) treeIterator.next();
+            currentTreeEntry = treeIterator.next();
             out( currentTreeEntry.getPre() );
             exposeVariables();
         }

Added: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java (added)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java Tue Dec  1 16:01:31 2009
@@ -0,0 +1,64 @@
+package org.apache.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.maven.archiva.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.configuration.Configuration;
+import org.apache.maven.archiva.configuration.ConfigurationListener;
+import org.apache.maven.archiva.configuration.IndeterminateConfigurationException;
+import org.codehaus.plexus.registry.RegistryException;
+import org.codehaus.plexus.registry.RegistryListener;
+
+public class TestConfiguration
+    implements ArchivaConfiguration
+{
+    private Configuration configuration;
+
+    public Configuration getConfiguration()
+    {
+        return configuration;
+    }
+
+    public void save( Configuration configuration )
+        throws RegistryException, IndeterminateConfigurationException
+    {
+        this.configuration = configuration;
+    }
+
+    public boolean isDefaulted()
+    {
+        return false;
+    }
+
+    public void addListener( ConfigurationListener listener )
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    public void removeListener( ConfigurationListener listener )
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    public void addChangeListener( RegistryListener listener )
+    {
+        throw new UnsupportedOperationException();
+    }
+}

Added: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java (added)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java Tue Dec  1 16:01:31 2009
@@ -0,0 +1,131 @@
+package org.apache.maven.archiva.web.tags;
+
+/*
+ * 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.List;
+
+import org.apache.archiva.metadata.model.ProjectVersionMetadata;
+import org.apache.archiva.metadata.repository.MetadataResolver;
+import org.apache.archiva.metadata.repository.memory.TestMetadataResolver;
+import org.apache.maven.archiva.common.ArchivaException;
+import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.configuration.Configuration;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
+
+public class DependencyTreeTest
+    extends PlexusInSpringTestCase
+{
+    private DependencyTree tree;
+
+    private ArtifactFactory artifactFactory;
+
+    private static final String TEST_VERSION = "version";
+
+    private static final String TEST_REPO_ID = "test-repo";
+
+    private static final String TEST_GROUP_ID = "groupId";
+
+    private static final String TEST_ARTIFACT_ID = "artifactId";
+
+    @Override
+    protected void setUp()
+        throws Exception
+    {
+        super.setUp();
+
+        Configuration configuration = new Configuration();
+        ManagedRepositoryConfiguration repoConfig = new ManagedRepositoryConfiguration();
+        repoConfig.setId( TEST_REPO_ID );
+        repoConfig.setLocation( getTestPath( "src/test/repositories/test" ) );
+        configuration.addManagedRepository( repoConfig );
+
+        ArchivaConfiguration archivaConfiguration = (ArchivaConfiguration) lookup( ArchivaConfiguration.class );
+        archivaConfiguration.save( configuration );
+
+        tree = (DependencyTree) lookup( DependencyTree.class );
+
+        artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.class );
+
+        TestMetadataResolver metadataResolver = (TestMetadataResolver) lookup( MetadataResolver.class );
+        ProjectVersionMetadata metadata = new ProjectVersionMetadata();
+        metadata.setId( TEST_VERSION );
+        metadataResolver.setProjectVersion( TEST_REPO_ID, TEST_GROUP_ID, TEST_ARTIFACT_ID, metadata );
+    }
+
+    public void testTree()
+        throws ArchivaException
+    {
+        List entries = tree.gatherTreeList( TEST_GROUP_ID, TEST_ARTIFACT_ID, TEST_VERSION );
+        assertEquals( 8, entries.size() );
+
+        DependencyTree.TreeEntry artifactId = entries.get( 0 );
+        assertEquals( "", artifactId.getPre() );
+        assertEquals( createPomArtifact( TEST_GROUP_ID, TEST_ARTIFACT_ID, TEST_VERSION ), artifactId.getArtifact() );
+        assertEquals( "", artifactId.getPost() );
+
+        DependencyTree.TreeEntry child1 = entries.get( 1 );
+        assertEquals( "", child1.getPre() );
+        assertEquals( createArtifact( TEST_GROUP_ID, "child1", "1.0" ), child1.getArtifact() );
+        assertEquals( "", child1.getPost() );
+
+        DependencyTree.TreeEntry grandchild = entries.get( 2 );
+        assertEquals( "", grandchild.getPre() );
+        assertEquals( createArtifact( TEST_GROUP_ID, "grandchild1", "2.0" ), grandchild.getArtifact() );
+        assertEquals( "", grandchild.getPost() );
+
+        DependencyTree.TreeEntry greatGrandchild = entries.get( 3 );
+        assertEquals( "", greatGrandchild.getPre() );
+        assertEquals( createArtifact( TEST_GROUP_ID, "great-grandchild", "3.0" ), greatGrandchild.getArtifact() );
+        assertEquals( "", greatGrandchild.getPost() );
+
+        DependencyTree.TreeEntry child2 = entries.get( 4 );
+        assertEquals( "", child2.getPre() );
+        assertEquals( createArtifact( TEST_GROUP_ID, "child2", "1.0" ), child2.getArtifact() );
+        assertEquals( "", child2.getPost() );
+
+        DependencyTree.TreeEntry grandchild2 = entries.get( 5 );
+        assertEquals( "", grandchild2.getPre() );
+        assertEquals( createArtifact( TEST_GROUP_ID, "grandchild2", "2.0" ), grandchild2.getArtifact() );
+        assertEquals( "", grandchild2.getPost() );
+
+        DependencyTree.TreeEntry grandchild3 = entries.get( 6 );
+        assertEquals( "", grandchild3.getPre() );
+        assertEquals( createArtifact( TEST_GROUP_ID, "grandchild3", "2.0" ), grandchild3.getArtifact() );
+        assertEquals( "", grandchild3.getPost() );
+
+        DependencyTree.TreeEntry child3 = entries.get( 7 );
+        assertEquals( "", child3.getPre() );
+        assertEquals( createArtifact( TEST_GROUP_ID, "child3", "1.0" ), child3.getArtifact() );
+        assertEquals( "", child3.getPost() );
+    }
+
+    private Artifact createPomArtifact( String groupId, String artifactId, String version )
+    {
+        return artifactFactory.createProjectArtifact( groupId, artifactId, version );
+    }
+
+    private Artifact createArtifact( String groupId, String artifactId, String version )
+    {
+        return artifactFactory.createBuildArtifact( groupId, artifactId, version, "jar" );
+    }
+}

Added: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom (added)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom Tue Dec  1 16:01:31 2009
@@ -0,0 +1,43 @@
+
+
+
+  4.0.0
+  groupId
+  artifactId
+  version
+
+  
+    
+      groupId
+      child1
+      1.0
+    
+    
+      groupId
+      child2
+      1.0
+    
+    
+      groupId
+      child3
+      1.0
+    
+  
+
\ No newline at end of file

Added: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom (added)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom Tue Dec  1 16:01:31 2009
@@ -0,0 +1,33 @@
+
+
+
+  4.0.0
+  groupId
+  child1
+  1.0
+
+  
+    
+      groupId
+      grandchild1
+      2.0
+    
+  
+
\ No newline at end of file

Added: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom (added)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom Tue Dec  1 16:01:31 2009
@@ -0,0 +1,37 @@
+
+
+
+  4.0.0
+  groupId
+  child2
+  1.0
+  
+    
+      groupId
+      grandchild2
+      2.0
+    
+    
+      groupId
+      grandchild3
+      2.0
+    
+  
+
\ No newline at end of file

Added: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom (added)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom Tue Dec  1 16:01:31 2009
@@ -0,0 +1,25 @@
+
+
+
+  4.0.0
+  groupId
+  child3
+  1.0
+
\ No newline at end of file

Added: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom (added)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom Tue Dec  1 16:01:31 2009
@@ -0,0 +1,32 @@
+
+
+
+  4.0.0
+  groupId
+  grandchild1
+  2.0
+  
+    
+      groupId
+      great-grandchild
+      3.0
+    
+  
+
\ No newline at end of file

Added: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom (added)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom Tue Dec  1 16:01:31 2009
@@ -0,0 +1,25 @@
+
+
+
+  4.0.0
+  groupId
+  grandchild2
+  2.0
+
\ No newline at end of file

Added: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom (added)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom Tue Dec  1 16:01:31 2009
@@ -0,0 +1,25 @@
+
+
+
+  4.0.0
+  groupId
+  grandchild2
+  2.0
+
\ No newline at end of file

Added: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom (added)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom Tue Dec  1 16:01:31 2009
@@ -0,0 +1,26 @@
+
+
+
+  4.0.0
+  groupId
+  great-grandchild
+  3.0
+  pom
+
\ No newline at end of file

Added: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml (added)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml Tue Dec  1 16:01:31 2009
@@ -0,0 +1,39 @@
+
+
+
+  
+    
+      org.apache.maven.archiva.security.UserRepositories
+      default
+      org.apache.maven.archiva.security.UserRepositoriesStub
+    
+    
+      org.apache.archiva.metadata.repository.MetadataResolver
+      default
+      org.apache.archiva.metadata.repository.memory.TestMetadataResolver
+      per-lookup
+    
+    
+      org.apache.maven.archiva.configuration.ArchivaConfiguration
+      default
+      org.apache.archiva.configuration.TestConfiguration
+    
+  
+

Modified: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/pom.xml?rev=885812&r1=885811&r2=885812&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/pom.xml Tue Dec  1 16:01:31 2009
@@ -55,6 +55,21 @@
       org.apache.maven
       maven-model-builder
     
+    
+    
+      org.apache.maven
+      maven-artifact
+    
+    
+      org.apache.maven.shared
+      maven-dependency-tree
+      
+        
+          org.apache.maven
+          maven-project
+        
+      
+    
     
       org.apache.archiva
       archiva-configuration

Added: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java (added)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java Tue Dec  1 16:01:31 2009
@@ -0,0 +1,445 @@
+package org.apache.archiva.dependency.tree.maven2;
+
+/*
+ * 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.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.archiva.metadata.repository.MetadataResolver;
+import org.apache.archiva.metadata.repository.MetadataResolverException;
+import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
+import org.apache.archiva.metadata.repository.storage.maven2.RepositoryModelResolver;
+import org.apache.commons.lang.StringUtils;
+import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.metadata.ResolutionGroup;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactCollector;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.ExcludesArtifactFilter;
+import org.apache.maven.artifact.versioning.ArtifactVersion;
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.artifact.versioning.ManagedVersionMap;
+import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.Exclusion;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.building.DefaultModelBuildingRequest;
+import org.apache.maven.model.building.ModelBuilder;
+import org.apache.maven.model.building.ModelBuildingException;
+import org.apache.maven.model.building.ModelBuildingRequest;
+import org.apache.maven.model.resolution.UnresolvableModelException;
+import org.apache.maven.shared.dependency.tree.DependencyNode;
+import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
+import org.apache.maven.shared.dependency.tree.DependencyTreeResolutionListener;
+import org.apache.maven.shared.dependency.tree.filter.AncestorOrSelfDependencyNodeFilter;
+import org.apache.maven.shared.dependency.tree.filter.DependencyNodeFilter;
+import org.apache.maven.shared.dependency.tree.filter.StateDependencyNodeFilter;
+import org.apache.maven.shared.dependency.tree.traversal.BuildingDependencyNodeVisitor;
+import org.apache.maven.shared.dependency.tree.traversal.CollectingDependencyNodeVisitor;
+import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
+import org.apache.maven.shared.dependency.tree.traversal.FilteringDependencyNodeVisitor;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+
+/**
+ * Default implementation of DependencyTreeBuilder. Customized wrapper for maven-dependency-tree to use
+ * maven-model-builder instead of maven-project. Note that the role must differ to avoid conflicting with the
+ * maven-shared implementation.
+ *
+ * @plexus.component role="org.apache.archiva.dependency.tree.maven2.DependencyTreeBuilder" role-hint="maven2"
+ */
+public class DefaultDependencyTreeBuilder
+    extends AbstractLogEnabled
+    implements DependencyTreeBuilder
+{
+    /**
+     * @plexus.requirement
+     */
+    private ArtifactFactory factory;
+
+    /**
+     * @plexus.requirement
+     */
+    private ArtifactCollector collector;
+
+    /**
+     * @plexus.requirement
+     */
+    private ModelBuilder builder;
+
+    /**
+     * @plexus.requirement
+     */
+    private MetadataResolver metadataResolver;
+
+    /**
+     * @plexus.requirement role-hint="maven2"
+     */
+    private RepositoryPathTranslator pathTranslator;
+
+    /**
+     * @plexus.requirement
+     */
+    private ArchivaConfiguration archivaConfiguration;
+
+    public void buildDependencyTree( List repositoryIds, String groupId, String artifactId, String version,
+                                     DependencyNodeVisitor nodeVisitor )
+        throws DependencyTreeBuilderException
+    {
+        DependencyTreeResolutionListener listener = new DependencyTreeResolutionListener( getLogger() );
+
+        Artifact projectArtifact = factory.createProjectArtifact( groupId, artifactId, version );
+        File basedir = findArtifactInRepositories( repositoryIds, projectArtifact );
+
+        if ( basedir == null )
+        {
+            // metadata could not be resolved
+            return;
+        }
+
+        try
+        {
+            Model model =
+                buildProject( new RepositoryModelResolver( basedir, pathTranslator ), groupId, artifactId, version );
+
+            Map managedVersions = createManagedVersionMap( model );
+
+            Set dependencyArtifacts = createArtifacts( model, null );
+
+            ArtifactMetadataSource metadataSource = new MetadataArtifactMetadataSource( repositoryIds );
+
+            // Note that we don't permit going to external repositories. We don't need to pass in a local and remote
+            // since our metadata source has control over them
+            collector.collect( dependencyArtifacts, projectArtifact, managedVersions, null, null, metadataSource, null,
+                               Collections.singletonList( listener ) );
+
+            DependencyNode rootNode = listener.getRootNode();
+
+            // TODO: remove the need for this when the serializer can calculate last nodes from visitor calls only
+            DependencyNodeVisitor visitor = new BuildingDependencyNodeVisitor( nodeVisitor );
+
+            CollectingDependencyNodeVisitor collectingVisitor = new CollectingDependencyNodeVisitor();
+            DependencyNodeVisitor firstPassVisitor =
+                new FilteringDependencyNodeVisitor( collectingVisitor, StateDependencyNodeFilter.INCLUDED );
+            rootNode.accept( firstPassVisitor );
+
+            DependencyNodeFilter secondPassFilter =
+                new AncestorOrSelfDependencyNodeFilter( collectingVisitor.getNodes() );
+            visitor = new FilteringDependencyNodeVisitor( visitor, secondPassFilter );
+
+            rootNode.accept( visitor );
+        }
+        catch ( ArtifactResolutionException e )
+        {
+            throw new DependencyTreeBuilderException( "Cannot build project dependency tree " + e.getMessage(), e );
+        }
+        catch ( InvalidVersionSpecificationException e )
+        {
+            throw new DependencyTreeBuilderException( "Invalid dependency version for artifact " + projectArtifact );
+        }
+        catch ( ModelBuildingException e )
+        {
+            throw new DependencyTreeBuilderException( "Cannot build project dependency tree " + e.getMessage(), e );
+        }
+        catch ( UnresolvableModelException e )
+        {
+            throw new DependencyTreeBuilderException( "Cannot build project dependency tree " + e.getMessage(), e );
+        }
+    }
+
+    private File findArtifactInRepositories( List repositoryIds, Artifact projectArtifact )
+    {
+        for ( String repoId : repositoryIds )
+        {
+            ManagedRepositoryConfiguration repositoryConfiguration =
+                archivaConfiguration.getConfiguration().findManagedRepositoryById( repoId );
+
+            File repoDir = new File( repositoryConfiguration.getLocation() );
+            File file = pathTranslator.toFile( repoDir, projectArtifact.getGroupId(), projectArtifact.getArtifactId(),
+                                               projectArtifact.getBaseVersion(),
+                                               projectArtifact.getArtifactId() + "-" + projectArtifact.getVersion() +
+                                                   ".pom" );
+
+            if ( file.exists() )
+            {
+                return repoDir;
+            }
+        }
+        return null;
+    }
+
+    private Model buildProject( RepositoryModelResolver modelResolver, String groupId, String artifactId,
+                                String version )
+        throws ModelBuildingException, UnresolvableModelException
+    {
+        ModelBuildingRequest req = new DefaultModelBuildingRequest();
+        req.setProcessPlugins( false );
+        req.setModelSource( modelResolver.resolveModel( groupId, artifactId, version ) );
+        req.setModelResolver( modelResolver );
+        req.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
+
+        return builder.build( req ).getEffectiveModel();
+    }
+
+    // from maven-project to avoid the dependency on it
+    private Set createArtifacts( Model model, ArtifactFilter dependencyFilter )
+        throws InvalidVersionSpecificationException
+    {
+        Collection dependencies = model.getDependencies();
+        Set projectArtifacts = new LinkedHashSet( dependencies.size() );
+
+        for ( Dependency dependency : dependencies )
+        {
+            String scope = dependency.getScope();
+
+            if ( StringUtils.isEmpty( scope ) )
+            {
+                scope = Artifact.SCOPE_COMPILE;
+
+                dependency.setScope( scope );
+            }
+
+            VersionRange versionRange = VersionRange.createFromVersionSpec( dependency.getVersion() );
+            Artifact artifact =
+                factory.createDependencyArtifact( dependency.getGroupId(), dependency.getArtifactId(), versionRange,
+                                                  dependency.getType(), dependency.getClassifier(), scope, null,
+                                                  dependency.isOptional() );
+
+            if ( Artifact.SCOPE_SYSTEM.equals( scope ) )
+            {
+                artifact.setFile( new File( dependency.getSystemPath() ) );
+            }
+
+            ArtifactFilter artifactFilter = dependencyFilter;
+
+            // MNG-3769: It would be nice to be able to process relocations here,
+            // so we could have this filtering step apply to post-relocated dependencies.
+            // HOWEVER, this would require a much more invasive POM resolution process
+            // in order to look for relocations, which would make the early steps in
+            // a Maven build way too heavy.
+            if ( artifact != null && ( artifactFilter == null || artifactFilter.include( artifact ) ) )
+            {
+                if ( dependency.getExclusions() != null && !dependency.getExclusions().isEmpty() )
+                {
+                    List exclusions = new ArrayList();
+                    for ( Object o : dependency.getExclusions() )
+                    {
+                        Exclusion e = (Exclusion) o;
+                        exclusions.add( e.getGroupId() + ":" + e.getArtifactId() );
+                    }
+
+                    ArtifactFilter newFilter = new ExcludesArtifactFilter( exclusions );
+
+                    if ( artifactFilter != null )
+                    {
+                        AndArtifactFilter filter = new AndArtifactFilter();
+                        filter.add( artifactFilter );
+                        filter.add( newFilter );
+                        artifactFilter = filter;
+                    }
+                    else
+                    {
+                        artifactFilter = newFilter;
+                    }
+                }
+
+                artifact.setDependencyFilter( artifactFilter );
+
+                projectArtifacts.add( artifact );
+            }
+        }
+
+        return projectArtifacts;
+
+    }
+
+    // from maven-project to avoid the dependency on it
+
+    private Map createManagedVersionMap( Model model )
+        throws InvalidVersionSpecificationException
+    {
+        DependencyManagement dependencyManagement = model.getDependencyManagement();
+
+        Map map = null;
+        List deps;
+        if ( ( dependencyManagement != null ) && ( ( deps = dependencyManagement.getDependencies() ) != null ) &&
+            ( deps.size() > 0 ) )
+        {
+            map = new ManagedVersionMap( map );
+
+            for ( Dependency dependency : dependencyManagement.getDependencies() )
+            {
+
+                VersionRange versionRange = VersionRange.createFromVersionSpec( dependency.getVersion() );
+
+                Artifact artifact =
+                    factory.createDependencyArtifact( dependency.getGroupId(), dependency.getArtifactId(), versionRange,
+                                                      dependency.getType(), dependency.getClassifier(),
+                                                      dependency.getScope(), dependency.isOptional() );
+                if ( getLogger().isDebugEnabled() )
+                {
+                    getLogger().debug( "  " + artifact );
+                }
+
+                // If the dependencyManagement section listed exclusions,
+                // add them to the managed artifacts here so that transitive
+                // dependencies will be excluded if necessary.
+                if ( ( null != dependency.getExclusions() ) && !dependency.getExclusions().isEmpty() )
+                {
+                    List exclusions = new ArrayList();
+
+                    for ( Exclusion exclusion : dependency.getExclusions() )
+                    {
+                        exclusions.add( exclusion.getGroupId() + ":" + exclusion.getArtifactId() );
+                    }
+                    ExcludesArtifactFilter eaf = new ExcludesArtifactFilter( exclusions );
+                    artifact.setDependencyFilter( eaf );
+                }
+                else
+                {
+                    artifact.setDependencyFilter( null );
+                }
+                map.put( dependency.getManagementKey(), artifact );
+            }
+        }
+        else
+        {
+            map = Collections.emptyMap();
+        }
+
+        return map;
+    }
+
+    private class MetadataArtifactMetadataSource
+        implements ArtifactMetadataSource
+    {
+        private final List repositoryIds;
+
+        public MetadataArtifactMetadataSource( List repositoryIds )
+        {
+            this.repositoryIds = repositoryIds;
+        }
+
+        // modified version from MavenMetadataSource to work with the simpler environment
+        public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository,
+                                         List remoteRepositories )
+            throws ArtifactMetadataRetrievalException
+        {
+            // TODO: we removed relocation support here. This is something that might need to be generically handled
+            //       throughout this module
+
+            Artifact pomArtifact =
+                factory.createProjectArtifact( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion(),
+                                               artifact.getScope() );
+
+            File basedir = findArtifactInRepositories( repositoryIds, pomArtifact );
+
+            Model project = null;
+            if ( !Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) && basedir != null )
+            {
+                try
+                {
+                    project =
+                        buildProject( new RepositoryModelResolver( basedir, pathTranslator ), artifact.getGroupId(),
+                                      artifact.getArtifactId(), artifact.getVersion() );
+                }
+                catch ( ModelBuildingException e )
+                {
+                    throw new ArtifactMetadataRetrievalException( e.getMessage(), e, artifact );
+                }
+                catch ( UnresolvableModelException e )
+                {
+                    throw new ArtifactMetadataRetrievalException( e.getMessage(), e, artifact );
+                }
+            }
+
+            ResolutionGroup result;
+
+            if ( project == null )
+            {
+                // TODO: we could record this so that it is displayed in the dependency tree as (...) or similar
+
+                // if the project is null, we encountered an invalid model (read: m1 POM)
+                // we'll just return an empty resolution group.
+                // or used the inherited scope (should that be passed to the buildFromRepository method above?)
+                result = new ResolutionGroup( pomArtifact, Collections.emptySet(), Collections.emptyList() );
+            }
+            else
+            {
+                Set artifacts = Collections.emptySet();
+                if ( !artifact.getArtifactHandler().isIncludesDependencies() )
+                {
+                    try
+                    {
+                        artifacts = createArtifacts( project, artifact.getDependencyFilter() );
+                    }
+                    catch ( InvalidVersionSpecificationException e )
+                    {
+                        throw new ArtifactMetadataRetrievalException( e.getMessage(), e, artifact );
+                    }
+                }
+
+                result = new ResolutionGroup( pomArtifact, artifacts, Collections.emptyList() );
+            }
+
+            return result;
+        }
+
+        public List retrieveAvailableVersions( Artifact artifact, ArtifactRepository localRepository,
+                                               List remoteRepositories )
+            throws ArtifactMetadataRetrievalException
+        {
+            try
+            {
+                Set versions = new HashSet();
+                for ( String repoId : repositoryIds )
+                {
+                    Collection projectVersions =
+                        metadataResolver.getProjectVersions( repoId, artifact.getGroupId(), artifact.getArtifactId() );
+                    for ( String version : projectVersions )
+                    {
+                        versions.add( new DefaultArtifactVersion( version ) );
+                    }
+                }
+
+                return new ArrayList( versions );
+            }
+            catch ( MetadataResolverException e )
+            {
+                throw new ArtifactMetadataRetrievalException( e.getMessage(), e, artifact );
+            }
+        }
+    }
+}

Added: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilder.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilder.java?rev=885812&view=auto
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilder.java (added)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilder.java Tue Dec  1 16:01:31 2009
@@ -0,0 +1,47 @@
+package org.apache.archiva.dependency.tree.maven2;
+
+/*
+ * 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.List;
+
+import org.apache.maven.artifact.factory.DefaultArtifactFactory;
+import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
+import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
+
+/**
+ * Builds a tree of dependencies for a given Maven project. Customized wrapper for maven-dependency-tree to use
+ * maven-model-builder instead of maven-project.
+ */
+public interface DependencyTreeBuilder
+{
+    /**
+     * Builds a tree of dependencies for the specified Maven project.
+     *
+     * @param repositoryIds the list of repositories to search for metadata
+     * @param groupId       the project groupId to build the tree for
+     * @param artifactId    the project artifactId to build the tree for
+     * @param version       the project version to build the tree for
+     * @param nodeVisitor   visitor to apply to all nodes discovered
+     * @throws DependencyTreeBuilderException if the dependency tree cannot be resolved
+     */
+    public void buildDependencyTree( List repositoryIds, String groupId, String artifactId, String version,
+                                     DependencyNodeVisitor nodeVisitor )
+        throws DependencyTreeBuilderException;
+}

svn commit: r885638 - in /archiva/branches/MRM-1025: archiva-cli/src/main/java/org/apache/maven/archiva/cli/ archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/ archiva-modules/archiva-w...

2009-12-01T00:58:34Z

Author: brett
Date: Tue Dec  1 00:58:28 2009
New Revision: 885638

URL: http://svn.apache.org/viewvc?rev=885638&view=rev
Log:
[MRM-1025] remove some consumers that don't actually do anything

Removed:
    archiva/branches/MRM-1025/archiva-cli/src/main/java/org/apache/maven/archiva/cli/ProjectReaderConsumer.java
    archiva/branches/MRM-1025/archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/LocationArtifactsConsumer.java
Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java?rev=885638&r1=885637&r2=885638&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
Tue Dec  1 00:58:28 2009
@@ -44,7 +44,6 @@
 import org.apache.maven.archiva.database.constraints.ArtifactsByChecksumConstraint;
 import org.apache.maven.archiva.database.constraints.UniqueVersionConstraint;
 import org.apache.maven.archiva.model.ArchivaArtifact;
-import org.apache.maven.archiva.model.ArchivaProjectModel;
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 import org.easymock.MockControl;
 import org.easymock.classextension.MockClassControl;

svn commit: r885470 - /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp

2009-11-30T16:00:58Z

Author: brett
Date: Mon Nov 30 16:00:57 2009
New Revision: 885470

URL: http://svn.apache.org/viewvc?rev=885470&view=rev
Log:
[MRM-1283] updates to reflect new output model format

Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp?rev=885470&r1=885469&r2=885470&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
Mon Nov 30 16:00:57 2009
@@ -35,27 +35,28 @@
 
 
 
+
 
 
-  
+  
     
     Maven Plugin
   
-  
+  
     
     POM
   
   <%-- These types aren't usually set in the POM yet, so we fudge them for the well known
ones --%>
-  
+  
     
     Maven Archetype
   
-  
+  
     
     Maven Skin
   
   <%-- Must be last so that the above get picked up if possible --%>
-  
+  
     
     JAR
   
@@ -69,7 +70,7 @@
 
   
     
-      ${model.artifactId}
+      ${facet.artifactId}
     
     
       ${model.name}
@@ -137,7 +138,7 @@

- +

svn commit: r885466 - in /archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src: main/java/org/apache/archiva/metadata/repository/file/ test/java/org/apache/archiva/metadata/repository/file/

2009-11-30T15:51:19Z

Author: brett
Date: Mon Nov 30 15:51:19 2009
New Revision: 885466

URL: http://svn.apache.org/viewvc?rev=885466&view=rev
Log:
[MRM-1282] correct updating of facets in the file-based repository

Modified:
    archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
    archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java

Modified: archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java?rev=885466&r1=885465&r2=885466&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
Mon Nov 30 15:51:19 2009
@@ -116,7 +116,7 @@
         // remove properties that are not references or artifacts
         for ( String name : properties.stringPropertyNames() )
         {
-            if ( !name.startsWith( "artifact:" ) && !name.startsWith( "ref:" ) )
+            if ( !name.contains( ":" ) && !name.equals( "facetIds" ) )
             {
                 properties.remove( name );
             }
@@ -176,7 +176,10 @@
             setProperty( properties, "dependency." + i + ".type", dependency.getType() );
             i++;
         }
-        properties.setProperty( "facetIds", join( versionMetadata.getFacetIds() ) );
+        Set facetIds = new LinkedHashSet( versionMetadata.getFacetIds()
);
+        facetIds.addAll( Arrays.asList( properties.getProperty( "facetIds", "" ).split( ","
) ) );
+        properties.setProperty( "facetIds", join( facetIds ) );
+
         for ( ProjectVersionFacet facet : versionMetadata.getFacetList() )
         {
             properties.putAll( facet.toProperties() );
@@ -613,4 +616,9 @@
     {
         this.directory = directory;
     }
+
+    public void setMetadataFacetFactories( Map metadataFacetFactories
)
+    {
+        this.metadataFacetFactories = metadataFacetFactories;
+    }
 }

Modified: archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java?rev=885466&r1=885465&r2=885466&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
Mon Nov 30 15:51:19 2009
@@ -3,8 +3,11 @@
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Map;
 
 import org.apache.archiva.metadata.model.MailingList;
+import org.apache.archiva.metadata.model.MetadataFacetFactory;
+import org.apache.archiva.metadata.model.ProjectVersionFacet;
 import org.apache.archiva.metadata.model.ProjectVersionMetadata;
 import org.apache.archiva.metadata.repository.MetadataRepository;
 import org.apache.commons.io.FileUtils;
@@ -40,6 +43,8 @@
 
     private static final String TEST_NAMESPACE = "namespace";
 
+    private static final String TEST_PROJECT_VERSION = "1.0";
+
     public void setUp()
         throws Exception
     {
@@ -60,11 +65,72 @@
     public void testUpdateProjectVersionMetadataWithNoOtherArchives()
     {
         ProjectVersionMetadata metadata = new ProjectVersionMetadata();
-        metadata.setId( TEST_PROJECT );
+        metadata.setId( TEST_PROJECT_VERSION );
         MailingList mailingList = new MailingList();
         mailingList.setName( "Foo List" );
         mailingList.setOtherArchives( Collections.emptyList() );
         metadata.setMailingLists( Collections.singletonList( mailingList ) );
         repository.updateProjectVersion( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata
);
     }
+
+    public void testUpdateProjectVersionMetadataWithExistingFacets()
+    {
+        repository.setMetadataFacetFactories(
+            Collections.singletonMap( "test", new MetadataFacetFactory()
+            {
+                public ProjectVersionFacet createProjectVersionFacet()
+                {
+                    return new TestProjectVersionFacet( "bar" );
+                }
+            } ) );
+
+        ProjectVersionMetadata metadata = new ProjectVersionMetadata();
+        metadata.setId( TEST_PROJECT_VERSION );
+        ProjectVersionFacet facet = new TestProjectVersionFacet( "baz" );
+        metadata.addFacet( facet );
+        repository.updateProjectVersion( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata
);
+
+        metadata = repository.getProjectVersion( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
TEST_PROJECT_VERSION );
+        assertEquals( Collections.singleton( "test" ), metadata.getFacetIds() );
+
+        metadata = new ProjectVersionMetadata();
+        metadata.setId( TEST_PROJECT_VERSION );
+        repository.updateProjectVersion( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, metadata
);
+
+        metadata = repository.getProjectVersion( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT,
TEST_PROJECT_VERSION );
+        assertEquals( Collections.singleton( "test" ), metadata.getFacetIds() );
+        TestProjectVersionFacet testFacet = (TestProjectVersionFacet) metadata.getFacet(
"test" );
+        assertEquals( "baz", testFacet.getValue() );
+    }
+
+    private static class TestProjectVersionFacet
+        implements ProjectVersionFacet
+    {
+        private TestProjectVersionFacet( String value )
+        {
+            this.value = value;
+        }
+
+        private String value;
+
+        public String getFacetId()
+        {
+            return "test";
+        }
+
+        public Map toProperties()
+        {
+            return Collections.singletonMap( "test:foo", value );
+        }
+
+        public void fromProperties( Map properties )
+        {
+            value = properties.get( "test:foo" );
+        }
+
+        public String getValue()
+        {
+            return value;
+        }
+    }
 }

svn commit: r885436 - in /archiva/branches/MRM-1025/archiva-modules: archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/ archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/ archiva-web/archiva-webapp/src/te...

2009-11-30T14:38:41Z

Author: brett
Date: Mon Nov 30 14:38:40 2009
New Revision: 885436

URL: http://svn.apache.org/viewvc?rev=885436&view=rev
Log:
[MRM-1288] remove RepositoryBrowsing interface that is no longer used

Removed:
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/DefaultRepositoryBrowsing.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsing.java
    archiva/branches/MRM-1025/archiva-modules/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java
Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java?rev=885436&r1=885435&r2=885436&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/BrowseActionTest.java
Mon Nov 30 14:38:40 2009
@@ -311,7 +311,6 @@
     }
 
     // TODO: test with restricted observable repos
-    //       not currently relevant since it is controlled at the DefaultRepositoryBrowsing
level
     // TODO: current behaviour is to ignore values that differ between models - instead,
pick the latest and use that.
     //       Need to update the tests to verify this as models are currently the same
 

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java?rev=885436&r1=885435&r2=885436&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
Mon Nov 30 14:38:40 2009
@@ -214,7 +214,7 @@
         List artifacts = new ArrayList();
 
         // 1. get observable repositories
-        // 2. use RepositoryBrowsing method to query uniqueVersions? (but with date)
+        // 2. use metadata repository to query uniqueVersions? (but with date)
 
         return artifacts;
     }

svn commit: r885430 - in /archiva/branches/MRM-1025: ./ archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/ archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/ archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-se...

2009-11-30T14:19:57Z

Author: brett
Date: Mon Nov 30 14:19:56 2009
New Revision: 885430

URL: http://svn.apache.org/viewvc?rev=885430&view=rev
Log:
[MRM-1288] move quickSearch from repository browsing to metadata content repository API

Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
    archiva/branches/MRM-1025/pom.xml

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=885430&r1=885429&r2=885430&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Mon Nov 30 14:19:56 2009
@@ -43,7 +43,7 @@
   
   
        
     
-    
+    
     
   
   

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml?rev=885430&r1=885429&r2=885430&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
Mon Nov 30 14:19:56 2009
@@ -71,6 +71,10 @@
       metadata-repository-api
     
     
+      org.apache.archiva
+      maven2-repository
+    
+    
       org.codehaus.plexus
       plexus-spring
       test

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java?rev=885430&r1=885429&r2=885430&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
Mon Nov 30 14:19:56 2009
@@ -31,20 +31,17 @@
 import org.apache.archiva.metadata.model.ProjectVersionMetadata;
 import org.apache.archiva.metadata.model.ProjectVersionReference;
 import org.apache.archiva.metadata.repository.MetadataResolver;
+import org.apache.archiva.metadata.repository.storage.maven2.MavenProjectFacet;
 import org.apache.archiva.web.xmlrpc.api.SearchService;
 import org.apache.archiva.web.xmlrpc.api.beans.Artifact;
 import org.apache.archiva.web.xmlrpc.api.beans.Dependency;
 import org.apache.archiva.web.xmlrpc.security.XmlRpcUserRepositories;
 import org.apache.maven.archiva.common.utils.VersionUtil;
 import org.apache.maven.archiva.database.ArchivaDAO;
-import org.apache.maven.archiva.database.ArchivaDatabaseException;
 import org.apache.maven.archiva.database.ArtifactDAO;
-import org.apache.maven.archiva.database.ObjectNotFoundException;
-import org.apache.maven.archiva.database.browsing.RepositoryBrowsing;
 import org.apache.maven.archiva.database.constraints.ArtifactsByChecksumConstraint;
 import org.apache.maven.archiva.database.constraints.UniqueVersionConstraint;
 import org.apache.maven.archiva.model.ArchivaArtifact;
-import org.apache.maven.archiva.model.ArchivaProjectModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -72,17 +69,13 @@
 
     private ArchivaDAO archivaDAO;
 
-    private RepositoryBrowsing repoBrowsing;
-
     private MetadataResolver metadataResolver;
 
     public SearchServiceImpl( XmlRpcUserRepositories xmlRpcUserRepositories, ArchivaDAO archivaDAO,
-                              RepositoryBrowsing repoBrowsing, MetadataResolver metadataResolver,
-                              RepositorySearch search )
+                              MetadataResolver metadataResolver, RepositorySearch search
)
     {
         this.xmlRpcUserRepositories = xmlRpcUserRepositories;
         this.archivaDAO = archivaDAO;
-        this.repoBrowsing = repoBrowsing;
         this.search = search;
         this.metadataResolver = metadataResolver;
     }
@@ -114,35 +107,34 @@
             {
                 for ( String version : resultHitVersions )
                 {
-                    try
+                    Artifact artifact = null;
+                    for ( String repoId : observableRepos )
                     {
-                        ArchivaProjectModel model =
-                            repoBrowsing.selectVersion( "", observableRepos, resultHit.getGroupId(),
-                                                        resultHit.getArtifactId(), version
);
-
-                        String repoId = repoBrowsing.getRepositoryId( "", observableRepos,
resultHit.getGroupId(),
-                                                                      resultHit.getArtifactId(),
version );
+                        // slight behaviour change to previous implementation: instead of
allocating "jar" when not
+                        // found in the database, we can rely on the metadata repository
to create it on the fly. We
+                        // just allocate the default packaging if the Maven facet is not
found.
+                        ProjectVersionMetadata model =
+                            metadataResolver.getProjectVersion( repoId, resultHit.getGroupId(),
+                                                                resultHit.getArtifactId(),
version );
 
-                        Artifact artifact = null;
-                        if ( model == null )
+                        if ( model != null )
                         {
+                            String packaging = "jar";
+
+                            MavenProjectFacet facet = (MavenProjectFacet) model.getFacet(
MavenProjectFacet.FACET_ID );
+                            if ( facet != null && facet.getPackaging() != null )
+                            {
+                                packaging = facet.getPackaging();
+                            }
                             artifact = new Artifact( repoId, resultHit.getGroupId(), resultHit.getArtifactId(),
version,
-                                                     "jar" );
-                        }
-                        else
-                        {
-                            artifact = new Artifact( repoId, model.getGroupId(), model.getArtifactId(),
version,
-                                                     model.getPackaging() );
+                                                     packaging );
+                            break;
                         }
-                        artifacts.add( artifact );
-                    }
-                    catch ( ObjectNotFoundException e )
-                    {
-                        log.debug( "Unable to find pom artifact : " + e.getMessage() );
                     }
-                    catch ( ArchivaDatabaseException e )
+
+                    if ( artifact != null )
                     {
-                        log.debug( "Error occurred while getting pom artifact from database
: " + e.getMessage() );
+                        artifacts.add( artifact );
                     }
                 }
             }

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java?rev=885430&r1=885429&r2=885430&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
Mon Nov 30 14:19:56 2009
@@ -34,13 +34,13 @@
 import org.apache.archiva.metadata.model.ProjectVersionMetadata;
 import org.apache.archiva.metadata.model.ProjectVersionReference;
 import org.apache.archiva.metadata.repository.MetadataResolver;
+import org.apache.archiva.metadata.repository.storage.maven2.MavenProjectFacet;
 import org.apache.archiva.web.xmlrpc.api.SearchService;
 import org.apache.archiva.web.xmlrpc.api.beans.Artifact;
 import org.apache.archiva.web.xmlrpc.api.beans.Dependency;
 import org.apache.archiva.web.xmlrpc.security.XmlRpcUserRepositories;
 import org.apache.maven.archiva.database.ArchivaDAO;
 import org.apache.maven.archiva.database.ArtifactDAO;
-import org.apache.maven.archiva.database.browsing.RepositoryBrowsing;
 import org.apache.maven.archiva.database.constraints.ArtifactsByChecksumConstraint;
 import org.apache.maven.archiva.database.constraints.UniqueVersionConstraint;
 import org.apache.maven.archiva.model.ArchivaArtifact;
@@ -75,10 +75,6 @@
 
     private ArtifactDAO artifactDAO;
 
-    private MockControl repoBrowsingControl;
-
-    private RepositoryBrowsing repoBrowsing;
-
     private static final String ARCHIVA_TEST_ARTIFACT_ID = "archiva-xmlrpc-test";
 
     private static final String ARCHIVA_TEST_GROUP_ID = "org.apache.archiva";
@@ -98,9 +94,6 @@
         archivaDAOControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER );
         archivaDAO = (ArchivaDAO) archivaDAOControl.getMock();
 
-        repoBrowsingControl = MockControl.createControl( RepositoryBrowsing.class );
-        repoBrowsing = (RepositoryBrowsing) repoBrowsingControl.getMock();
-
         searchControl = MockControl.createControl( RepositorySearch.class );
         searchControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER );
         search = (RepositorySearch) searchControl.getMock();
@@ -108,10 +101,10 @@
         metadataResolverControl = MockControl.createControl( MetadataResolver.class );
         metadataResolver = (MetadataResolver) metadataResolverControl.getMock();
 
-        searchService = new SearchServiceImpl( userRepos, archivaDAO, repoBrowsing, metadataResolver,
search );
-
         artifactDAOControl = MockControl.createControl( ArtifactDAO.class );
         artifactDAO = (ArtifactDAO) artifactDAOControl.getMock();
+
+        searchService = new SearchServiceImpl( userRepos, archivaDAO, metadataResolver, search
);
     }
 
     // MRM-1230
@@ -145,30 +138,26 @@
             new UniqueVersionConstraint( observableRepoIds, resultHit.getGroupId(), resultHit.getArtifactId()
) ),
                                            null );
 
-        ArchivaProjectModel model = new ArchivaProjectModel();
-        model.setGroupId( ARCHIVA_TEST_GROUP_ID );
-        model.setArtifactId( "archiva-webapp" );
-        model.setVersion( "1.0" );
-        model.setPackaging( "war" );
+        ProjectVersionMetadata model = new ProjectVersionMetadata();
+        model.setId( "1.0" );
+        MavenProjectFacet facet = new MavenProjectFacet();
+        facet.setPackaging( "war" );
+        model.addFacet( facet );
 
-        repoBrowsingControl.expectAndReturn(
-            repoBrowsing.selectVersion( "", observableRepoIds, ARCHIVA_TEST_GROUP_ID, "archiva-webapp",
"1.0" ),
+        metadataResolverControl.expectAndReturn(
+            metadataResolver.getProjectVersion( "repo1.mirror", ARCHIVA_TEST_GROUP_ID, "archiva-webapp",
"1.0" ),
             model );
 
-        repoBrowsingControl.expectAndReturn(
-            repoBrowsing.getRepositoryId( "", observableRepoIds, ARCHIVA_TEST_GROUP_ID, "archiva-webapp",
"1.0" ),
-            "repo1.mirror" );
-
         userReposControl.replay();
         searchControl.replay();
-        repoBrowsingControl.replay();
+        metadataResolverControl.replay();
         archivaDAOControl.replay();
 
         List artifacts = searchService.quickSearch( "archiva" );
 
         userReposControl.verify();
         searchControl.verify();
-        repoBrowsingControl.verify();
+        metadataResolverControl.verify();
         archivaDAOControl.verify();
 
         assertNotNull( artifacts );
@@ -213,24 +202,26 @@
             new UniqueVersionConstraint( observableRepoIds, resultHit.getGroupId(), resultHit.getArtifactId()
) ),
                                            null );
 
-        repoBrowsingControl.expectAndReturn(
-            repoBrowsing.selectVersion( "", observableRepoIds, ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID,
"1.0" ),
-            null );
+        metadataResolverControl.expectAndReturn(
+            metadataResolver.getProjectVersion( "repo1.mirror", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID,
+                                                "1.0" ), null );
 
-        repoBrowsingControl.expectAndReturn(
-            repoBrowsing.getRepositoryId( "", observableRepoIds, ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID,
-                                          "1.0" ), null );
+        ProjectVersionMetadata model = new ProjectVersionMetadata();
+        model.setId( "1.0" );
+        metadataResolverControl.expectAndReturn(
+            metadataResolver.getProjectVersion( "public.releases", ARCHIVA_TEST_GROUP_ID,
ARCHIVA_TEST_ARTIFACT_ID,
+                                                "1.0" ), model );
 
         userReposControl.replay();
         searchControl.replay();
-        repoBrowsingControl.replay();
+        metadataResolverControl.replay();
         archivaDAOControl.replay();
 
         List artifacts = searchService.quickSearch( "archiva" );
 
         userReposControl.verify();
         searchControl.verify();
-        repoBrowsingControl.verify();
+        metadataResolverControl.verify();
         archivaDAOControl.verify();
 
         assertNotNull( artifacts );
@@ -241,8 +232,7 @@
         assertEquals( ARCHIVA_TEST_ARTIFACT_ID, artifact.getArtifactId() );
         assertEquals( "1.0", artifact.getVersion() );
         assertEquals( "jar", artifact.getType() );
-        assertNull( "Repository should be null since the model was not found in the database!",
-                    artifact.getRepositoryId() );
+        assertEquals( "public.releases", artifact.getRepositoryId() );
     }
 
     public void testQuickSearchArtifactRegularSearch()
@@ -275,31 +265,27 @@
         searchControl.expectAndDefaultReturn( search.search( "", observableRepoIds, "archiva",
limits, null ),
                                               results );
 
-        ArchivaProjectModel model = new ArchivaProjectModel();
-        model.setGroupId( ARCHIVA_TEST_GROUP_ID );
-        model.setArtifactId( ARCHIVA_TEST_ARTIFACT_ID );
-        model.setVersion( "1.0" );
-        model.setPackaging( "jar" );
-
-        repoBrowsingControl.expectAndReturn(
-            repoBrowsing.selectVersion( "", observableRepoIds, ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID,
"1.0" ),
-            model );
+        ProjectVersionMetadata model = new ProjectVersionMetadata();
+        model.setId( "1.0" );
+        MavenProjectFacet facet = new MavenProjectFacet();
+        facet.setPackaging( "jar" );
+        model.addFacet( facet );
 
-        repoBrowsingControl.expectAndReturn(
-            repoBrowsing.getRepositoryId( "", observableRepoIds, ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID,
-                                          "1.0" ), "repo1.mirror" );
+        metadataResolverControl.expectAndReturn(
+            metadataResolver.getProjectVersion( "repo1.mirror", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID,
+                                                "1.0" ), model );
 
         userReposControl.replay();
         searchControl.replay();
         archivaDAOControl.replay();
-        repoBrowsingControl.replay();
+        metadataResolverControl.replay();
 
         List artifacts = searchService.quickSearch( "archiva" );
 
         userReposControl.verify();
         searchControl.verify();
         archivaDAOControl.verify();
-        repoBrowsingControl.verify();
+        metadataResolverControl.verify();
 
         assertNotNull( artifacts );
         assertEquals( 1, artifacts.size() );

Modified: archiva/branches/MRM-1025/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/pom.xml?rev=885430&r1=885429&r2=885430&view=diff
==============================================================================
--- archiva/branches/MRM-1025/pom.xml (original)
+++ archiva/branches/MRM-1025/pom.xml Mon Nov 30 14:19:56 2009
@@ -305,6 +305,11 @@
       
       
         org.apache.archiva
+        maven2-repository
+        1.3-SNAPSHOT
+      
+      
+        org.apache.archiva
         archiva-applet
         1.3-SNAPSHOT

svn commit: r885331 - in /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc: archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/beans/ archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/ arch...

2009-11-30T04:23:03Z

Author: brett
Date: Mon Nov 30 04:23:03 2009
New Revision: 885331

URL: http://svn.apache.org/viewvc?rev=885331&view=rev
Log:
[MRM-1288] move getArtifactVersions() method to new repository API

Modified:
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/beans/Artifact.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
    archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/beans/Artifact.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/beans/Artifact.java?rev=885331&r1=885330&r2=885331&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/beans/Artifact.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/beans/Artifact.java
Mon Nov 30 04:23:03 2009
@@ -94,6 +94,13 @@
         return result;
     }
 
+    @Override
+    public String toString()
+    {
+        return "Artifact{" + "repositoryId='" + repositoryId + '\'' + ", groupId='" + groupId
+ '\'' +
+            ", artifactId='" + artifactId + '\'' + ", version='" + version + '\'' + ", type='"
+ type + '\'' + '}';
+    }
+
     public Artifact( String repositoryId, String groupId, String artifactId, String version,
String type )
 //                     String type, Date whenGathered )
     {   

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java?rev=885331&r1=885330&r2=885331&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImpl.java
Mon Nov 30 04:23:03 2009
@@ -40,7 +40,6 @@
 import org.apache.maven.archiva.database.ArchivaDatabaseException;
 import org.apache.maven.archiva.database.ArtifactDAO;
 import org.apache.maven.archiva.database.ObjectNotFoundException;
-import org.apache.maven.archiva.database.browsing.BrowsingResults;
 import org.apache.maven.archiva.database.browsing.RepositoryBrowsing;
 import org.apache.maven.archiva.database.constraints.ArtifactsByChecksumConstraint;
 import org.apache.maven.archiva.database.constraints.UniqueVersionConstraint;
@@ -199,23 +198,21 @@
     public List getArtifactVersions( String groupId, String artifactId )
         throws Exception
     {
-        final List artifacts = new ArrayList();
-        final List observableRepos = xmlRpcUserRepositories.getObservableRepositories();
-
-        final BrowsingResults results = repoBrowsing.selectArtifactId( "", observableRepos,
groupId, artifactId );
+        List artifacts = new ArrayList();
+        List observableRepos = xmlRpcUserRepositories.getObservableRepositories();
 
-        for ( final String version : results.getVersions() )
+        for ( String repoId : observableRepos )
         {
-            final Artifact artifact = new Artifact( "", groupId, artifactId, version, "pom"
);
-            //ArchivaArtifact pomArtifact = artifactDAO.getArtifact( groupId, artifactId,
version, "", "pom",  );
-            //Artifact artifact = new Artifact( "", groupId, artifactId, version, pomArtifact.getType()
); 
-            //pomArtifact.getModel().getWhenGathered() );
+            Collection results = metadataResolver.getProjectVersions( repoId,
groupId, artifactId );
 
-            artifacts.add( artifact );
+            for ( final String version : results )
+            {
+                final Artifact artifact = new Artifact( repoId, groupId, artifactId, version,
"pom" );
+
+                artifacts.add( artifact );
+            }
         }
 
-        // 1. get observable repositories
-        // 2. use RepositoryBrowsing method to query uniqueVersions?
         return artifacts;
     }
 
@@ -263,7 +260,6 @@
         return a;
     }
 
-    //get artifacts that depend on a given artifact
     public List getDependees( String groupId, String artifactId, String version
)
         throws Exception
     {

Modified: archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java?rev=885331&r1=885330&r2=885331&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
(original)
+++ archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
Mon Nov 30 04:23:03 2009
@@ -21,6 +21,7 @@
 
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -39,7 +40,6 @@
 import org.apache.archiva.web.xmlrpc.security.XmlRpcUserRepositories;
 import org.apache.maven.archiva.database.ArchivaDAO;
 import org.apache.maven.archiva.database.ArtifactDAO;
-import org.apache.maven.archiva.database.browsing.BrowsingResults;
 import org.apache.maven.archiva.database.browsing.RepositoryBrowsing;
 import org.apache.maven.archiva.database.constraints.ArtifactsByChecksumConstraint;
 import org.apache.maven.archiva.database.constraints.UniqueVersionConstraint;
@@ -371,98 +371,43 @@
     public void testGetArtifactVersionsArtifactExists()
         throws Exception
     {
-        Date whenGathered = new Date();
-
         List observableRepoIds = new ArrayList();
         observableRepoIds.add( "repo1.mirror" );
         observableRepoIds.add( "public.releases" );
 
-        List versions = new ArrayList();
-        versions.add( "1.0" );
-        versions.add( "1.1-beta-1" );
-        versions.add( "1.1-beta-2" );
-        versions.add( "1.1" );
-        versions.add( "1.2" );
-        versions.add( "1.2.1-SNAPSHOT" );
-
-        BrowsingResults results = new BrowsingResults( ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID
);
-        results.setSelectedRepositoryIds( observableRepoIds );
-        results.setVersions( versions );
-
-        List archivaArtifacts = new ArrayList();
-        ArchivaArtifact archivaArtifact =
-            new ArchivaArtifact( ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, versions.get(
0 ), "", "pom",
-                                 "repo1.mirror" );
-        archivaArtifact.getModel().setWhenGathered( whenGathered );
-        archivaArtifacts.add( archivaArtifact );
-
-        archivaArtifact =
-            new ArchivaArtifact( ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, versions.get(
1 ), "", "pom",
-                                 "public.releases" );
-        archivaArtifact.getModel().setWhenGathered( whenGathered );
-        archivaArtifacts.add( archivaArtifact );
-
-        archivaArtifact =
-            new ArchivaArtifact( ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, versions.get(
2 ), "", "pom",
-                                 "repo1.mirror" );
-        archivaArtifact.getModel().setWhenGathered( whenGathered );
-        archivaArtifacts.add( archivaArtifact );
-
-        archivaArtifact =
-            new ArchivaArtifact( ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, versions.get(
3 ), "", "pom",
-                                 "public.releases" );
-        archivaArtifact.getModel().setWhenGathered( whenGathered );
-        archivaArtifacts.add( archivaArtifact );
-
-        archivaArtifact =
-            new ArchivaArtifact( ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, versions.get(
4 ), "", "pom",
-                                 "repo1.mirror" );
-        archivaArtifact.getModel().setWhenGathered( whenGathered );
-        archivaArtifacts.add( archivaArtifact );
-
-        archivaArtifact =
-            new ArchivaArtifact( ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, versions.get(
5 ), "", "pom",
-                                 "public.releases" );
-        archivaArtifact.getModel().setWhenGathered( whenGathered );
-        archivaArtifacts.add( archivaArtifact );
-
         userReposControl.expectAndReturn( userRepos.getObservableRepositories(), observableRepoIds
);
-        repoBrowsingControl.expectAndReturn(
-            repoBrowsing.selectArtifactId( "", observableRepoIds, ARCHIVA_TEST_GROUP_ID,
ARCHIVA_TEST_ARTIFACT_ID ),
-            results );
-        archivaDAOControl.expectAndReturn( archivaDAO.getArtifactDAO(), artifactDAO );
-
-        artifactDAOControl.expectAndDefaultReturn(
-            artifactDAO.getArtifact( ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, versions.get(
0 ), "", "pom",
-                                     "repo1.mirror" ), archivaArtifacts.get( 0 ) );
-        artifactDAOControl.expectAndDefaultReturn(
-            artifactDAO.getArtifact( ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, versions.get(
1 ), "", "pom",
-                                     "public.releases" ), archivaArtifacts.get( 1 ) );
-        artifactDAOControl.expectAndDefaultReturn(
-            artifactDAO.getArtifact( ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, versions.get(
2 ), "", "pom",
-                                     "repo1.mirror" ), archivaArtifacts.get( 2 ) );
-        artifactDAOControl.expectAndDefaultReturn(
-            artifactDAO.getArtifact( ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, versions.get(
3 ), "", "pom",
-                                     "public.releases" ), archivaArtifacts.get( 3 ) );
-        artifactDAOControl.expectAndDefaultReturn(
-            artifactDAO.getArtifact( ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, versions.get(
4 ), "", "pom",
-                                     "repo1.mirror" ), archivaArtifacts.get( 4 ) );
-        artifactDAOControl.expectAndDefaultReturn(
-            artifactDAO.getArtifact( ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID, versions.get(
5 ), "", "pom",
-                                     "public.releases" ), archivaArtifacts.get( 5 ) );
+        metadataResolverControl.expectAndReturn(
+            metadataResolver.getProjectVersions( "repo1.mirror", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID
),
+            Arrays.asList( "1.0", "1.1-beta-2", "1.2" ) );
+        metadataResolverControl.expectAndReturn(
+            metadataResolver.getProjectVersions( "public.releases", ARCHIVA_TEST_GROUP_ID,
ARCHIVA_TEST_ARTIFACT_ID ),
+            Arrays.asList( "1.1-beta-1", "1.1", "1.2.1-SNAPSHOT" ) );
 
         userReposControl.replay();
-        repoBrowsingControl.replay();
-        artifactDAOControl.replay();
+        metadataResolverControl.replay();
 
         List artifacts = searchService.getArtifactVersions( ARCHIVA_TEST_GROUP_ID,
ARCHIVA_TEST_ARTIFACT_ID );
 
         userReposControl.verify();
-        repoBrowsingControl.verify();
-        artifactDAOControl.verify();
+        metadataResolverControl.verify();
 
         assertNotNull( artifacts );
         assertEquals( 6, artifacts.size() );
+        assertEquals( new Artifact( "repo1.mirror", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID,
"1.0", "pom" ),
+                      artifacts.get( 0 ) );
+        assertEquals(
+            new Artifact( "public.releases", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID,
"1.1-beta-1", "pom" ),
+            artifacts.get( 3 ) );
+        assertEquals(
+            new Artifact( "repo1.mirror", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID,
"1.1-beta-2", "pom" ),
+            artifacts.get( 1 ) );
+        assertEquals( new Artifact( "public.releases", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID,
"1.1", "pom" ),
+                      artifacts.get( 4 ) );
+        assertEquals( new Artifact( "repo1.mirror", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID,
"1.2", "pom" ),
+                      artifacts.get( 2 ) );
+        assertEquals(
+            new Artifact( "public.releases", ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID,
"1.2.1-SNAPSHOT", "pom" ),
+            artifacts.get( 5 ) );
     }
 
     public void testGetArtifactVersionsByDateArtifactExists()

commits@archiva.apache.org Archives

svn commit: r887086 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng: config/ org/apache/archiva/web/test/ org/apache/archiva/web/test/parent/

svn commit: r887053 - /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java

svn commit: r887052 - in /archiva/branches/MRM-1025/archiva-modules/archiva-scheduler: archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/ archi...

svn commit: r887051 - in /archiva/trunk/archiva-modules/archiva-scheduled/src: main/java/org/apache/maven/archiva/scheduled/executors/ test/java/org/apache/maven/archiva/scheduled/executors/

svn commit: r887043 [3/3] - in /archiva/branches/MRM-1025: ./ archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/or...

svn commit: r887043 [1/3] - in /archiva/branches/MRM-1025: ./ archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/or...

svn commit: r887043 [2/3] - in /archiva/branches/MRM-1025: ./ archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/ archiva-modules/archiva-scheduler/archiva-scheduler-api/src/main/java/or...

svn commit: r887033 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/

svn commit: r887030 - in /archiva/trunk/archiva-modules/archiva-scheduled/src: main/java/org/apache/maven/archiva/scheduled/executors/ test/java/org/apache/maven/archiva/scheduled/executors/

svn commit: r887027 - in /archiva/trunk/archiva-modules/archiva-scheduled/src: main/java/org/apache/maven/archiva/scheduled/executors/ test/java/org/apache/maven/archiva/scheduled/executors/

svn commit: r887026 - /archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java

svn commit: r887005 - /archiva/trunk/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java

svn commit: r886966 - /archiva/trunk/archiva-modules/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaIndexingTaskExecutor.java

svn commit: r886769 - /archiva/site/pom.xml

svn commit: r886676 - /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java

svn commit: r886673 - /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java

svn commit: r886669 - in /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action: admin/repositories/ reports/

svn commit: r886134 - /archiva/sandbox/content-model.zip

svn commit: r886132 - /archiva/sandbox/content-model.zip

svn commit: r886126 - in /archiva/branches/MRM-1025/archiva-modules: archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ ...

svn commit: r886110 - in /archiva/branches/MRM-1025/archiva-modules: archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/functors/ archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/ archiva-database/src/main/...

svn commit: r886101 - in /archiva/branches/MRM-1025/archiva-modules: archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ archiva-base/archiva-model/ archiva-base/archiva-model/src/main/md...

svn commit: r886054 - /archiva/sandbox/content-model.zip

svn commit: r886053 - /archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt

svn commit: r886050 - /archiva/sandbox/content-model.zip

svn commit: r886049 - /archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt

svn commit: r886048 - /archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt

svn commit: r886037 [1/2] - in /archiva/branches/MRM-1025: ./ archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ archiva-modules/archiva-base/archiva-consumers/archiva-da...

svn commit: r886035 - in /archiva/branches/MRM-1025/archiva-modules: archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ archiva-reporting/archiva-artifact-reports/ archiva-reporting/arch...

svn commit: r885817 - /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java

svn commit: r885816 - /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java

svn commit: r885812 [2/2] - in /archiva/branches/MRM-1025: ./ archiva-modules/archiva-base/ archiva-modules/archiva-base/archiva-dependency-graph/ archiva-modules/archiva-web/archiva-webapp/ archiva-modules/archiva-web/archiva-webapp/src/main/java/org/...

svn commit: r885812 [1/2] - in /archiva/branches/MRM-1025: ./ archiva-modules/archiva-base/ archiva-modules/archiva-base/archiva-dependency-graph/ archiva-modules/archiva-web/archiva-webapp/ archiva-modules/archiva-web/archiva-webapp/src/main/java/org/...

svn commit: r885638 - in /archiva/branches/MRM-1025: archiva-cli/src/main/java/org/apache/maven/archiva/cli/ archiva-modules/archiva-reporting/archiva-artifact-reports/src/main/java/org/apache/maven/archiva/reporting/artifact/ archiva-modules/archiva-w...

svn commit: r885470 - /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp

- ${model.artifactId} + ${facet.artifactId} ${model.name} @@ -137,7 +138,7 @@

svn commit: r885466 - in /archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src: main/java/org/apache/archiva/metadata/repository/file/ test/java/org/apache/archiva/metadata/repository/file/

svn commit: r885436 - in /archiva/branches/MRM-1025/archiva-modules: archiva-database/src/main/java/org/apache/maven/archiva/database/browsing/ archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/ archiva-web/archiva-webapp/src/te...

svn commit: r885430 - in /archiva/branches/MRM-1025: ./ archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/ archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/ archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-se...

svn commit: r885331 - in /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc: archiva-xmlrpc-api/src/main/java/org/apache/archiva/web/xmlrpc/api/beans/ archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/ arch...