Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 8 15:09:13 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository:686983-687034 +/archiva/branches/archiva-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-888396*
Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 8 15:09:13 2009 @@ -0,0 +1,5 @@ +/archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:721945-723577 +/archiva/branches/MRM-541/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats:686983-687034 +/archiva/branches/archiva-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-888396* 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=888427&r1=888426&r2=888427&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 Dec 8 15:09:13 2009 @@ -101,7 +101,8 @@ try { Date date = SCAN_TIMESTAMP.parse( name ); - if ( !date.before( startTime ) && !date.after( endTime ) ) + if ( ( startTime == null || !date.before( startTime ) ) && + ( endTime == null || !date.after( endTime ) ) ) { RepositoryStatistics stats = (RepositoryStatistics) metadataRepository.getMetadataFacet( repositoryId, Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 8 15:09:13 2009 @@ -0,0 +1,5 @@ +/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-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-888396 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 8 15:09:13 2009 @@ -0,0 +1,5 @@ +/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-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-888396 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsFactory.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 8 15:09:13 2009 @@ -0,0 +1,5 @@ +/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-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-888396 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManager.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 8 15:09:13 2009 @@ -0,0 +1,5 @@ +/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-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-888396 Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 8 15:09:13 2009 @@ -0,0 +1,5 @@ +/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-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-888396* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 8 15:09:13 2009 @@ -0,0 +1,5 @@ +/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-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-888396* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 8 15:09:13 2009 @@ -0,0 +1,5 @@ +/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-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-888396* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 8 15:09:13 2009 @@ -0,0 +1,5 @@ +/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-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-888396* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 8 15:09:13 2009 @@ -0,0 +1,5 @@ +/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-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-888396* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 8 15:09:13 2009 @@ -0,0 +1,5 @@ +/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-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-888396* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 8 15:09:13 2009 @@ -0,0 +1,5 @@ +/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-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-888396* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 8 15:09:13 2009 @@ -0,0 +1,5 @@ +/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-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-888396* Propchange: archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 8 15:09:13 2009 @@ -0,0 +1,5 @@ +/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-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-888396
