svn commit: r891520 - in /archiva/branches/MRM-1025/archiva-modules: metadata/ plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/ plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/...

[brett]

Author: brett
Date: Thu Dec 17 02:00:27 2009
New Revision: 891520

URL: http://svn.apache.org/viewvc?rev=891520&view=rev
Log:
[MRM-1293] align the documented content model to the implementation for the 
statistics nodes

Modified:
    archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt
    
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java
    
archiva/branches/MRM-1025/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java

Modified: archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt
URL: 
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt?rev=891520&r1=891519&r2=891520&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt 
(original)
+++ archiva/branches/MRM-1025/archiva-modules/metadata/content-model.txt Thu 
Dec 17 02:00:27 2009
@@ -127,29 +127,25 @@
             `-- 2009/
                 `-- 12/
                     |-- 02/
-                    |   `-- 23/
-                    |       `-- 47/
-                    |           `-- 00/
-                    |               |-- scanEndTime=
-                    |               |-- scanStartTime=
-                    |               |-- totalArtifactCount=
-                    |               |-- totalArtifactFileSize=
-                    |               |-- totalFileCount=
-                    |               |-- totalGroupCount=
-                    |               `-- totalProjectCount=
+                    |   `-- 234700.000/
+                    |       |-- scanEndTime=
+                    |       |-- scanStartTime=
+                    |       |-- totalArtifactCount=
+                    |       |-- totalArtifactFileSize=
+                    |       |-- totalFileCount=
+                    |       |-- totalGroupCount=
+                    |       `-- totalProjectCount=
                     `-- 03/
-                        `-- 09/
-                            `-- 00/
-                                `-- 00/
-                                    |-- scanEndTime=
-                                    |-- scanStartTime=
-                                    |-- totalArtifactCount=
-                                    |-- totalArtifactFileSize=
-                                    |-- totalFileCount=
-                                    |-- totalGroupCount=
-                                    `-- totalProjectCount=
+                        `-- 090000.000/
+                            |-- scanEndTime=
+                            |-- scanStartTime=
+                            |-- totalArtifactCount=
+                            |-- totalArtifactFileSize=
+                            |-- totalFileCount=
+                            |-- totalGroupCount=
+                            `-- totalProjectCount=
 
-(To update - run "tree --dirstfirst -F" on the unpacked content-model.zip from 
the sandbox)
+(To update - run "tree --dirsfirst -F" on the unpacked content-model.zip from 
the sandbox)
 
 Notes:
 

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=891520&r1=891519&r2=891520&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
 Thu Dec 17 02:00:27 2009
@@ -48,7 +48,7 @@
 
     public static String FACET_ID = 
"org.apache.archiva.metadata.repository.stats";
 
-    static final DateFormat SCAN_TIMESTAMP = new SimpleDateFormat( 
"yyyyMMdd.HHmmss.SSS" );
+    static final DateFormat SCAN_TIMESTAMP = new SimpleDateFormat( 
"yyyy/MM/dd/HHmmss.SSS" );
 
     private Map<String, Long> totalCountForType = new HashMap<String, Long>();
 

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=891520&r1=891519&r2=891520&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
 Thu Dec 17 02:00:27 2009
@@ -48,9 +48,9 @@
 
     private MetadataRepository metadataRepository;
 
-    private static final String FIRST_TEST_SCAN = "20091201.123456.789";
+    private static final String FIRST_TEST_SCAN = "2009/12/01/123456.789";
 
-    private static final String SECOND_TEST_SCAN = "20091202.012345.678";
+    private static final String SECOND_TEST_SCAN = "2009/12/02/012345.678";
 
     private Map<String, RepositoryStatistics> statsCreated = new 
LinkedHashMap<String, RepositoryStatistics>();