archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From och...@apache.org
Subject svn commit: r1002059 [4/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/...
Date Tue, 28 Sep 2010 09:09:40 GMT
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/test/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/test/java/org/apache/archiva/audit:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit:699795-705848
 /archiva/tags/archiva-1.3/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit:898632
-/archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit:825850-899477,899478-909464*
+/archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit:825850-899477,899478-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.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/test/java/org/apache/archiva/audit/AuditManagerTest.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java:699795-705848
 /archiva/tags/archiva-1.3/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java:898632
-/archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java:825850-909464
+/archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/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/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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:825850-882383,882384-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/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/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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:825850-882383,882384-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/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/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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java
------------------------------------------------------------------------------
--- 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/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/MavenArtifactFacetFactory.java:960322
 /archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java:825850-882383,883982-909464

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java:825850-882383,883982-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:825850-882383,882384-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:825850-885005,885006-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:825850-885005,885006-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:825850-885005,885006-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /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-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/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/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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:825850-882383,882384-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/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/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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:825850-882383,882384-909464*,960322

Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java?rev=1002059&r1=1002058&r2=1002059&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java Tue Sep 28 09:09:32 2010
@@ -114,4 +114,7 @@ public class TestMetadataRepository
     {
         //To change body of implemented methods use File | Settings | File Templates.
     }
+    public List<ArtifactMetadata> getArtifacts(String repositoryId){
+        return null;
+    }
 }
\ No newline at end of file

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -1 +1 @@
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:889228-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:889228-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /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-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:825850-882383,885006-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/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/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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:825850-882383,882384-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-909464*,960322

Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java?rev=1002059&r1=1002058&r2=1002059&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java Tue Sep 28 09:09:32 2010
@@ -433,7 +433,7 @@ public class Maven2RepositoryMetadataRes
         assertEquals( Arrays.asList( "4", "5-SNAPSHOT" ), resolver.getProjectVersions( TEST_REPO_ID, "org.apache",
                                                                                        "apache" ) );
 
-        assertEquals( Arrays.asList( "1.2.1" ), resolver.getProjectVersions( TEST_REPO_ID, "org.apache.archiva",
+        assertEquals( Arrays.asList( "1.2.1", "1.2.2" ), resolver.getProjectVersions( TEST_REPO_ID, "org.apache.archiva",
                                                                              "archiva" ) );
         assertEquals( Arrays.asList( "1.2.1" ), resolver.getProjectVersions( TEST_REPO_ID, "org.apache.archiva",
                                                                              "archiva-base" ) );

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources:825850-882383,882384-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /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-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:825850-882383,885006-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org:825850-882383,882384-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:825850-882383,882384-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/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/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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:825850-882383,882384-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:825850-882383,885006-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:825850-882383,885006-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:825850-882383,885006-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /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-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:825850-882383,885006-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/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/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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:825850-882383,882384-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/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/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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:825850-882383,882384-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/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/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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:825850-882383,882384-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -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-909464
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:825850-909464,960322

Modified: archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java?rev=1002059&r1=1002058&r2=1002059&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java Tue Sep 28 09:09:32 2010
@@ -140,7 +140,7 @@ public class FileMetadataRepository
             {
                 properties.remove( name );
             }
-            
+
             // clear the facet contents so old properties are no longer written
             clearMetadataFacetProperties( versionMetadata, properties );
         }
@@ -227,7 +227,7 @@ public class FileMetadataRepository
             }
         }
     }
-    
+
     private void clearMetadataFacetProperties( ProjectVersionMetadata versionMetadata, Properties properties )
     {
         List<Object> propsToRemove = new ArrayList<Object>();
@@ -242,7 +242,7 @@ public class FileMetadataRepository
                 }
             }
         }
-        
+
         for( Object key : propsToRemove )
         {
             properties.remove( key );
@@ -577,7 +577,7 @@ public class FileMetadataRepository
         properties.remove( "artifact:sha1:" + id );
         properties.remove( "artifact:version:" + id );
         properties.remove( "artifact:facetIds:" + id );
-        
+
         String prefix = "artifact:facet:" + id + ":";
         for ( Object key : new ArrayList( properties.keySet() ) )
         {
@@ -1075,4 +1075,36 @@ public class FileMetadataRepository
             return artifact1.getWhenGathered().compareTo( artifact2.getWhenGathered() );
         }
     }
