You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/12/14 16:37:56 UTC
svn commit: r1214303 [2/3] - in /archiva/trunk: ./ archiva-docs/
archiva-docs/src/site/apt/ archiva-modules/archiva-base/
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/archiva/consumers/
archiva-modules/ar...
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:1214301
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild2/2.0/grandchild2-2.0.pom:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:1214301
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:1214301
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:1214301
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/grandchild3/2.0/grandchild3-2.0.pom:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:1214301
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:1214301
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:1214301
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/repositories/test/groupId/great-grandchild/3.0/great-grandchild-3.0.pom:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/archiva-web/archiva-webdav:1214301
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav:918857,1049409,1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:1214301
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:1214301
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:1214301
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:1214301
/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:1214301
/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:721945-723577
/archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:1214301
/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/AllFilter.java:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:1214301
/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java:1214301
/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/Filter.java:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/IncludesFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/IncludesFilter.java:1214301
/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/ExcludesFilter.java:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/filter/IncludesFilter.java:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage:1214301
/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage:721945-723577
/archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:1214301
/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryPathTranslator.java:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryStorage.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryStorage.java:1214301
/archiva/branches/MRM-1025/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java:721945-723577
/archiva/branches/MRM-541/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/StorageMetadataResolver.java:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryStorage.java:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT/incomplete-metadata-1.0-20091101.112233-1.pom:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/incomplete-metadata/1.0-SNAPSHOT/maven-metadata.xml:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/invalid-pom/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/invalid-pom:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/invalid-pom:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/invalid-pom/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/invalid-pom/1.0:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/invalid-pom/1.0:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom/1.0:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom/1.0:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/missing-metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/missing-metadata:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/missing-metadata:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/missing-metadata/1.0-SNAPSHOT/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/missing-metadata/1.0-SNAPSHOT:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/missing-metadata/1.0-SNAPSHOT:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/plugins:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/plugins:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/shared:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/shared:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/shared/maven-downloader/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/shared/maven-downloader:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/shared/maven-downloader:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/shared/maven-downloader/maven-metadata.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/shared/maven-downloader/maven-metadata.xml:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/metadata/test-repository/src/main/resources/org/apache/maven/shared/maven-downloader/maven-metadata.xml:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit:686983-687034
/archiva/branches/archiva-1.3.x/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditEventFactory.java:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/AuditManager.java:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/MetadataAuditListener.java:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/audit/src/test/java/org/apache/archiva/audit/AuditManagerTest.java:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2:1214301
/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,1098897,1102210,1103608
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 Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/DummyLifecycleBindingsInjector.java:1214301
/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,1098897,1102210,1103608
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 Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java:1214301
/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,1098897,1102210,1103608
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 Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java:1214301
/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,1098897,1102210,1103608
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 Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacetFactory.java:1214301
/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,1098897,1102210,1103608
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 Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacet.java:1214301
/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,1098897,1102210,1103608
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 Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectFacetFactory.java:1214301
/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,1098897,1102210,1103608
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 Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenProjectParent.java:1214301
/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,1098897,1102210,1103608
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 Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadata.java:1214301
/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,1098897,1102210,1103608
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 Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReader.java:1214301
/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,1098897,1102210,1103608
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 Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2:1214301
/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,1098897,1102210,1103608
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 Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,2 +1,3 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:1214301
/archiva/branches/archiva-1.3.x/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataRepository.java:1066068-1091313,1098897,1102210,1103608
/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 Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestMetadataResolver.java:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2:1214301
/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,1098897,1102210,1103608
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 Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java:1214301
/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,1098897,1102210,1103608
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 Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/MavenRepositoryMetadataReaderTest.java:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/test/resources:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/pom.xml:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/main:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/main/java:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/main/java/org:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:1214301
/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,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:721945-723577
/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-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:1066068-1091313,1098897,1102210,1103608
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 15:37:51 2011
@@ -1,3 +1,4 @@
+/archiva/branches/1.4-M2-RC/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:1214301
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:721945-723577
/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-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:1066068-1091313,1098897,1102210,1103608