From: Brett Porter <brett@apache.org>
Date: Thu, 17 Dec 2009 02:00:27 +0000 (+0000)
Subject: [MRM-1293] align the documented content model to the implementation for the statistic... 
X-Git-Tag: archiva-1.4-M1~1017^2~62
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=62e051806eacd5e108734845cf040c479a2037d8;p=archiva.git

[MRM-1293] align the documented content model to the implementation for the statistics nodes

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1025@891520 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/metadata/content-model.txt b/archiva-modules/metadata/content-model.txt
index 993130466..2273e77b3 100644
--- a/archiva-modules/metadata/content-model.txt
+++ b/archiva-modules/metadata/content-model.txt
@@ -127,29 +127,25 @@ The following is the intended content model for the metadata content repository:
             `-- 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=
-
-(To update - run "tree --dirstfirst -F" on the unpacked content-model.zip from the sandbox)
+                        `-- 090000.000/
+                            |-- scanEndTime=
+                            |-- scanStartTime=
+                            |-- totalArtifactCount=
+                            |-- totalArtifactFileSize=
+                            |-- totalFileCount=
+                            |-- totalGroupCount=
+                            `-- totalProjectCount=
+
+(To update - run "tree --dirsfirst -F" on the unpacked content-model.zip from the sandbox)
 
 Notes:
 
diff --git a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java
index 735818ce5..79678ac3d 100644
--- a/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java
+++ b/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java
@@ -48,7 +48,7 @@ public class RepositoryStatistics
 
     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>();
 
diff --git a/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java b/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java
index e4da83773..09ec07907 100644
--- a/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java
+++ b/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java
@@ -48,9 +48,9 @@ public class RepositoryStatisticsManagerTest
 
     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>();