+
+    public List<ArtifactMetadata> getArtifacts( String repoId )
+    {
+
+        List<ArtifactMetadata> artifacts = new ArrayList<ArtifactMetadata>();
+        for ( String ns : getRootNamespaces( repoId ) )
+        {
+            getArtifacts( artifacts, repoId, ns );
+        }
+        return artifacts;
+    }
+
+    private void getArtifacts( List<ArtifactMetadata> artifacts, String repoId, String ns )
+    {
+        for ( String namespace : getNamespaces( repoId, ns ) )
+        {
+            getArtifacts( artifacts, repoId, ns + "." + namespace );
+        }
+
+        for ( String project : getProjects( repoId, ns ) )
+        {
+            for ( String version : getProjectVersions( repoId, ns, project ) )
+            {
+                for ( ArtifactMetadata artifact : getArtifacts( repoId, ns, project, version ) )
+                {
+
+                    artifacts.add( artifact );
+
+                }
+            }
+        }
+    }
 }

Modified: archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java?rev=1002059&r1=1002058&r2=1002059&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java Tue Sep 28 09:09:32 2010
@@ -50,7 +50,6 @@ public class FileMetadataRepositoryTest
         FileMetadataRepository repository = new FileMetadataRepository();
         repository.setConfiguration( config );
         repository.setMetadataFacetFactories( factories );
-
         this.repository = repository;
     }
 

Modified: archiva/trunk/archiva-modules/plugins/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/pom.xml?rev=1002059&r1=1002058&r2=1002059&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/pom.xml Tue Sep 28 09:09:32 2010
@@ -35,6 +35,7 @@
     <!-- TODO: eventually not a core plugin, needs to be moved to a separate tree, with it's own Selenium tests -->
     <module>npanday-support</module>
     <module>maven1-repository</module>
+    <module>stage-repository-merge</module>
     <module>generic-metadata-support</module>
   </modules>
-</project>
\ No newline at end of file
+</project>

Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:699795-705848
-/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:825850-889227,889228-909464*
+/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:825850-889227,889228-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:825850-909464
+/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:825850-909464
+/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:825850-909464
+/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:699795-705848
-/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:825850-889227,889228-909464*
+/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:825850-889227,889228-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:825850-909464
+/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/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/plugins/repository-statistics/src/main/java/org/apache/archiva:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/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/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/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/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:825850-909464
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:825850-909464
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:825850-909464
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:825850-909464
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/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/plugins/repository-statistics/src/test/java/org/apache/archiva:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/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/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/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/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:825850-887039,887040-909464*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:825850-887039,887040-909464*,960322

Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:825850-909464
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:825850-909464,960322

Propchange: archiva/trunk/archiva-modules/plugins/stage-repository-merge/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Sep 28 09:09:32 2010
@@ -0,0 +1,5 @@
+.classpath
+.project
+.settings
+target
+*.iml

Copied: archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml (from r1001988, archiva/branches/archiva-MRM-980/archiva-modules/plugins/stage-repository-merge/pom.xml)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml?p2=archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml&p1=archiva/branches/archiva-MRM-980/archiva-modules/plugins/stage-repository-merge/pom.xml&r1=1001988&r2=1002059&rev=1002059&view=diff
==============================================================================
--- archiva/branches/archiva-MRM-980/archiva-modules/plugins/stage-repository-merge/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml Tue Sep 28 09:09:32 2010
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>plugins</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.4-MRM-980-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.archiva</groupId>
   <artifactId>stage-repository-merge</artifactId>
@@ -27,27 +27,27 @@
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>metadata-repository-api</artifactId>
-      <version>1.4-MRM-980-SNAPSHOT</version>
+      <version>1.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
-      <version>1.4-MRM-980-SNAPSHOT</version>
+      <version>1.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>maven2-repository</artifactId>
-      <version>1.4-MRM-980-SNAPSHOT</version>
+      <version>1.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-model</artifactId>
-      <version>1.4-MRM-980-SNAPSHOT</version>
+      <version>1.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>metadata-repository-file</artifactId>
-      <version>1.4-MRM-980-SNAPSHOT</version>
+      <version>1.4-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>

Propchange: archiva/trunk/skin/src/main/resources/META-INF/maven/site.vm
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -1 +1 @@
-/archiva/trunk/skin/src/main/resources/META-INF/maven/site.vm:899478-909464
+/archiva/trunk/skin/src/main/resources/META-INF/maven/site.vm:899478-909464,960322

Propchange: archiva/trunk/skin/src/main/resources/css/maven-base.css
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -1 +1 @@
-/archiva/trunk/skin/src/main/resources/css/maven-base.css:899478-909464
+/archiva/trunk/skin/src/main/resources/css/maven-base.css:899478-909464,960322

Propchange: archiva/trunk/skin/src/main/resources/css/print.css
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -1 +1 @@
-/archiva/trunk/skin/src/main/resources/css/print.css:899478-909464
+/archiva/trunk/skin/src/main/resources/css/print.css:899478-909464,960322

Propchange: archiva/trunk/skin/src/main/resources/images/logos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 09:09:32 2010
@@ -1 +1 @@
-/archiva/trunk/skin/src/main/resources/images/logos:899478-909464
+/archiva/trunk/skin/src/main/resources/images/logos:899478-909464,960322



Mime
View raw message