svn commit: r516433 - in /maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva: repositories/DefaultActiveManagedRepositories.java scheduler/executors/DataRefreshExecutor.java

[joakime]

Author: joakime
Date: Fri Mar  9 07:27:46 2007
New Revision: 516433

URL: http://svn.apache.org/viewvc?view=rev&rev=516433
Log:
Correcting 'last refresh timestamp' on webpage.

Modified:
    
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/repositories/DefaultActiveManagedRepositories.java
    
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutor.java

Modified: 
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/repositories/DefaultActiveManagedRepositories.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/repositories/DefaultActiveManagedRepositories.java?view=diff&rev=516433&r1=516432&r2=516433
==============================================================================
--- 
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/repositories/DefaultActiveManagedRepositories.java
 (original)
+++ 
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/repositories/DefaultActiveManagedRepositories.java
 Fri Mar  9 07:27:46 2007
@@ -29,6 +29,7 @@
 import org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory;
 import org.apache.maven.archiva.configuration.RepositoryConfiguration;
 import org.apache.maven.archiva.discoverer.DiscovererStatistics;
+import org.apache.maven.archiva.scheduler.executors.DataRefreshExecutor;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -44,6 +45,7 @@
 import org.codehaus.plexus.registry.RegistryListener;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 
@@ -305,9 +307,19 @@
             ArtifactRepository repository = (ArtifactRepository) i.next();
 
             DiscovererStatistics stats = new DiscovererStatistics( repository 
);
-            if ( stats.getTimestampFinished() > lastDataRefreshTime )
+            try
             {
-                lastDataRefreshTime = stats.getTimestampFinished();
+                stats.load( DataRefreshExecutor.DATAREFRESH_FILE );
+                if ( stats.getTimestampFinished() > lastDataRefreshTime )
+                {
+                    lastDataRefreshTime = stats.getTimestampFinished();
+                }
+            }
+            catch ( IOException e )
+            {
+                getLogger().info(
+                                  "Unable to load " + 
DataRefreshExecutor.DATAREFRESH_FILE
+                                      + " to determine last refresh timestamp: 
" + e.getMessage(), e );
             }
         }
 

Modified: 
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutor.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutor.java?view=diff&rev=516433&r1=516432&r2=516433
==============================================================================
--- 
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutor.java
 (original)
+++ 
maven/archiva/trunk/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/executors/DataRefreshExecutor.java
 Fri Mar  9 07:27:46 2007
@@ -54,7 +54,7 @@
     extends AbstractLogEnabled
     implements TaskExecutor
 {
-    private static final String DATAREFRESH_FILE = ".datarefresh";
+    public static final String DATAREFRESH_FILE = ".datarefresh";
 
     /**
      * Configuration store.