You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2010/01/19 07:15:20 UTC
svn commit: r900664 [6/7] - in /archiva/branches/MRM-1025: ./ archiva-cli/ archiva-docs/ archiva-docs/src/site/ archiva-docs/src/site/apt/ archiva-docs/src/site/apt/adminguide/ archiva-docs/src/site/apt/userguide/ archiva-docs/src/site/resources/images...

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom:825850-883981,883982-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom:825850-883981,883982-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0:825850-883981,883982-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0:825850-883981,883982-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/invalid-pom/1.0/invalid-pom-1.0.pom:825850-899477

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata:825850-883981,883982-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata:825850-883981,883982-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:825850-883981,883982-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT:825850-883981,883982-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/malformed-metadata-1.0-20091101.112233-1.pom:825850-899477

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/malformed-metadata/1.0-SNAPSHOT/maven-metadata.xml:825850-899477

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom:825850-883981,889228-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom:825850-883981,889228-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0:825850-883981,889228-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0:825850-883981,889228-899477*

Propchange: 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
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom:825850-883981,889228-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/mislocated-pom/1.0/mislocated-pom-1.0.pom:825850-883981,889228-899477

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:825850-883981,883982-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata:825850-883981,883982-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:825850-883981,883982-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT:825850-883981,883982-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/com/example/test/missing-metadata/1.0-SNAPSHOT/missing-metadata-1.0-20091101.112233-1.pom:825850-899477

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven:825850-882383,882384-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:825850-882383,883982-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/plugins:825850-882383,883982-899477

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared:825850-882383,882384-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader:825850-882383,882384-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/repositories/test/org/apache/maven/shared/maven-downloader/maven-metadata.xml:825850-899477

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources:825850-882383,882384-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:825850-882383,885006-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/commons-io:825850-882383,885006-899477

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org:825850-882383,882384-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache:825850-882383,882384-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva:825850-882383,882384-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:825850-882383,885006-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency:825850-882383,885006-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:825850-882383,885006-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree:825850-882383,885006-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:825850-882383,885006-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2:825850-882383,885006-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:825850-882383,885006-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.xml:825850-882383,885006-899477

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata:825850-882383,882384-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository:825850-882383,882384-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage:825850-882383,882384-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-891135*
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2:825850-882383,882384-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:699795-705848
-/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:825850-891135
+/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/resources/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.xml:825850-899477

Modified: archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/pom.xml Tue Jan 19 06:15:09 2010
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>plugins</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>metadata-repository-file</artifactId>
   <name>File System Backed Metadata Repository</name>

