test case is executing successfully now

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@527692 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-base/archiva-scheduled/pom.xml b/archiva-base/archiva-scheduled/pom.xml
index 1be6b5b1fc37960782af637c5fb0d8f811b7e8c0..3b6186b135c68d4128491309455cda8243b7ac1d 100644 (file)
--- a/archiva-base/archiva-scheduled/pom.xml
+++ b/archiva-base/archiva-scheduled/pom.xml
@@ -55,17 +55,6 @@
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1</version>
-      <exclusions>
-        <exclusion>
-          <groupId>logkit</groupId>
-          <artifactId>logkit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
@@ -75,12 +64,18 @@
       <artifactId>plexus-registry-api</artifactId>
       <version>1.0-alpha-2</version>
     </dependency>
+    <!-- Test Dependencies -->
     <dependency>
       <groupId>org.codehaus.plexus.registry</groupId>
       <artifactId>plexus-registry-commons</artifactId>
       <version>1.0-alpha-2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-core-consumers</artifactId>
+      <scope>test</scope> 
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java b/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java
index eca2589665296580332155c1856d8597c50eed4c..a7b380ddd1b47ac534caf8a521ed901c6cc40764 100644 (file)
--- a/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java
+++ b/archiva-base/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java
@@ -112,18 +112,10 @@ public class ArchivaScheduledTaskExecutor extends AbstractLogEnabled implements
         
         long time = System.currentTimeMillis();
 
-        
+        // insert repository scanning codelets here
         
         time = System.currentTimeMillis() - time;
 
         getLogger().info( "Finished repository task for " + time + "ms." );
     }
-    
-    public void execute() throws TaskExecutionException
-    {
-        Configuration configuration = archivaConfiguration.getConfiguration();
-
-        
-
-    }
 }

diff --git a/archiva-base/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java b/archiva-base/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java
index a3028ee2e2e8bb3b5f5e97333635343c77d3d8f0..cf1720ea3dbf62a8b888d0cedfa54c5a9e352045 100644 (file)
--- a/archiva-base/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java
+++ b/archiva-base/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.java
@@ -51,15 +51,15 @@ public class ArchivaScheduledTaskExecutorTest
     public void testExecutor()
         throws TaskExecutionException
     {
-        taskExecutor.executeTask( new TestDataRefreshTask() );
+        taskExecutor.executeTask( new TestRepositoryTask() );
     }
 
-    class TestDataRefreshTask
+    class TestRepositoryTask
         extends RepositoryTask
     {
-        public String getJobName()
+        public String getName()
         {
-            return "TestDataRefresh";
+            return "TestRepositoryTask";
         }
     }
 }