You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2010/09/28 11:09:40 UTC
svn commit: r1002059 [3/4] - in /archiva/trunk: ./ archiva-docs/
archiva-docs/src/site/ archiva-docs/src/site/apt/adminguide/
archiva-docs/src/site/resources/images/
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/...
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java?rev=1002059&r1=1002058&r2=1002059&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java Tue Sep 28 09:09:32 2010
@@ -95,6 +95,10 @@ public class EditManagedRepositoryAction
archivaConfiguration.getConfiguration();
archivaConfigurationControl.setReturnValue( configuration );
+ Configuration stageRepoConfiguration = new Configuration();
+ stageRepoConfiguration.addManagedRepository( createStagingRepository() );
+ archivaConfigurationControl.setReturnValue( stageRepoConfiguration );
+
archivaConfigurationControl.replay();
action.setRepoid( REPO_ID );
@@ -116,10 +120,18 @@ public class EditManagedRepositoryAction
{
roleManager.templatedRoleExists( ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, REPO_ID );
roleManagerControl.setReturnValue( false );
+
+ roleManager.templatedRoleExists( ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, REPO_ID +"-stage" );
+ roleManagerControl.setReturnValue( false );
+
roleManager.createTemplatedRole( ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, REPO_ID );
roleManagerControl.setVoidCallable();
roleManager.templatedRoleExists( ArchivaRoleConstants.TEMPLATE_REPOSITORY_MANAGER, REPO_ID );
roleManagerControl.setReturnValue( false );
+
+ roleManager.templatedRoleExists( ArchivaRoleConstants.TEMPLATE_REPOSITORY_MANAGER, REPO_ID +"-stage");
+ roleManagerControl.setReturnValue( false );
+
roleManager.createTemplatedRole( ArchivaRoleConstants.TEMPLATE_REPOSITORY_MANAGER, REPO_ID );
roleManagerControl.setVoidCallable();
@@ -128,6 +140,10 @@ public class EditManagedRepositoryAction
Configuration configuration = createConfigurationForEditing( createRepository() );
archivaConfiguration.getConfiguration();
archivaConfigurationControl.setReturnValue( configuration );
+
+ Configuration stageRepoConfiguration = new Configuration();
+ stageRepoConfiguration.addManagedRepository( createStagingRepository() );
+ archivaConfigurationControl.setReturnValue( stageRepoConfiguration );
archivaConfigurationControl.setReturnValue( configuration );
archivaConfigurationControl.setReturnValue( configuration );
@@ -167,10 +183,18 @@ public class EditManagedRepositoryAction
{
roleManager.templatedRoleExists( ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, REPO_ID );
roleManagerControl.setReturnValue( false );
+
+ roleManager.templatedRoleExists( ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, REPO_ID +"-stage");
+ roleManagerControl.setReturnValue( false );
+
roleManager.createTemplatedRole( ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, REPO_ID );
roleManagerControl.setVoidCallable();
roleManager.templatedRoleExists( ArchivaRoleConstants.TEMPLATE_REPOSITORY_MANAGER, REPO_ID );
roleManagerControl.setReturnValue( false );
+
+ roleManager.templatedRoleExists( ArchivaRoleConstants.TEMPLATE_REPOSITORY_MANAGER, REPO_ID +"-stage");
+ roleManagerControl.setReturnValue( false );
+
roleManager.createTemplatedRole( ArchivaRoleConstants.TEMPLATE_REPOSITORY_MANAGER, REPO_ID );
roleManagerControl.setVoidCallable();
@@ -179,6 +203,11 @@ public class EditManagedRepositoryAction
Configuration configuration = createConfigurationForEditing( createRepository() );
archivaConfiguration.getConfiguration();
archivaConfigurationControl.setReturnValue( configuration );
+ Configuration stageRepoConfiguration = new Configuration();
+ stageRepoConfiguration.addManagedRepository( createStagingRepository() );
+ archivaConfigurationControl.setReturnValue( stageRepoConfiguration );
+
+
archivaConfigurationControl.setReturnValue( configuration );
archivaConfigurationControl.setReturnValue( configuration );
@@ -230,9 +259,11 @@ public class EditManagedRepositoryAction
}
private Configuration createConfigurationForEditing( ManagedRepositoryConfiguration repositoryConfiguration )
+ throws Exception
{
Configuration configuration = new Configuration();
configuration.addManagedRepository( repositoryConfiguration );
+// configuration.addManagedRepository( createStagingRepository() );
return configuration;
}
@@ -245,6 +276,15 @@ public class EditManagedRepositoryAction
return r;
}
+ private ManagedRepositoryConfiguration createStagingRepository()
+ throws IOException
+ {
+ ManagedRepositoryConfiguration r = new ManagedRepositoryConfiguration();
+ r.setId( REPO_ID + "-stage" );
+ populateStagingRepository( r );
+ return r;
+ }
+
private void populateRepository( ManagedRepositoryConfiguration repository )
throws IOException
{
@@ -260,4 +300,19 @@ public class EditManagedRepositoryAction
repository.setScanned( false );
repository.setDeleteReleasedSnapshots( true );
}
+ private void populateStagingRepository( ManagedRepositoryConfiguration repository )
+ throws IOException
+ {
+ repository.setId( REPO_ID + "-stage");
+ repository.setName( "repo name" );
+ repository.setLocation( location.getCanonicalPath() );
+ repository.setLayout( "default" );
+ repository.setRefreshCronExpression( "* 0/5 * * * ?" );
+ repository.setDaysOlder( 31 );
+ repository.setRetentionCount( 20 );
+ repository.setReleases( true );
+ repository.setSnapshots( true );
+ repository.setScanned( false );
+ repository.setDeleteReleasedSnapshots( true );
+ }
}
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:898632
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:825850-909464
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:898632
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:891136-909464
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/reports/GenerateReportActionTest.java:891136-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/artifactId/version/artifactId-version.pom:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child1/1.0/child1-1.0.pom:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child2/1.0/child2-1.0.pom:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/child3/1.0/child3-1.0.pom:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild1/2.0/grandchild1-2.0.pom:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:898632
-/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:825850-909464
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/action/reports:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464
+/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/tags/DependencyTreeTest.xml:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -4,4 +4,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/archiva-web/archiva-webdav:898632
-/archiva/trunk/archiva-modules/archiva-web/archiva-webdav:825850-909464
+/archiva/trunk/archiva-modules/archiva-web/archiva-webdav:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:699795-705848
-/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:699795-705848
-/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:699795-705848
-/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:825850-887039,887040-909464*,960322
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java?rev=1002059&r1=1002058&r2=1002059&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java Tue Sep 28 09:09:32 2010
@@ -159,4 +159,7 @@ public class TestMetadataRepository
{
return null; //To change body of implemented methods use File | Settings | File Templates.
}
+ public List<ArtifactMetadata> getArtifacts(String repositoryId){
+ return null;
+ }
}
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:699795-705848
-/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:825850-909464
+/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:825850-909464,960322
Modified: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java?rev=1002059&r1=1002058&r2=1002059&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java (original)
+++ archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/MetadataRepository.java Tue Sep 28 09:09:32 2010
@@ -75,4 +75,6 @@ public interface MetadataRepository
* @param repositoryId the repository to delete
*/
void deleteRepository( String repositoryId );
+
+ List<ArtifactMetadata> getArtifacts(String repositoryId);
}
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464*
+/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:825850-885005,885006-909464*,960322
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464
+/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464
+/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464
+/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/IncludesFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -3,3 +3,4 @@
/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-909464
+/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/IncludesFilter.java:960322
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464*
+/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-909464*,960322
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464
+/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
/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-909464
+/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java:825850-882383,885006-909464,960322
Modified: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java?rev=1002059&r1=1002058&r2=1002059&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java (original)
+++ archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java Tue Sep 28 09:09:32 2010
@@ -486,6 +486,17 @@ public abstract class AbstractMetadataRe
assertTrue( repository.getArtifactsByDateRange( TEST_REPO_ID, null, upper ).isEmpty() );
}
+ public void testGetArtifactsByRepoId()
+ {
+ repository.updateNamespace( TEST_REPO_ID, TEST_NAMESPACE );
+ repository.updateProject( TEST_REPO_ID, createProject() );
+ ArtifactMetadata artifact = createArtifact();
+ repository.updateArtifact( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION, artifact );
+ assertFalse( repository.getArtifacts(TEST_REPO_ID).isEmpty());
+
+
+ }
+
public void testGetNamespacesWithSparseDepth()
{
repository.updateNamespace( TEST_REPO_ID, "org.apache.maven.shared" );
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata:825850-883981,883982-909464*
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT:825850-883981,883982-909464*
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom:960322
/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-909464
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml:825850-909464
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/invalid-pom/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/com/example/test/invalid-pom:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom:825850-883981,883982-909464*
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/invalid-pom/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/com/example/test/invalid-pom/1.0:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0:825850-883981,883982-909464*
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom:825850-909464
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata:825850-883981,883982-909464*
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:825850-883981,883982-909464*
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:960322
/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-909464
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:825850-909464
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom:699795-705848
+/archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom:825850-883981,889228-909464*
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0:699795-705848
+/archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom/1.0:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0:825850-883981,889228-909464*
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom:686983-687034
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom:699795-705848
+/archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom:825850-883981,889228-909464
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/missing-metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/com/example/test/missing-metadata:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:825850-883981,883982-909464*
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/missing-metadata/1.0-SNAPSHOT/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/com/example/test/missing-metadata/1.0-SNAPSHOT:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:825850-883981,883982-909464*
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:960322
/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-909464
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/org/apache/maven:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:825850-882383,882384-909464*
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/org/apache/maven/plugins:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:825850-882383,883982-909464
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/org/apache/maven/shared:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:825850-882383,882384-909464*
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/shared/maven-downloader/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/org/apache/maven/shared/maven-downloader:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:825850-882383,882384-909464*
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/shared/maven-downloader/maven-metadata.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,5 @@
/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/metadata/test-repository/src/main/resources/org/apache/maven/shared/maven-downloader/maven-metadata.xml:960322
/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:825850-909464
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit:898632
-/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit:825850-899477,899478-909464*
+/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit:825850-899477,899478-909464*,960322
Modified: archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java?rev=1002059&r1=1002058&r2=1002059&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java (original)
+++ archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEvent.java Tue Sep 28 09:09:32 2010
@@ -69,6 +69,8 @@ public class AuditEvent
public static final String REMOVE_SCANNED = "Removed in Filesystem";
+ public static final String MERGING_REPOSITORIES = "Merged Artifact";
+
// configuration events
public static final String ADD_MANAGED_REPO = "Added Managed Repository";
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java:898632
-/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java:825850-909464
+/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java:898632
-/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java:825850-909464
+/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java:898632
-/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java:825850-909464
+/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java:825850-909464,960322
Modified: archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java?rev=1002059&r1=1002058&r2=1002059&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java (original)
+++ archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java Tue Sep 28 09:09:32 2010
@@ -33,7 +33,8 @@ public class MetadataAuditListener
public void auditEvent( AuditEvent event )
{
// for now we only log upload events, some of the others are quite noisy
- if ( event.getAction().equals( AuditEvent.CREATE_FILE ) || event.getAction().equals( AuditEvent.UPLOAD_FILE ) )
+ if ( event.getAction().equals( AuditEvent.CREATE_FILE ) || event.getAction().equals( AuditEvent.UPLOAD_FILE ) ||
+ event.getAction().equals( AuditEvent.MERGING_REPOSITORIES ) )
{
auditManager.addAuditEvent( event );
}
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -3,4 +3,4 @@
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java:699795-705848
/archiva/tags/archiva-1.3/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java:898632
-/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java:825850-909464
+/archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java:825850-909464,960322