Modified: archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java Tue Jan 19 06:15:09 2010
@@ -293,7 +293,7 @@
         MetadataFacetFactory metadataFacetFactory = metadataFacetFactories.get( facetId );
         if ( metadataFacetFactory != null )
         {
-            metadataFacet = metadataFacetFactory.createMetadataFacet();
+            metadataFacet = metadataFacetFactory.createMetadataFacet( repositoryId, name );
             Map<String, String> map = new HashMap<String, String>();
             for ( String key : properties.stringPropertyNames() )
             {

Modified: archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java Tue Jan 19 06:15:09 2010
@@ -69,6 +69,8 @@
 
     private static final String TEST_SHA1 = "2e5daf0201ddeb068a62d5e08da18657ab2c6be9";
 
+    private static final String TEST_METADATA_VALUE = "test-metadata";
+
     public void setUp()
         throws Exception
     {
@@ -84,7 +86,12 @@
         {
             public MetadataFacet createMetadataFacet()
             {
-                return new TestMetadataFacet( "test-metadata" );
+                return new TestMetadataFacet( TEST_METADATA_VALUE );
+            }
+
+            public MetadataFacet createMetadataFacet( String repositoryId, String name )
+            {
+                return new TestMetadataFacet( TEST_METADATA_VALUE );
             }
         } );
 
@@ -93,7 +100,12 @@
         {
             public MetadataFacet createMetadataFacet()
             {
-                return new TestMetadataFacet( "", "test-value" );
+                return new TestMetadataFacet( "", TEST_VALUE );
+            }
+
+            public MetadataFacet createMetadataFacet( String repositoryId, String name )
+            {
+                return new TestMetadataFacet( "", TEST_VALUE );
             }
         } );
         repository.setMetadataFacetFactories( factories );
@@ -189,7 +201,7 @@
     {
         repository.addMetadataFacet( TEST_REPO_ID, new TestMetadataFacet( null ) );
 
-        assertEquals( new TestMetadataFacet( "test-metadata" ),
+        assertEquals( new TestMetadataFacet( TEST_METADATA_VALUE ),
                       repository.getMetadataFacet( TEST_REPO_ID, TEST_FACET_ID, TEST_NAME ) );
     }
 

Modified: archiva/branches/MRM-1025/archiva-modules/plugins/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/pom.xml Tue Jan 19 06:15:09 2010
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>archiva-modules</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>plugins</artifactId>
   <name>Archiva Core Plugins</name>
@@ -31,5 +31,6 @@
     <module>maven2-repository</module>
     <module>repository-statistics</module>
     <module>problem-reports</module>
+    <module>audit</module>
   </modules>
 </project>
\ No newline at end of file

Modified: archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/pom.xml Tue Jan 19 06:15:09 2010
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>plugins</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>problem-reports</artifactId>
   <name>Archiva Problem Reporting Plugin</name>

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:699795-705848
-/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:825850-889227,889228-891135*
+/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports:825850-889227,889228-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemEventListener.java:825850-899477

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacet.java:825850-899477

Modified: archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java Tue Jan 19 06:15:09 2010
@@ -32,4 +32,9 @@
     {
         return new RepositoryProblemFacet();
     }
+
+    public MetadataFacet createMetadataFacet( String repositoryId, String name )
+    {
+        return new RepositoryProblemFacet();
+    }
 }

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/RepositoryProblemFacetFactory.java:825850-899477

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:699795-705848
-/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:825850-889227,889228-891135*
+/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers:825850-889227,889228-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/problem-reports/src/main/java/org/apache/archiva/reports/consumers/DuplicateArtifactsConsumer.java:825850-899477

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics:825850-887039,887040-899477*

Modified: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/pom.xml Tue Jan 19 06:15:09 2010
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>plugins</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <artifactId>repository-statistics</artifactId>
   <name>Repository Statistics</name>

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/pom.xml:686983-687034
 /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-891135
+/archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml:825850-899477

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/model/stats:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:825850-887039,887040-899477*

Modified: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java Tue Jan 19 06:15:09 2010
@@ -20,6 +20,7 @@
  */
 
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -164,7 +165,7 @@
         {
             try
             {
-                Date date = RepositoryStatistics.SCAN_TIMESTAMP.parse( name );
+                Date date = new SimpleDateFormat( RepositoryStatistics.SCAN_TIMESTAMP_FORMAT ).parse( name );
                 if ( ( startTime == null || !date.before( startTime ) ) &&
                     ( endTime == null || !date.after( endTime ) ) )
                 {

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:825850-899477

Modified: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java Tue Jan 19 06:15:09 2010
@@ -19,7 +19,6 @@
  * under the License.
  */
 
-import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -48,7 +47,7 @@
 
     public static String FACET_ID = "org.apache.archiva.metadata.repository.stats";
 
-    static final DateFormat SCAN_TIMESTAMP = new SimpleDateFormat( "yyyy/MM/dd/HHmmss.SSS" );
+    static final String SCAN_TIMESTAMP_FORMAT = "yyyy/MM/dd/HHmmss.SSS";
 
     private Map<String, Long> totalCountForType = new HashMap<String, Long>();
 
@@ -144,7 +143,7 @@
 
     public String getName()
     {
-        return SCAN_TIMESTAMP.format( scanStartTime );
+        return new SimpleDateFormat( SCAN_TIMESTAMP_FORMAT ).format( scanStartTime );
     }
 
     public Map<String, String> toProperties()

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:825850-899477

Modified: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java Tue Jan 19 06:15:09 2010
@@ -32,4 +32,9 @@
     {
         return new RepositoryStatistics();
     }
+
+    public MetadataFacet createMetadataFacet( String repositoryId, String name )
+    {
+        return new RepositoryStatistics();
+    }
 }
\ No newline at end of file

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:825850-899477

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:825850-899477

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:825850-887039,887040-899477*

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:825850-887039,887040-891135*
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:825850-887039,887040-899477*

Modified: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java Tue Jan 19 06:15:09 2010
@@ -20,6 +20,7 @@
  */
 
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -82,10 +83,11 @@
     public void testGetLatestStats()
         throws ParseException
     {
-        Date endTime = new Date( RepositoryStatistics.SCAN_TIMESTAMP.parse( SECOND_TEST_SCAN ).getTime() + 60000 );
+        Date startTime = parseTimestamp( SECOND_TEST_SCAN );
+        Date endTime = new Date( startTime.getTime() + 60000 );
 
         RepositoryStatistics stats = new RepositoryStatistics();
-        stats.setScanStartTime( RepositoryStatistics.SCAN_TIMESTAMP.parse( SECOND_TEST_SCAN ) );
+        stats.setScanStartTime( startTime );
         stats.setScanEndTime( endTime );
         stats.setTotalArtifactFileSize( 1314527915L );
         stats.setNewFileCount( 123 );
@@ -110,13 +112,24 @@
         assertEquals( 2031, stats.getTotalProjectCount() );
         assertEquals( 529, stats.getTotalGroupCount() );
         assertEquals( 56229, stats.getTotalFileCount() );
-        assertEquals( SECOND_TEST_SCAN, RepositoryStatistics.SCAN_TIMESTAMP.format( stats.getScanStartTime() ) );
+        assertEquals( SECOND_TEST_SCAN, formatTimestamp( stats.getScanStartTime() ) );
         assertEquals( SECOND_TEST_SCAN, stats.getName() );
         assertEquals( endTime, stats.getScanEndTime() );
 
         metadataRepositoryControl.verify();
     }
 
+    private static String formatTimestamp( Date value )
+    {
+        return new SimpleDateFormat( RepositoryStatistics.SCAN_TIMESTAMP_FORMAT ).format( value );
+    }
+
+    private static Date parseTimestamp( String value )
+        throws ParseException
+    {
+        return new SimpleDateFormat( RepositoryStatistics.SCAN_TIMESTAMP_FORMAT ).parse( value );
+    }
+
     public void testGetLatestStatsWhenEmpty()
     {
         metadataRepositoryControl.expectAndReturn(
@@ -516,8 +529,7 @@
             metadataRepositoryControl.expectAndReturn(
                 metadataRepository.getArtifacts( TEST_REPO_ID, "org.apache.archiva", "metadata-model", "1.3-SNAPSHOT" ),
                 Arrays.asList( createArtifact( "org.apache.archiva", "metadata-model", "1.3-SNAPSHOT", "jar" ),
-                               createArtifact( "org.apache.archiva", "metadata-model", "1.3-SNAPSHOT",
-                                               "pom" ) ) );
+                               createArtifact( "org.apache.archiva", "metadata-model", "1.3-SNAPSHOT", "pom" ) ) );
             metadataRepositoryControl.expectAndReturn(
                 metadataRepository.getArtifacts( TEST_REPO_ID, "org.apache.archiva", "metadata-model", "1.3" ),
                 Arrays.asList( createArtifact( "org.apache.archiva", "metadata-model", "1.3", "jar" ),

Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 06:15:09 2010
@@ -2,4 +2,4 @@
 /archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:686983-687034
 /archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:723609-726925
 /archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:699795-705848
-/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:825850-891135
+/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:825850-899477

Modified: archiva/branches/MRM-1025/archiva-modules/pom.xml
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/pom.xml?rev=900664&r1=900663&r2=900664&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-modules/pom.xml Tue Jan 19 06:15:09 2010
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>archiva</artifactId>
     <groupId>org.apache.archiva</groupId>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.4-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-modules</artifactId>