You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/04/13 23:49:24 UTC
svn commit: r1325975 - in
/archiva/redback/redback-components/trunk/spring-taskqueue/src:
main/java/org/apache/ main/java/org/apache/archiva/
main/java/org/apache/archiva/redback/
main/java/org/apache/archiva/redback/components/ main/java/org/apache/ar...
Author: olamy
Date: Fri Apr 13 21:49:22 2012
New Revision: 1325975
URL: http://svn.apache.org/viewvc?rev=1325975&view=rev
Log:
move spring-taskqueue to apache namespace
Added:
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/DefaultTaskQueue.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/Task.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/Task.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskEntryEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskExitEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskQueue.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueueException.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskQueueException.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskViabilityEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutionException.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutionException.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutor.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutor.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/ThreadedTaskQueueExecutor.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskEntryEvaluator.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/ATaskEntryEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskExitEvaluator.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/ATaskExitEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskEntryEvaluator.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BTaskEntryEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskExitEvaluator.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BTaskExitEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTask.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTask.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTaskViabilityEvaluator.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTaskViabilityEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/TaskQueueTest.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/TaskQueueTest.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/BuildProjectTaskExecutor.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/execution/BuildProjectTaskExecutor.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutorTest.java
- copied, changed from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutorTest.java
Removed:
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/DefaultTaskQueue.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/Task.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskEntryEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskExitEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskQueue.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskQueueException.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskViabilityEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutionException.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutor.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutor.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/ThreadedTaskQueueExecutor.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/ATaskEntryEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/ATaskExitEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BTaskEntryEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BTaskExitEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTask.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTaskViabilityEvaluator.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/TaskQueueTest.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/execution/BuildProjectTaskExecutor.java
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutorTest.java
Modified:
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/resources/META-INF/spring-context.xml
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/resources/spring-context.xml
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/DefaultTaskQueue.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/DefaultTaskQueue.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/DefaultTaskQueue.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue;
+package org.apache.archiva.redback.components.taskqueue;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/Task.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/Task.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/Task.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/Task.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/Task.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/Task.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/Task.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue;
+package org.apache.archiva.redback.components.taskqueue;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskEntryEvaluator.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskEntryEvaluator.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskEntryEvaluator.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue;
+package org.apache.archiva.redback.components.taskqueue;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskExitEvaluator.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskExitEvaluator.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskExitEvaluator.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue;
+package org.apache.archiva.redback.components.taskqueue;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskQueue.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskQueue.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskQueue.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue;
+package org.apache.archiva.redback.components.taskqueue;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueueException.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskQueueException.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueueException.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueueException.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskQueueException.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskQueueException.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueueException.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue;
+package org.apache.archiva.redback.components.taskqueue;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskViabilityEvaluator.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskViabilityEvaluator.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/TaskViabilityEvaluator.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue;
+package org.apache.archiva.redback.components.taskqueue;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutionException.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutionException.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutionException.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutionException.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutionException.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutionException.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutionException.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue.execution;
+package org.apache.archiva.redback.components.taskqueue.execution;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutor.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutor.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutor.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue.execution;
+package org.apache.archiva.redback.components.taskqueue.execution;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.codehaus.plexus.taskqueue.ex
* under the License.
*/
-import org.codehaus.plexus.taskqueue.Task;
+import org.apache.archiva.redback.components.taskqueue.Task;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutor.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutor.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutor.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue.execution;
+package org.apache.archiva.redback.components.taskqueue.execution;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.codehaus.plexus.taskqueue.ex
* under the License.
*/
-import org.codehaus.plexus.taskqueue.Task;
+import org.apache.archiva.redback.components.taskqueue.Task;
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/ThreadedTaskQueueExecutor.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/ThreadedTaskQueueExecutor.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/codehaus/plexus/taskqueue/execution/ThreadedTaskQueueExecutor.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue.execution;
+package org.apache.archiva.redback.components.taskqueue.execution;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,14 +20,13 @@ package org.codehaus.plexus.taskqueue.ex
*/
import org.apache.commons.lang.StringUtils;
-import org.codehaus.plexus.taskqueue.Task;
-import org.codehaus.plexus.taskqueue.TaskQueue;
+import org.apache.archiva.redback.components.taskqueue.Task;
+import org.apache.archiva.redback.components.taskqueue.TaskQueue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.inject.Inject;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
Modified: archiva/redback/redback-components/trunk/spring-taskqueue/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/resources/META-INF/spring-context.xml?rev=1325975&r1=1325974&r2=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/main/resources/META-INF/spring-context.xml Fri Apr 13 21:49:22 2012
@@ -28,7 +28,6 @@
default-lazy-init="true">
<context:annotation-config />
- <context:component-scan
- base-package="org.codehaus.plexus.taskqueue"/>
+ <context:component-scan base-package="org.apache.archiva.redback.components.taskqueue"/>
</beans>
\ No newline at end of file
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskEntryEvaluator.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/ATaskEntryEvaluator.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskEntryEvaluator.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskEntryEvaluator.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/ATaskEntryEvaluator.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/ATaskEntryEvaluator.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskEntryEvaluator.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue;
+package org.apache.archiva.redback.components.taskqueue;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskExitEvaluator.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/ATaskExitEvaluator.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskExitEvaluator.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskExitEvaluator.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/ATaskExitEvaluator.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/ATaskExitEvaluator.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskExitEvaluator.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue;
+package org.apache.archiva.redback.components.taskqueue;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskEntryEvaluator.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BTaskEntryEvaluator.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskEntryEvaluator.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskEntryEvaluator.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BTaskEntryEvaluator.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BTaskEntryEvaluator.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskEntryEvaluator.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue;
+package org.apache.archiva.redback.components.taskqueue;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskExitEvaluator.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BTaskExitEvaluator.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskExitEvaluator.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskExitEvaluator.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BTaskExitEvaluator.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BTaskExitEvaluator.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskExitEvaluator.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue;
+package org.apache.archiva.redback.components.taskqueue;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTask.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTask.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTask.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTask.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTask.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTask.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTask.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue;
+package org.apache.archiva.redback.components.taskqueue;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,8 @@ package org.codehaus.plexus.taskqueue;
* under the License.
*/
+import org.apache.archiva.redback.components.taskqueue.Task;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTaskViabilityEvaluator.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTaskViabilityEvaluator.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTaskViabilityEvaluator.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTaskViabilityEvaluator.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTaskViabilityEvaluator.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTaskViabilityEvaluator.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTaskViabilityEvaluator.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue;
+package org.apache.archiva.redback.components.taskqueue;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/TaskQueueTest.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/TaskQueueTest.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/TaskQueueTest.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/TaskQueueTest.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/TaskQueueTest.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/TaskQueueTest.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/TaskQueueTest.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue;
+package org.apache.archiva.redback.components.taskqueue;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,8 +22,6 @@ package org.codehaus.plexus.taskqueue;
import junit.framework.TestCase;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.springframework.scheduling.TaskScheduler;
-import org.springframework.scheduling.backportconcurrent.ThreadPoolTaskExecutor;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/BuildProjectTaskExecutor.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/execution/BuildProjectTaskExecutor.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/BuildProjectTaskExecutor.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/BuildProjectTaskExecutor.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/execution/BuildProjectTaskExecutor.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/execution/BuildProjectTaskExecutor.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/BuildProjectTaskExecutor.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue.execution;
+package org.apache.archiva.redback.components.taskqueue.execution;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -18,8 +18,8 @@ package org.codehaus.plexus.taskqueue.ex
* specific language governing permissions and limitations
* under the License.
*/
-import org.codehaus.plexus.taskqueue.BuildProjectTask;
-import org.codehaus.plexus.taskqueue.Task;
+import org.apache.archiva.redback.components.taskqueue.BuildProjectTask;
+import org.apache.archiva.redback.components.taskqueue.Task;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
Copied: archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutorTest.java (from r1325911, archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutorTest.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutorTest.java?p2=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutorTest.java&p1=archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutorTest.java&r1=1325911&r2=1325975&rev=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutorTest.java (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutorTest.java Fri Apr 13 21:49:22 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.taskqueue.execution;
+package org.apache.archiva.redback.components.taskqueue.execution;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,9 +20,9 @@ package org.codehaus.plexus.taskqueue.ex
*/
import junit.framework.TestCase;
-import org.codehaus.plexus.taskqueue.BuildProjectTask;
-import org.codehaus.plexus.taskqueue.TaskQueue;
-import org.codehaus.plexus.taskqueue.TaskQueueException;
+import org.apache.archiva.redback.components.taskqueue.BuildProjectTask;
+import org.apache.archiva.redback.components.taskqueue.TaskQueue;
+import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
Modified: archiva/redback/redback-components/trunk/spring-taskqueue/src/test/resources/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/test/resources/spring-context.xml?rev=1325975&r1=1325974&r2=1325975&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/src/test/resources/spring-context.xml (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/src/test/resources/spring-context.xml Fri Apr 13 21:49:22 2012
@@ -20,26 +20,23 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd"
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
default-lazy-init="true">
- <bean name="queueExecutor#default" class="org.codehaus.plexus.taskqueue.execution.ThreadedTaskQueueExecutor">
+ <bean name="queueExecutor#default" class="org.apache.archiva.redback.components.taskqueue.execution.ThreadedTaskQueueExecutor">
<property name="queue" ref="taskQueue#default"/>
<property name="executor" ref="taskExecutor#build-project"/>
<property name="name" value="default"/>
</bean>
- <bean name="queueExecutor#taskQueueTest" class="org.codehaus.plexus.taskqueue.execution.ThreadedTaskQueueExecutor">
+ <bean name="queueExecutor#taskQueueTest" class="org.apache.archiva.redback.components.taskqueue.execution.ThreadedTaskQueueExecutor">
<property name="queue" ref="taskQueue#taskQueueTest"/>
<property name="executor" ref="taskExecutor#build-project"/>
<property name="name" value="taskQueueTest"/>
</bean>
- <bean abstract="true" name="abstractQueue" class="org.codehaus.plexus.taskqueue.DefaultTaskQueue">
+ <bean abstract="true" name="abstractQueue" class="org.apache.archiva.redback.components.taskqueue.DefaultTaskQueue">
<property name="taskEntryEvaluators">
<list>
<ref bean="taskEntryEvaluator#a"/>