You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2011/05/04 14:03:36 UTC
svn commit: r1099425 [6/6] - in /archiva/trunk: ./ archiva-docs/
archiva-modules/archiva-base/
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/src/main/java/org/apache/maven/archiva/consumers/
archiva-modules/archiva-base/archiva-pr...
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/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
+/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
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/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
+/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
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:721945-723577
/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-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:1066068-1091313,1098897
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:721945-723577
/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-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:1066068-1091313,1098897
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java:825850-909464,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test:1066068-1091313,1098897
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java:1066068-1091313,1098897
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org:1066068-1091313,1098897
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:1066068-1091313,1098897
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:1066068-1091313,1098897
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:1066068-1091313,1098897
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:1066068-1091313,1098897
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:721945-723577
/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:686983-687034
-/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:1066068-1091313,1098897
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats:825850-887039,887040-909464*,960322
Propchange: archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,6 +1,6 @@
/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:721945-723577
/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-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:1066068-1091313
+/archiva/branches/archiva-1.3.x/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:1066068-1091313,1098897
/archiva/branches/archiva-search-improvements/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:723609-726925
/archiva/branches/archiva-struts2/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:699795-705848
/archiva/trunk/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java:825850-909464,960322
Propchange: archiva/trunk/skin/src/main/resources/META-INF/maven/site.vm
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,2 +1,2 @@
-/archiva/branches/archiva-1.3.x/skin/src/main/resources/META-INF/maven/site.vm:1066068-1091313
+/archiva/branches/archiva-1.3.x/skin/src/main/resources/META-INF/maven/site.vm:1066068-1091313,1098897
/archiva/trunk/skin/src/main/resources/META-INF/maven/site.vm:899478-909464,960322
Propchange: archiva/trunk/skin/src/main/resources/css/maven-base.css
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,2 +1,2 @@
-/archiva/branches/archiva-1.3.x/skin/src/main/resources/css/maven-base.css:1066068-1091313
+/archiva/branches/archiva-1.3.x/skin/src/main/resources/css/maven-base.css:1066068-1091313,1098897
/archiva/trunk/skin/src/main/resources/css/maven-base.css:899478-909464,960322
Propchange: archiva/trunk/skin/src/main/resources/css/print.css
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,2 +1,2 @@
-/archiva/branches/archiva-1.3.x/skin/src/main/resources/css/print.css:1066068-1091313
+/archiva/branches/archiva-1.3.x/skin/src/main/resources/css/print.css:1066068-1091313,1098897
/archiva/trunk/skin/src/main/resources/css/print.css:899478-909464,960322
Propchange: archiva/trunk/skin/src/main/resources/images/logos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 4 12:03:29 2011
@@ -1,2 +1,2 @@
-/archiva/branches/archiva-1.3.x/skin/src/main/resources/images/logos:1066068-1091313
+/archiva/branches/archiva-1.3.x/skin/src/main/resources/images/logos:1066068-1091313,1098897
/archiva/trunk/skin/src/main/resources/images/logos:899478-909464,960322