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 2011/05/04 14:03:36 UTC
svn commit: r1099425 [5/6] - in /archiva/trunk: ./ archiva-docs/
archiva-modules/archiva-base/
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/
archiva-modules/archiva-base/archiva-pr...
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java:1066068-1091313,1098897
/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
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java:1066068-1091313,1098897
/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
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java:1066068-1091313,1098897
/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
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java:1066068-1091313,1098897
/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
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit:1066068-1091313,1098897
/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
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java:1066068-1091313,1098897
/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
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:1066068-1091313,1098897
/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*,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 Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:721945-723577
/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-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:1066068-1091313,1098897
/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,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 Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:721945-723577
/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-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:1066068-1091313,1098897
/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,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolver.java:721945-723577
/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-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java:1066068-1091313,1098897
/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,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 Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java:721945-723577
/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-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java:1066068-1091313,1098897
/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
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 Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:721945-723577
/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-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:1066068-1091313,1098897
/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,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 Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java:721945-723577
/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-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java:1066068-1091313,1098897
/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,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 Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:721945-723577
/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-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:1066068-1091313,1098897
/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,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 Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:721945-723577
/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-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:1066068-1091313,1098897
/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,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 Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:721945-723577
/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-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:1066068-1091313,1098897
/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,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 Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:721945-723577
/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-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:1066068-1091313,1098897
/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,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:1066068-1091313,1098897
/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,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:1066068-1091313,1098897
/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*,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 Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:1066068-1091313,1098897
/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,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,2 +1,2 @@
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:1066068-1091313,1098897
/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 Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:1066068-1091313,1098897
/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,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:1066068-1091313,1098897
/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*,960322
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 Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:721945-723577
/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-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:1066068-1091313,1098897
/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,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 Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:721945-723577
/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-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:1066068-1091313,1098897
/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,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:1066068-1091313,1098897
/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,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:1066068-1091313,1098897
/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*,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 Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:1066068-1091313,1098897
/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,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:1066068-1091313,1098897
/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*,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 Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:721945-723577
/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-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:1066068-1091313,1098897
/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,960322
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:1066068-1091313,1098897
/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,960322
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:1066068-1091313,1098897
/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,960322
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:1066068-1091313,1098897
/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,960322
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:1066068-1091313,1098897
/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,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/pom.xml:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/pom.xml:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/pom.xml:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/pom.xml:1066068-1091313,1098897
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/pom.xml:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/pom.xml:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml:825850-909464
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:1066068-1091313,1098897
/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*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:1066068-1091313,1098897
/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*,960322