svn commit: r743945 - in /archiva/branches/archiva-with-new-repoapi/archiva-modules: archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ archiva-scheduled/src/test/java/org/apache/maven/a...

[jdumay]

Author: jdumay
Date: Fri Feb 13 01:16:36 2009
New Revision: 743945

URL: http://svn.apache.org/viewvc?rev=743945&view=rev
Log:
Database update should work again

Modified:
    
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
    
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java

Modified: 
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java?rev=743945&r1=743944&r2=743945&view=diff
==============================================================================
--- 
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
 (original)
+++ 
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/src/main/java/org/apache/maven/archiva/consumers/database/ArtifactUpdateDatabaseConsumer.java
 Fri Feb 13 01:16:36 2009
@@ -162,8 +162,8 @@
             return;
         }
 
-//        try
-//        {
+        try
+        {
             artifact.getModel().setRepositoryId( this.repository.getId() );
 
             // Calculate the hashcodes.
@@ -199,12 +199,12 @@
                 artifact.getModel().setWhenGathered( whenGathered );
             }
 
-            //dao.getArtifactDAO().saveArtifact( artifact );
-//        }
-//        catch ( ArchivaDatabaseException e )
-//        {
-//            triggerConsumerError( DB_ERROR, "Unable to save artifact to 
database: " + e.getMessage() );
-//        }
+            dao.getArtifactDAO().saveArtifact( artifact );
+        }
+        catch ( ArchivaDatabaseException e )
+        {
+            triggerConsumerError( DB_ERROR, "Unable to save artifact to 
database: " + e.getMessage() );
+        }
     }
 
     /**

Modified: 
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java?rev=743945&r1=743944&r2=743945&view=diff
==============================================================================
--- 
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
 (original)
+++ 
archiva/branches/archiva-with-new-repoapi/archiva-modules/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
 Fri Feb 13 01:16:36 2009
@@ -53,6 +53,7 @@
 
     protected ArchivaDAO dao;
     
+    @Override
     protected void setUp()
         throws Exception
     {