You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2018/04/09 20:19:20 UTC
[archiva-redback-components-spring-taskqueue] branch master created
(now 5a28df4)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git.
at 5a28df4 Adding gitignore
This branch includes the following new commits:
new 490913c import redback components sources http://svn.codehaus.org/redback/components/trunk/ r1724.
new 9889e05 fix license headers in poms
new f744a83 upgrade modules to use last parent pom
new 4c3370d fix license headers
new 4a8d058 fix license headers
new 7654ac1 fix pom due to asf move
new 7b918fc move spring-taskqueue to apache namespace
new de3d4f3 no more need of plexus stuff
new b058ca7 remove @version $Id$
new bcedec4 [MRM-1651] Add OSGi support in spring-apacheds, spring-quartz, spring-registry, spring-taskqueue, spring-utils
new 93c64b0 [MRM-1651] Improve OSGi statements by defining version ranges
new 54e549e configure svnpub for redback-components site
new 5bbe14a fix site deployment
new 5449611 improve a bit logging pattern with .info
new 0d3f5fd use a staged released parent
new ba3b8be add missing <version>
new 928b542 [maven-release-plugin] prepare release spring-taskqueue-2.0
new af0dce2 [maven-release-plugin] prepare for next development iteration
new fc5c407 log4j 2.0-beta1
new c66489b use staged released parent
new e64917f back to parent snapshot
new 0545f7a fix various path for deployment
new 053ba0e use released parent pom
new 0a784d1 upgrade to last spring version
new e406935 fix logging warn level
new 7ea4707 generics
new fa2dc28 generics
new 80a515b better use of 1.5
new e163d06 use a staged released parent
new 778265a [maven-release-plugin] prepare release spring-taskqueue-2.1
new a4c2a2f [maven-release-plugin] prepare for next development iteration
new c91b17b use last parent for 1.7
new 592b905 use diamond
new 130d2a1 upgrade versions
new 228f03c spring version 4.1.0 update need update to 2.4-SNAPSHOT parent
new c47b3f8 Changing parent version
new 5a28df4 Adding gitignore
The 37 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 05/37: fix license
headers
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 4a8d05831a482cdda38f1e38db84cc5a089524af
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Apr 6 22:16:01 2012 +0000
fix license headers
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1310615 13f79535-47bb-0310-9956-ffa450edef68
---
.../plexus/taskqueue/ATaskEntryEvaluator.java | 33 +++++++++-------------
.../plexus/taskqueue/ATaskExitEvaluator.java | 33 +++++++++-------------
.../plexus/taskqueue/BTaskEntryEvaluator.java | 33 +++++++++-------------
.../plexus/taskqueue/BTaskExitEvaluator.java | 33 +++++++++-------------
.../plexus/taskqueue/BuildProjectTask.java | 33 +++++++++-------------
.../BuildProjectTaskViabilityEvaluator.java | 33 +++++++++-------------
.../codehaus/plexus/taskqueue/TaskQueueTest.java | 33 +++++++++-------------
.../execution/BuildProjectTaskExecutor.java | 26 +++++++++--------
.../taskqueue/execution/TaskQueueExecutorTest.java | 33 +++++++++-------------
9 files changed, 126 insertions(+), 164 deletions(-)
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/ATaskEntryEvaluator.java b/src/test/java/org/codehaus/plexus/taskqueue/ATaskEntryEvaluator.java
index 3a90140..dbe82f0 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/ATaskEntryEvaluator.java
+++ b/src/test/java/org/codehaus/plexus/taskqueue/ATaskEntryEvaluator.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.springframework.stereotype.Service;
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/ATaskExitEvaluator.java b/src/test/java/org/codehaus/plexus/taskqueue/ATaskExitEvaluator.java
index 0effd93..6ab8e08 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/ATaskExitEvaluator.java
+++ b/src/test/java/org/codehaus/plexus/taskqueue/ATaskExitEvaluator.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.springframework.stereotype.Service;
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/BTaskEntryEvaluator.java b/src/test/java/org/codehaus/plexus/taskqueue/BTaskEntryEvaluator.java
index 591e176..dae2a37 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/BTaskEntryEvaluator.java
+++ b/src/test/java/org/codehaus/plexus/taskqueue/BTaskEntryEvaluator.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.springframework.stereotype.Service;
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/BTaskExitEvaluator.java b/src/test/java/org/codehaus/plexus/taskqueue/BTaskExitEvaluator.java
index 367bbb4..2ca277c 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/BTaskExitEvaluator.java
+++ b/src/test/java/org/codehaus/plexus/taskqueue/BTaskExitEvaluator.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.springframework.stereotype.Service;
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTask.java b/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTask.java
index c2f1a82..9fbaee7 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTask.java
+++ b/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTask.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
/**
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTaskViabilityEvaluator.java b/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTaskViabilityEvaluator.java
index 222dab4..8db23b5 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTaskViabilityEvaluator.java
+++ b/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTaskViabilityEvaluator.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.springframework.stereotype.Service;
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/TaskQueueTest.java b/src/test/java/org/codehaus/plexus/taskqueue/TaskQueueTest.java
index 7465ffe..f32b59b 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/TaskQueueTest.java
+++ b/src/test/java/org/codehaus/plexus/taskqueue/TaskQueueTest.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import junit.framework.TestCase;
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/execution/BuildProjectTaskExecutor.java b/src/test/java/org/codehaus/plexus/taskqueue/execution/BuildProjectTaskExecutor.java
index cd05683..6b73f1b 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/execution/BuildProjectTaskExecutor.java
+++ b/src/test/java/org/codehaus/plexus/taskqueue/execution/BuildProjectTaskExecutor.java
@@ -1,21 +1,23 @@
package org.codehaus.plexus.taskqueue.execution;
/*
- * Copyright 2004-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
-
import org.codehaus.plexus.taskqueue.BuildProjectTask;
import org.codehaus.plexus.taskqueue.Task;
import org.slf4j.Logger;
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutorTest.java b/src/test/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutorTest.java
index ae1ed0c..460c244 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutorTest.java
+++ b/src/test/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutorTest.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue.execution;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import junit.framework.TestCase;
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 29/37: use a staged
released parent
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit e163d0673a52db20c5f997f66ffc3143540081e9
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Thu Jan 16 01:24:49 2014 +0000
use a staged released parent
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1558639 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4a22c2c..529c4cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 02/37: fix license
headers in poms
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 9889e051eb65ee190891b408102e60b047b2ddf8
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Apr 6 10:23:31 2012 +0000
fix license headers in poms
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1310271 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/pom.xml b/pom.xml
index ab4aabd..c0018ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.codehaus.redback.components</groupId>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 03/37: upgrade
modules to use last parent pom
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit f744a8397a824bf7799a4e0c5db1a0821b147c32
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Apr 6 19:44:08 2012 +0000
upgrade modules to use last parent pom
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1310561 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index c0018ad..3808edf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,9 +19,9 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.codehaus.redback.components</groupId>
+ <groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 24/37: upgrade to
last spring version
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 0a784d102553305a43ee28db0afc9183bb745a0d
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Nov 22 03:46:17 2013 +0000
upgrade to last spring version
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1544407 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a533b3b..4a22c2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.1</version>
+ <version>2.2-SNAPSHOT</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 30/37:
[maven-release-plugin] prepare release spring-taskqueue-2.1
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 778265a0283edf68ad772678f68512492c8ca6f4
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Thu Jan 16 03:03:17 2014 +0000
[maven-release-plugin] prepare release spring-taskqueue-2.1
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1558677 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 529c4cd..05ace62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
- <version>2.1-SNAPSHOT</version>
+ <version>2.1</version>
<artifactId>spring-taskqueue</artifactId>
<packaging>bundle</packaging>
<name>Spring Task Queue</name>
@@ -43,9 +43,9 @@
</distributionManagement>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-taskqueue/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-taskqueue/</developerConnection>
- <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/tags/spring-taskqueue-2.1</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/tags/spring-taskqueue-2.1</developerConnection>
+ <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/tags/spring-taskqueue-2.1</url>
</scm>
<dependencies>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 31/37:
[maven-release-plugin] prepare for next development iteration
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit a4c2a2f3511d5a30ac2f0286c2db900335e22a89
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Thu Jan 16 03:03:26 2014 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1558679 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 05ace62..9087ec7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
- <version>2.1</version>
+ <version>2.2-SNAPSHOT</version>
<artifactId>spring-taskqueue</artifactId>
<packaging>bundle</packaging>
<name>Spring Task Queue</name>
@@ -43,9 +43,9 @@
</distributionManagement>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/tags/spring-taskqueue-2.1</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/tags/spring-taskqueue-2.1</developerConnection>
- <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/tags/spring-taskqueue-2.1</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-taskqueue/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-taskqueue/</developerConnection>
+ <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/</url>
</scm>
<dependencies>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 23/37: use released
parent pom
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 053ba0ee4f1c24549af4fed728f8d1311d19705b
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Thu May 9 12:13:43 2013 +0000
use released parent pom
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1480598 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0bacf20..a533b3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.1</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 26/37: generics
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 7ea4707cb10b629664771cdb4a98cde258afba07
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Tue Dec 10 01:22:13 2013 +0000
generics
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1549729 13f79535-47bb-0310-9956-ffa450edef68
---
.../archiva/redback/components/taskqueue/TaskViabilityEvaluator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
index 801b994..edf2236 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
@@ -34,6 +34,6 @@ public interface TaskViabilityEvaluator
* @return Returns a list of tasks to remove from the queue.
* @throws TaskQueueException
*/
- Collection<Task> evaluate( Collection tasks )
+ Collection<Task> evaluate( Collection<Task> tasks )
throws TaskQueueException;
}
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 10/37: [MRM-1651] Add
OSGi support in spring-apacheds, spring-quartz, spring-registry,
spring-taskqueue, spring-utils
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit bcedec4b3dacd35cba5ac11b3b79b5379ecf3d8c
Author: Jean-Baptiste Onofre <jb...@apache.org>
AuthorDate: Thu Aug 2 07:34:34 2012 +0000
[MRM-1651] Add OSGi support in spring-apacheds, spring-quartz, spring-registry, spring-taskqueue, spring-utils
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1368371 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index b93dff4..6938cec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,16 +18,19 @@
~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
+ </parent>
+
<artifactId>spring-taskqueue</artifactId>
+ <packaging>bundle</packaging>
<name>Spring Task Queue</name>
- <version>2.0-SNAPSHOT</version>
<url>http://archiva.apache.org/redback/components/${project.artifactId}</url>
@@ -94,4 +97,14 @@
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 35/37: spring version
4.1.0 update need update to 2.4-SNAPSHOT parent
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 228f03ce39be33abac94b2a62d81134ddcb93b03
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Sat Sep 20 01:09:30 2014 +0000
spring version 4.1.0 update
need update to 2.4-SNAPSHOT parent
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1626376 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 26f0dab..80db306 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.3</version>
+ <version>2.4-SNAPSHOT</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 28/37: better use of
1.5
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 80a515b606260529d6f6785f434c20e5a4b2155e
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Tue Jan 7 05:12:33 2014 +0000
better use of 1.5
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1556117 13f79535-47bb-0310-9956-ffa450edef68
---
.../redback/components/taskqueue/DefaultTaskQueue.java | 3 ++-
.../redback/components/taskqueue/TaskEntryEvaluator.java | 4 ++--
.../redback/components/taskqueue/TaskExitEvaluator.java | 4 ++--
.../archiva/redback/components/taskqueue/TaskQueue.java | 14 +++++++-------
.../components/taskqueue/TaskViabilityEvaluator.java | 4 ++--
.../components/taskqueue/execution/TaskExecutor.java | 4 ++--
.../components/taskqueue/execution/TaskQueueExecutor.java | 6 +++---
7 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
index d85ae73..46f7067 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
@@ -152,12 +152,13 @@ public class DefaultTaskQueue
return queue.remove( task );
}
- public boolean removeAll( List<Task> tasks )
+ public boolean removeAll( List tasks )
throws ClassCastException, NullPointerException
{
return queue.removeAll( tasks );
}
+
// ----------------------------------------------------------------------
// Queue Inspection
// ----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java
index 9ea2043..9f96a2f 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java
@@ -24,8 +24,8 @@ package org.apache.archiva.redback.components.taskqueue;
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*
*/
-public interface TaskEntryEvaluator
+public interface TaskEntryEvaluator<T extends Task>
{
- boolean evaluate( Task task )
+ boolean evaluate( T task )
throws TaskQueueException;
}
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java
index b92f5f7..e7cbc0b 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java
@@ -24,8 +24,8 @@ package org.apache.archiva.redback.components.taskqueue;
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*
*/
-public interface TaskExitEvaluator
+public interface TaskExitEvaluator<T extends Task>
{
- boolean evaluate( Task task )
+ boolean evaluate( T task )
throws TaskQueueException;
}
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
index 8b5794f..ff3f07c 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*
*/
-public interface TaskQueue
+public interface TaskQueue<T extends Task>
{
// ----------------------------------------------------------------------
@@ -40,23 +40,23 @@ public interface TaskQueue
* @param task The task to add to the queue.
* @return Returns true if the task was accepted into the queue.
*/
- boolean put( Task task )
+ boolean put( T task )
throws TaskQueueException;
- Task take()
+ T take()
throws TaskQueueException;
- boolean remove( Task task )
+ boolean remove( T task )
throws ClassCastException, NullPointerException;
- boolean removeAll( List<Task> tasks )
+ boolean removeAll( List<T> tasks )
throws ClassCastException, NullPointerException;
// ----------------------------------------------------------------------
// Queue Inspection
// ----------------------------------------------------------------------
- List<Task> getQueueSnapshot()
+ List<T> getQueueSnapshot()
throws TaskQueueException;
/**
@@ -67,6 +67,6 @@ public interface TaskQueue
* @return the head of the queue, or null if the timeout elapsed
* @throws InterruptedException when this thread is interrupted while waiting
*/
- Task poll( int timeout, TimeUnit timeUnit )
+ T poll( int timeout, TimeUnit timeUnit )
throws InterruptedException;
}
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
index edf2236..910abc9 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
@@ -26,7 +26,7 @@ import java.util.Collection;
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*
*/
-public interface TaskViabilityEvaluator
+public interface TaskViabilityEvaluator<T extends Task>
{
/**
@@ -34,6 +34,6 @@ public interface TaskViabilityEvaluator
* @return Returns a list of tasks to remove from the queue.
* @throws TaskQueueException
*/
- Collection<Task> evaluate( Collection<Task> tasks )
+ Collection<Task> evaluate( Collection<T> tasks )
throws TaskQueueException;
}
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java
index dd8820e..5ca4c5d 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java
@@ -25,8 +25,8 @@ import org.apache.archiva.redback.components.taskqueue.Task;
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*
*/
-public interface TaskExecutor
+public interface TaskExecutor<T extends Task>
{
- void executeTask( Task task )
+ void executeTask( T task )
throws TaskExecutionException;
}
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java
index 28d1c39..474452b 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java
@@ -26,7 +26,7 @@ import org.apache.archiva.redback.components.taskqueue.Task;
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*
*/
-public interface TaskQueueExecutor
+public interface TaskQueueExecutor<T extends Task>
{
/**
@@ -34,7 +34,7 @@ public interface TaskQueueExecutor
*
* @return the currently executing task.
*/
- Task getCurrentTask();
+ T getCurrentTask();
/**
* Cancels execution of this task, if it's currently running.
@@ -43,5 +43,5 @@ public interface TaskQueueExecutor
* @param task The task to cancel
* @return true if the task was cancelled, false if the task was not executing.
*/
- boolean cancelTask( Task task );
+ boolean cancelTask( T task );
}
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 16/37: add missing
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit ba3b8bef3bff04c6ff555da66d602a9b143f7df0
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Sep 21 13:01:32 2012 +0000
add missing <version>
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1388463 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 1f11952..1ffd26f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
+ <version>2.0-SNAPSHOT</version>
<artifactId>spring-taskqueue</artifactId>
<packaging>bundle</packaging>
<name>Spring Task Queue</name>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 34/37: upgrade
versions
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 130d2a137f993c523c0df65139c3a2fb8ea2ca7c
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sun Jul 20 23:58:37 2014 +0000
upgrade versions
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1612174 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index dc3fd18..26f0dab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>2.3</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 13/37: fix site
deployment
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 5bbe14a9b03b1ba757c8521d5c7f087246a1694e
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Aug 31 10:17:55 2012 +0000
fix site deployment
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1379403 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pom.xml b/pom.xml
index a3286dd..48a8f23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,13 @@
<url>http://archiva.apache.org/redback/components/${project.artifactId}</url>
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>file://${user.home}/redback-components-site-deploy/${project.artifactId}</url>
+ </site>
+ </distributionManagement>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-taskqueue/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-taskqueue/</developerConnection>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 33/37: use diamond
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 592b9050e1200d7596e098dddea93ba888cb4ec6
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sat Apr 5 12:44:37 2014 +0000
use diamond
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1585087 13f79535-47bb-0310-9956-ffa450edef68
---
.../archiva/redback/components/taskqueue/DefaultTaskQueue.java | 8 ++++----
.../taskqueue/BuildProjectTaskViabilityEvaluator.java | 10 +++++-----
.../archiva/redback/components/taskqueue/TaskQueueTest.java | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
index 46f7067..6c28dc4 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
@@ -43,13 +43,13 @@ public class DefaultTaskQueue
private Logger logger = LoggerFactory.getLogger( getClass() );
- private List<TaskEntryEvaluator> taskEntryEvaluators = new ArrayList<TaskEntryEvaluator>();
+ private List<TaskEntryEvaluator> taskEntryEvaluators = new ArrayList<>();
- private List<TaskExitEvaluator> taskExitEvaluators = new ArrayList<TaskExitEvaluator>();
+ private List<TaskExitEvaluator> taskExitEvaluators = new ArrayList<>();
- private List<TaskViabilityEvaluator> taskViabilityEvaluators = new ArrayList<TaskViabilityEvaluator>();
+ private List<TaskViabilityEvaluator> taskViabilityEvaluators = new ArrayList<>();
- private BlockingQueue<Task> queue = new LinkedBlockingQueue<Task>();
+ private BlockingQueue<Task> queue = new LinkedBlockingQueue<>();
// ----------------------------------------------------------------------
// Component Lifecycle
diff --git a/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTaskViabilityEvaluator.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTaskViabilityEvaluator.java
index 110e1fd..d85b691 100644
--- a/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTaskViabilityEvaluator.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTaskViabilityEvaluator.java
@@ -32,18 +32,18 @@ import java.util.List;
*/
@Service( "taskViabilityEvaluator#build-project" )
public class BuildProjectTaskViabilityEvaluator
- implements TaskViabilityEvaluator
+ implements TaskViabilityEvaluator<BuildProjectTask>
{
- public Collection evaluate( Collection tasks )
+ public Collection<Task> evaluate( Collection<BuildProjectTask> tasks )
throws TaskQueueException
{
BuildProjectTask okTask = null;
- List toBeRemoved = new ArrayList( tasks.size() );
+ List<Task> toBeRemoved = new ArrayList<>( tasks.size() );
- for ( Iterator it = tasks.iterator(); it.hasNext(); )
+ for ( Iterator<BuildProjectTask> it = tasks.iterator(); it.hasNext(); )
{
- BuildProjectTask buildProjectTask = (BuildProjectTask) it.next();
+ BuildProjectTask buildProjectTask = it.next();
if ( okTask == null )
{
diff --git a/src/test/java/org/apache/archiva/redback/components/taskqueue/TaskQueueTest.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/TaskQueueTest.java
index b57ba7c..48e5909 100644
--- a/src/test/java/org/apache/archiva/redback/components/taskqueue/TaskQueueTest.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/TaskQueueTest.java
@@ -147,7 +147,7 @@ public class TaskQueueTest
assertEquals( 2, taskQueue.getQueueSnapshot().size() );
- List tasks = new ArrayList();
+ List<Task> tasks = new ArrayList<>();
tasks.add( firstTask );
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 11/37: [MRM-1651]
Improve OSGi statements by defining version ranges
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 93c64b0b2bc2e708dffee22c76d548c0bbe2d874
Author: Jean-Baptiste Onofre <jb...@apache.org>
AuthorDate: Fri Aug 3 07:45:35 2012 +0000
[MRM-1651] Improve OSGi statements by defining version ranges
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1368818 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/pom.xml b/pom.xml
index 6938cec..c3b6de7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,18 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ org.apache.archiva.redback.components.taskqueue*;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.annotation,
+ org.apache.commons.lang;version="[2.6,3)",
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 07/37: move
spring-taskqueue to apache namespace
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 7b918fca703a67ca9d1f2f3d369f4a6747864d44
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Apr 13 21:49:22 2012 +0000
move spring-taskqueue to apache namespace
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1325975 13f79535-47bb-0310-9956-ffa450edef68
---
.../redback/components}/taskqueue/DefaultTaskQueue.java | 2 +-
.../archiva/redback/components}/taskqueue/Task.java | 2 +-
.../redback/components}/taskqueue/TaskEntryEvaluator.java | 2 +-
.../redback/components}/taskqueue/TaskExitEvaluator.java | 2 +-
.../archiva/redback/components}/taskqueue/TaskQueue.java | 2 +-
.../redback/components}/taskqueue/TaskQueueException.java | 2 +-
.../redback/components}/taskqueue/TaskViabilityEvaluator.java | 2 +-
.../taskqueue/execution/TaskExecutionException.java | 2 +-
.../redback/components}/taskqueue/execution/TaskExecutor.java | 4 ++--
.../components}/taskqueue/execution/TaskQueueExecutor.java | 4 ++--
.../taskqueue/execution/ThreadedTaskQueueExecutor.java | 7 +++----
src/main/resources/META-INF/spring-context.xml | 3 +--
.../redback/components}/taskqueue/ATaskEntryEvaluator.java | 2 +-
.../redback/components}/taskqueue/ATaskExitEvaluator.java | 2 +-
.../redback/components}/taskqueue/BTaskEntryEvaluator.java | 2 +-
.../redback/components}/taskqueue/BTaskExitEvaluator.java | 2 +-
.../redback/components}/taskqueue/BuildProjectTask.java | 4 +++-
.../taskqueue/BuildProjectTaskViabilityEvaluator.java | 2 +-
.../archiva/redback/components}/taskqueue/TaskQueueTest.java | 4 +---
.../taskqueue/execution/BuildProjectTaskExecutor.java | 6 +++---
.../taskqueue/execution/TaskQueueExecutorTest.java | 8 ++++----
src/test/resources/spring-context.xml | 11 ++++-------
22 files changed, 36 insertions(+), 41 deletions(-)
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/DefaultTaskQueue.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
similarity index 99%
rename from src/main/java/org/codehaus/plexus/taskqueue/DefaultTaskQueue.java
rename to src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
index 9fba821..c8390bf 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/DefaultTaskQueue.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
@@ -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
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/Task.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/Task.java
similarity index 95%
rename from src/main/java/org/codehaus/plexus/taskqueue/Task.java
rename to src/main/java/org/apache/archiva/redback/components/taskqueue/Task.java
index 4aae533..32e8c7d 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/Task.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/Task.java
@@ -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
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/TaskEntryEvaluator.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java
similarity index 95%
rename from src/main/java/org/codehaus/plexus/taskqueue/TaskEntryEvaluator.java
rename to src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java
index 51dc0de..7d9825a 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/TaskEntryEvaluator.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java
@@ -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
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/TaskExitEvaluator.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java
similarity index 95%
rename from src/main/java/org/codehaus/plexus/taskqueue/TaskExitEvaluator.java
rename to src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java
index 5095a7a..ce6a04e 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/TaskExitEvaluator.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java
@@ -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
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/TaskQueue.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
similarity index 97%
rename from src/main/java/org/codehaus/plexus/taskqueue/TaskQueue.java
rename to src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
index d6ab183..e853fcb 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/TaskQueue.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
@@ -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
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/TaskQueueException.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueueException.java
similarity index 95%
rename from src/main/java/org/codehaus/plexus/taskqueue/TaskQueueException.java
rename to src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueueException.java
index f3fc975..93c197d 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/TaskQueueException.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueueException.java
@@ -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
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/TaskViabilityEvaluator.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
similarity index 95%
rename from src/main/java/org/codehaus/plexus/taskqueue/TaskViabilityEvaluator.java
rename to src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
index 2a0ebeb..dd31ec9 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/TaskViabilityEvaluator.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
@@ -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
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutionException.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutionException.java
similarity index 94%
rename from src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutionException.java
rename to src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutionException.java
index d5dc470..dab4fe0 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutionException.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutionException.java
@@ -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
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutor.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java
similarity index 88%
rename from src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutor.java
rename to src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java
index abb67b0..21b3783 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutor.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java
@@ -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.execution;
* 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>
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutor.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java
similarity index 91%
rename from src/main/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutor.java
rename to src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java
index 758a270..0e9e326 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutor.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java
@@ -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.execution;
* under the License.
*/
-import org.codehaus.plexus.taskqueue.Task;
+import org.apache.archiva.redback.components.taskqueue.Task;
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/execution/ThreadedTaskQueueExecutor.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
similarity index 98%
rename from src/main/java/org/codehaus/plexus/taskqueue/execution/ThreadedTaskQueueExecutor.java
rename to src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
index bf6f455..5301d5f 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/execution/ThreadedTaskQueueExecutor.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
@@ -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.execution;
*/
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;
diff --git a/src/main/resources/META-INF/spring-context.xml b/src/main/resources/META-INF/spring-context.xml
index 08cf61b..4a35faf 100755
--- a/src/main/resources/META-INF/spring-context.xml
+++ b/src/main/resources/META-INF/spring-context.xml
@@ -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
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/ATaskEntryEvaluator.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskEntryEvaluator.java
similarity index 95%
rename from src/test/java/org/codehaus/plexus/taskqueue/ATaskEntryEvaluator.java
rename to src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskEntryEvaluator.java
index dbe82f0..0e00c2c 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/ATaskEntryEvaluator.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskEntryEvaluator.java
@@ -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
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/ATaskExitEvaluator.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskExitEvaluator.java
similarity index 95%
rename from src/test/java/org/codehaus/plexus/taskqueue/ATaskExitEvaluator.java
rename to src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskExitEvaluator.java
index 6ab8e08..7ba0d88 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/ATaskExitEvaluator.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskExitEvaluator.java
@@ -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
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/BTaskEntryEvaluator.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskEntryEvaluator.java
similarity index 95%
rename from src/test/java/org/codehaus/plexus/taskqueue/BTaskEntryEvaluator.java
rename to src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskEntryEvaluator.java
index dae2a37..d75c90b 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/BTaskEntryEvaluator.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskEntryEvaluator.java
@@ -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
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/BTaskExitEvaluator.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskExitEvaluator.java
similarity index 95%
rename from src/test/java/org/codehaus/plexus/taskqueue/BTaskExitEvaluator.java
rename to src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskExitEvaluator.java
index 2ca277c..10db4d5 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/BTaskExitEvaluator.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskExitEvaluator.java
@@ -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
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTask.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTask.java
similarity index 96%
rename from src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTask.java
rename to src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTask.java
index 9fbaee7..739c797 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTask.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTask.java
@@ -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$
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTaskViabilityEvaluator.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTaskViabilityEvaluator.java
similarity index 97%
rename from src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTaskViabilityEvaluator.java
rename to src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTaskViabilityEvaluator.java
index 8db23b5..fe65024 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTaskViabilityEvaluator.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTaskViabilityEvaluator.java
@@ -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
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/TaskQueueTest.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/TaskQueueTest.java
similarity index 96%
rename from src/test/java/org/codehaus/plexus/taskqueue/TaskQueueTest.java
rename to src/test/java/org/apache/archiva/redback/components/taskqueue/TaskQueueTest.java
index f32b59b..e9c7d5d 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/TaskQueueTest.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/TaskQueueTest.java
@@ -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;
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/execution/BuildProjectTaskExecutor.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/BuildProjectTaskExecutor.java
similarity index 92%
rename from src/test/java/org/codehaus/plexus/taskqueue/execution/BuildProjectTaskExecutor.java
rename to src/test/java/org/apache/archiva/redback/components/taskqueue/execution/BuildProjectTaskExecutor.java
index 6b73f1b..48e5c56 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/execution/BuildProjectTaskExecutor.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/BuildProjectTaskExecutor.java
@@ -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.execution;
* 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;
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutorTest.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutorTest.java
similarity index 92%
rename from src/test/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutorTest.java
rename to src/test/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutorTest.java
index 460c244..3f97c13 100644
--- a/src/test/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutorTest.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutorTest.java
@@ -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.execution;
*/
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;
diff --git a/src/test/resources/spring-context.xml b/src/test/resources/spring-context.xml
index ad66c03..f1afccd 100644
--- a/src/test/resources/spring-context.xml
+++ b/src/test/resources/spring-context.xml
@@ -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"/>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 14/37: improve a bit
logging pattern with .info
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 544961186e2d118e9ecb5de1ef8512b040eb61fa
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Sep 7 08:17:00 2012 +0000
improve a bit logging pattern with .info
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1381930 13f79535-47bb-0310-9956-ffa450edef68
---
.../taskqueue/execution/ThreadedTaskQueueExecutor.java | 7 +++----
.../taskqueue/execution/BuildProjectTaskExecutor.java | 17 ++++++++---------
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
index 6401696..213f6dc 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
@@ -19,9 +19,9 @@ package org.apache.archiva.redback.components.taskqueue.execution;
* under the License.
*/
-import org.apache.commons.lang.StringUtils;
import org.apache.archiva.redback.components.taskqueue.Task;
import org.apache.archiva.redback.components.taskqueue.TaskQueue;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,7 +38,6 @@ import java.util.concurrent.TimeoutException;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @author <a href="mailto:kenney@codehaus.org">Kenney Westerhof</a>
- *
*/
public class ThreadedTaskQueueExecutor
implements TaskQueueExecutor
@@ -307,11 +306,11 @@ public class ThreadedTaskQueueExecutor
{
if ( System.currentTimeMillis() > endTime )
{
- logger.warn( "Timeout waiting for executor thread '" + name + "' to stop, aborting" );
+ logger.warn( "Timeout waiting for executor thread '{}' to stop, aborting", name );
break;
}
- logger.info( "Waiting until task executor '" + name + "' is idling..." );
+ logger.info( "Waiting until task executor '{}' is idling...", name );
try
{
diff --git a/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/BuildProjectTaskExecutor.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/BuildProjectTaskExecutor.java
index 48e5c56..48b2b40 100644
--- a/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/BuildProjectTaskExecutor.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/BuildProjectTaskExecutor.java
@@ -18,6 +18,7 @@ package org.apache.archiva.redback.components.taskqueue.execution;
* specific language governing permissions and limitations
* under the License.
*/
+
import org.apache.archiva.redback.components.taskqueue.BuildProjectTask;
import org.apache.archiva.redback.components.taskqueue.Task;
import org.slf4j.Logger;
@@ -25,11 +26,9 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
/**
- *
* @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
- *
*/
-@Service("taskExecutor#build-project")
+@Service ( "taskExecutor#build-project" )
public class BuildProjectTaskExecutor
implements TaskExecutor
{
@@ -43,7 +42,7 @@ public class BuildProjectTaskExecutor
task.start();
- logger.info( "Task: " + task + " cancelled: " + task.isCancelled() + "; done: " + task.isDone() );
+ logger.info( "Task:{} cancelled: {}; done: {}", task, task.isCancelled(), task.isDone() );
long time = System.currentTimeMillis();
@@ -53,13 +52,13 @@ public class BuildProjectTaskExecutor
{
try
{
- logger.info( "Sleeping " + timeToSleep + "ms (interrupts ignored: " + task.ignoreInterrupts() + ")" );
+ logger.info( "Sleeping {} ms (interrupts ignored: {} )", timeToSleep, task.ignoreInterrupts() );
Thread.sleep( timeToSleep );
task.done();
- logger.info( "Task completed normally: " + task + " cancelled: " + task.isCancelled() + "; done: "
- + task.isDone() );
+ logger.info( "Task completed normally: {} cancelled: {}; done: {}", task, task.isCancelled(),
+ task.isDone() );
}
catch ( InterruptedException e )
{
@@ -67,8 +66,8 @@ public class BuildProjectTaskExecutor
{
task.cancel();
- logger.info(
- "Task cancelled: " + task + " cancelled: " + task.isCancelled() + "; done: " + task.isDone() );
+ logger.info( "Task cancelled: {} cancelled: {} ; done: {}", task, task.isCancelled(),
+ task.isDone() );
throw new TaskExecutionException( "Never interrupt sleeping threads! :)", e );
}
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 20/37: use staged
released parent
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit c66489b397a5ebbe02641630da84fc2380d3793f
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sat Apr 27 07:41:50 2013 +0000
use staged released parent
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1476518 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index da2b933..02077b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.1</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 18/37:
[maven-release-plugin] prepare for next development iteration
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit af0dce2cf9efc5cb09ffc41bfaeac5da9cf6542e
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Sep 21 14:11:56 2012 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1388511 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index ca964cc..22e29b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
<artifactId>spring-taskqueue</artifactId>
<packaging>bundle</packaging>
<name>Spring Task Queue</name>
@@ -43,9 +43,9 @@
</distributionManagement>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/tags/spring-taskqueue-2.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/tags/spring-taskqueue-2.0</developerConnection>
- <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/tags/spring-taskqueue-2.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-taskqueue/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-taskqueue/</developerConnection>
+ <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/</url>
</scm>
<dependencies>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 19/37: log4j 2.0-beta1
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit fc5c407a6f073d056bddf6b14961f39a640753b3
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sat Sep 22 16:04:11 2012 +0000
log4j 2.0-beta1
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1388823 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 22e29b7..da2b933 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 32/37: use last
parent for 1.7
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit c91b17b8a89e28f83eb7ffbf8b4372bec9faf518
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sat Apr 5 12:03:47 2014 +0000
use last parent for 1.7
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1585079 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9087ec7..dc3fd18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.2</version>
+ <version>2.3-SNAPSHOT</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 36/37: Changing
parent version
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit c47b3f8f38e7a330af5c9dfb399bf2f32f464199
Author: Martin Stockhammer <m....@web.de>
AuthorDate: Mon Apr 9 22:18:45 2018 +0200
Changing parent version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 80db306..737cc5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 04/37: fix license
headers
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 4c3370ddc69b9c8e6ce941094e353d74ecdb24a4
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Apr 6 21:33:42 2012 +0000
fix license headers
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1310599 13f79535-47bb-0310-9956-ffa450edef68
---
.../plexus/taskqueue/DefaultTaskQueue.java | 33 ++++++++----------
.../java/org/codehaus/plexus/taskqueue/Task.java | 33 ++++++++----------
.../plexus/taskqueue/TaskEntryEvaluator.java | 33 ++++++++----------
.../plexus/taskqueue/TaskExitEvaluator.java | 33 ++++++++----------
.../org/codehaus/plexus/taskqueue/TaskQueue.java | 33 ++++++++----------
.../plexus/taskqueue/TaskQueueException.java | 33 ++++++++----------
.../plexus/taskqueue/TaskViabilityEvaluator.java | 33 ++++++++----------
.../execution/TaskExecutionException.java | 33 ++++++++----------
.../plexus/taskqueue/execution/TaskExecutor.java | 33 ++++++++----------
.../taskqueue/execution/TaskQueueExecutor.java | 39 ++++++++++------------
.../execution/ThreadedTaskQueueExecutor.java | 33 ++++++++----------
11 files changed, 158 insertions(+), 211 deletions(-)
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/DefaultTaskQueue.java b/src/main/java/org/codehaus/plexus/taskqueue/DefaultTaskQueue.java
index 810b579..9fba821 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/DefaultTaskQueue.java
+++ b/src/main/java/org/codehaus/plexus/taskqueue/DefaultTaskQueue.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.slf4j.Logger;
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/Task.java b/src/main/java/org/codehaus/plexus/taskqueue/Task.java
index 3dd3fdc..4aae533 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/Task.java
+++ b/src/main/java/org/codehaus/plexus/taskqueue/Task.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
/**
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/TaskEntryEvaluator.java b/src/main/java/org/codehaus/plexus/taskqueue/TaskEntryEvaluator.java
index b732e10..51dc0de 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/TaskEntryEvaluator.java
+++ b/src/main/java/org/codehaus/plexus/taskqueue/TaskEntryEvaluator.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
/**
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/TaskExitEvaluator.java b/src/main/java/org/codehaus/plexus/taskqueue/TaskExitEvaluator.java
index 95dd907..5095a7a 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/TaskExitEvaluator.java
+++ b/src/main/java/org/codehaus/plexus/taskqueue/TaskExitEvaluator.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
/**
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/TaskQueue.java b/src/main/java/org/codehaus/plexus/taskqueue/TaskQueue.java
index 832528c..d6ab183 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/TaskQueue.java
+++ b/src/main/java/org/codehaus/plexus/taskqueue/TaskQueue.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/TaskQueueException.java b/src/main/java/org/codehaus/plexus/taskqueue/TaskQueueException.java
index c448906..f3fc975 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/TaskQueueException.java
+++ b/src/main/java/org/codehaus/plexus/taskqueue/TaskQueueException.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
/**
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/TaskViabilityEvaluator.java b/src/main/java/org/codehaus/plexus/taskqueue/TaskViabilityEvaluator.java
index 2ee2fc2..2a0ebeb 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/TaskViabilityEvaluator.java
+++ b/src/main/java/org/codehaus/plexus/taskqueue/TaskViabilityEvaluator.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.util.Collection;
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutionException.java b/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutionException.java
index aac0f81..d5dc470 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutionException.java
+++ b/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutionException.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue.execution;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
/**
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutor.java b/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutor.java
index 15bea9d..abb67b0 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutor.java
+++ b/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutor.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue.execution;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.codehaus.plexus.taskqueue.Task;
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutor.java b/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutor.java
index e097bc1..758a270 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutor.java
+++ b/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutor.java
@@ -1,31 +1,28 @@
package org.codehaus.plexus.taskqueue.execution;
-import org.codehaus.plexus.taskqueue.Task;
-
/*
- * The MIT License
- *
- * Copyright (c) 2004, The Codehaus
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
+import org.codehaus.plexus.taskqueue.Task;
+
+
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/execution/ThreadedTaskQueueExecutor.java b/src/main/java/org/codehaus/plexus/taskqueue/execution/ThreadedTaskQueueExecutor.java
index c827e18..bf6f455 100644
--- a/src/main/java/org/codehaus/plexus/taskqueue/execution/ThreadedTaskQueueExecutor.java
+++ b/src/main/java/org/codehaus/plexus/taskqueue/execution/ThreadedTaskQueueExecutor.java
@@ -1,27 +1,22 @@
package org.codehaus.plexus.taskqueue.execution;
/*
- * The MIT License
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Copyright (c) 2004, The Codehaus
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.commons.lang.StringUtils;
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 01/37: import redback
components sources http://svn.codehaus.org/redback/components/trunk/ r1724.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 490913c031ed8646ced28df608cb0403ebcf3c80
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Apr 6 09:33:40 2012 +0000
import redback components sources
http://svn.codehaus.org/redback/components/trunk/ r1724.
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1310262 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 78 +++++
.../plexus/taskqueue/DefaultTaskQueue.java | 221 ++++++++++++
.../java/org/codehaus/plexus/taskqueue/Task.java | 38 +++
.../plexus/taskqueue/TaskEntryEvaluator.java | 38 +++
.../plexus/taskqueue/TaskExitEvaluator.java | 38 +++
.../org/codehaus/plexus/taskqueue/TaskQueue.java | 82 +++++
.../plexus/taskqueue/TaskQueueException.java | 43 +++
.../plexus/taskqueue/TaskViabilityEvaluator.java | 45 +++
.../execution/TaskExecutionException.java | 43 +++
.../plexus/taskqueue/execution/TaskExecutor.java | 37 ++
.../taskqueue/execution/TaskQueueExecutor.java | 52 +++
.../execution/ThreadedTaskQueueExecutor.java | 378 +++++++++++++++++++++
src/main/resources/META-INF/spring-context.xml | 34 ++
.../plexus/taskqueue/ATaskEntryEvaluator.java | 42 +++
.../plexus/taskqueue/ATaskExitEvaluator.java | 42 +++
.../plexus/taskqueue/BTaskEntryEvaluator.java | 42 +++
.../plexus/taskqueue/BTaskExitEvaluator.java | 42 +++
.../plexus/taskqueue/BuildProjectTask.java | 160 +++++++++
.../BuildProjectTaskViabilityEvaluator.java | 68 ++++
.../codehaus/plexus/taskqueue/TaskQueueTest.java | 191 +++++++++++
.../execution/BuildProjectTaskExecutor.java | 81 +++++
.../taskqueue/execution/TaskQueueExecutorTest.java | 112 ++++++
src/test/resources/spring-context.xml | 66 ++++
23 files changed, 1973 insertions(+)
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..ab4aabd
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,78 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.codehaus.redback.components</groupId>
+ <artifactId>redback-components</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ <relativePath>../redback-components-parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>spring-taskqueue</artifactId>
+ <name>Spring Task Queue</name>
+ <version>1.1-SNAPSHOT</version>
+
+ <url>http://redback.codehaus.org/components/${project.artifactId}</url>
+
+ <distributionManagement>
+ <site>
+ <id>codehaus.org</id>
+ <url>dav:https://dav.codehaus.org/redback/components/${project.artifactId}</url>
+ </site>
+ </distributionManagement>
+
+ <scm>
+ <connection>scm:svn:https://svn.codehaus.org/redback/components/trunk/spring-taskqueue</connection>
+ <developerConnection>scm:svn:https://svn.codehaus.org/redback/components/trunk/spring-taskqueue</developerConnection>
+ <url>http://fisheye.codehaus.org/browse/redback/components/trunk/spring-taskqueue</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+</project>
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/DefaultTaskQueue.java b/src/main/java/org/codehaus/plexus/taskqueue/DefaultTaskQueue.java
new file mode 100644
index 0000000..810b579
--- /dev/null
+++ b/src/main/java/org/codehaus/plexus/taskqueue/DefaultTaskQueue.java
@@ -0,0 +1,221 @@
+package org.codehaus.plexus.taskqueue;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+
+/**
+ * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+public class DefaultTaskQueue
+ implements TaskQueue
+{
+
+ private Logger logger = LoggerFactory.getLogger( getClass() );
+
+ private List<TaskEntryEvaluator> taskEntryEvaluators = new ArrayList<TaskEntryEvaluator>();
+
+ private List<TaskExitEvaluator> taskExitEvaluators = new ArrayList<TaskExitEvaluator>();
+
+ private List<TaskViabilityEvaluator> taskViabilityEvaluators = new ArrayList<TaskViabilityEvaluator>();
+
+ private BlockingQueue<Task> queue = new LinkedBlockingQueue<Task>();
+
+ // ----------------------------------------------------------------------
+ // Component Lifecycle
+ // ----------------------------------------------------------------------
+
+ // ----------------------------------------------------------------------
+ // TaskQueue Implementation
+ // ----------------------------------------------------------------------
+
+ // ----------------------------------------------------------------------
+ // Queue operations
+ // ----------------------------------------------------------------------
+
+ public boolean put( Task task )
+ throws TaskQueueException
+ {
+ // ----------------------------------------------------------------------
+ // Check that all the task entry evaluators accepts the task
+ // ----------------------------------------------------------------------
+
+ for ( TaskEntryEvaluator taskEntryEvaluator : taskEntryEvaluators )
+ {
+ boolean result = taskEntryEvaluator.evaluate( task );
+
+ if ( !result )
+ {
+ return false;
+ }
+ }
+
+ // ----------------------------------------------------------------------
+ // The task was accepted, enqueue it
+ // ----------------------------------------------------------------------
+
+ enqueue( task );
+
+ // ----------------------------------------------------------------------
+ // Check that all the task viability evaluators accepts the task
+ // ----------------------------------------------------------------------
+
+ for ( TaskViabilityEvaluator taskViabilityEvaluator : taskViabilityEvaluators )
+ {
+ Collection<Task> toBeRemoved =
+ taskViabilityEvaluator.evaluate( Collections.unmodifiableCollection( queue ) );
+
+ for ( Iterator<Task> it2 = toBeRemoved.iterator(); it2.hasNext(); )
+ {
+ Task t = it2.next();
+
+ queue.remove( t );
+ }
+ }
+
+ return true;
+ }
+
+ public Task take()
+ throws TaskQueueException
+ {
+ logger.debug( "take" );
+ while ( true )
+ {
+ Task task = dequeue();
+
+ if ( task == null )
+ {
+ return null;
+ }
+
+ for ( TaskExitEvaluator taskExitEvaluator : taskExitEvaluators )
+ {
+ boolean result = taskExitEvaluator.evaluate( task );
+
+ if ( !result )
+ {
+ // the task wasn't accepted; drop it.
+ task = null;
+
+ break;
+ }
+ }
+
+ if ( task != null )
+ {
+ return task;
+ }
+ }
+ }
+
+ public Task poll( int timeout, TimeUnit timeUnit )
+ throws InterruptedException
+ {
+ logger.debug( "pool" );
+ return queue.poll( timeout, timeUnit );
+ }
+
+ public boolean remove( Task task )
+ throws ClassCastException, NullPointerException
+ {
+ return queue.remove( task );
+ }
+
+ public boolean removeAll( List tasks )
+ throws ClassCastException, NullPointerException
+ {
+ return queue.removeAll( tasks );
+ }
+
+ // ----------------------------------------------------------------------
+ // Queue Inspection
+ // ----------------------------------------------------------------------
+
+ public List<Task> getQueueSnapshot()
+ throws TaskQueueException
+ {
+ return Collections.unmodifiableList( new ArrayList( queue ) );
+ }
+
+ // ----------------------------------------------------------------------
+ // Queue Management
+ // ----------------------------------------------------------------------
+
+ private void enqueue( Task task )
+ {
+ boolean success = queue.add( task );
+ logger.debug( "enqueue success {}", success );
+ }
+
+ private Task dequeue()
+ {
+ logger.debug( "dequeue" );
+ return queue.poll();
+ }
+
+ public List<TaskEntryEvaluator> getTaskEntryEvaluators()
+ {
+ return taskEntryEvaluators;
+ }
+
+ public void setTaskEntryEvaluators( List<TaskEntryEvaluator> taskEntryEvaluators )
+ {
+ this.taskEntryEvaluators = taskEntryEvaluators;
+ }
+
+ public List<TaskExitEvaluator> getTaskExitEvaluators()
+ {
+ return taskExitEvaluators;
+ }
+
+ public void setTaskExitEvaluators( List<TaskExitEvaluator> taskExitEvaluators )
+ {
+ this.taskExitEvaluators = taskExitEvaluators;
+ }
+
+ public List<TaskViabilityEvaluator> getTaskViabilityEvaluators()
+ {
+ return taskViabilityEvaluators;
+ }
+
+ public void setTaskViabilityEvaluators( List<TaskViabilityEvaluator> taskViabilityEvaluators )
+ {
+ this.taskViabilityEvaluators = taskViabilityEvaluators;
+ }
+}
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/Task.java b/src/main/java/org/codehaus/plexus/taskqueue/Task.java
new file mode 100644
index 0000000..3dd3fdc
--- /dev/null
+++ b/src/main/java/org/codehaus/plexus/taskqueue/Task.java
@@ -0,0 +1,38 @@
+package org.codehaus.plexus.taskqueue;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+public interface Task
+{
+ /**
+ * @return the maximum time in milliseconds this task may run before it's cancelled.
+ */
+ long getMaxExecutionTime();
+}
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/TaskEntryEvaluator.java b/src/main/java/org/codehaus/plexus/taskqueue/TaskEntryEvaluator.java
new file mode 100644
index 0000000..b732e10
--- /dev/null
+++ b/src/main/java/org/codehaus/plexus/taskqueue/TaskEntryEvaluator.java
@@ -0,0 +1,38 @@
+package org.codehaus.plexus.taskqueue;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+public interface TaskEntryEvaluator
+{
+ String ROLE = TaskEntryEvaluator.class.getName();
+
+ boolean evaluate( Task task )
+ throws TaskQueueException;
+}
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/TaskExitEvaluator.java b/src/main/java/org/codehaus/plexus/taskqueue/TaskExitEvaluator.java
new file mode 100644
index 0000000..95dd907
--- /dev/null
+++ b/src/main/java/org/codehaus/plexus/taskqueue/TaskExitEvaluator.java
@@ -0,0 +1,38 @@
+package org.codehaus.plexus.taskqueue;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+public interface TaskExitEvaluator
+{
+ String ROLE = TaskExitEvaluator.class.getName();
+
+ boolean evaluate( Task task )
+ throws TaskQueueException;
+}
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/TaskQueue.java b/src/main/java/org/codehaus/plexus/taskqueue/TaskQueue.java
new file mode 100644
index 0000000..832528c
--- /dev/null
+++ b/src/main/java/org/codehaus/plexus/taskqueue/TaskQueue.java
@@ -0,0 +1,82 @@
+package org.codehaus.plexus.taskqueue;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+
+/**
+ * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+public interface TaskQueue
+{
+ String ROLE = TaskQueue.class.getName();
+
+ // ----------------------------------------------------------------------
+ // Queue operations
+ // ----------------------------------------------------------------------
+
+ /**
+ * @param task
+ * The task to add to the queue.
+ * @return Returns true if the task was accepted into the queue.
+ */
+ boolean put( Task task )
+ throws TaskQueueException;
+
+ Task take()
+ throws TaskQueueException;
+
+ boolean remove( Task task )
+ throws ClassCastException, NullPointerException;
+
+ boolean removeAll( List tasks )
+ throws ClassCastException, NullPointerException;
+
+ // ----------------------------------------------------------------------
+ // Queue Inspection
+ // ----------------------------------------------------------------------
+
+ List getQueueSnapshot()
+ throws TaskQueueException;
+
+ /**
+ * Retrieves and removes the head of the queue, waiting at most timeout timeUnit when no element is available.
+ *
+ * @param timeout
+ * time to wait, in timeUnit units
+ * @param timeUnit
+ * how to interpret the timeout parameter.
+ * @return the head of the queue, or null if the timeout elapsed
+ * @throws InterruptedException
+ * when this thread is interrupted while waiting
+ */
+ Task poll( int timeout, TimeUnit timeUnit )
+ throws InterruptedException;
+}
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/TaskQueueException.java b/src/main/java/org/codehaus/plexus/taskqueue/TaskQueueException.java
new file mode 100644
index 0000000..c448906
--- /dev/null
+++ b/src/main/java/org/codehaus/plexus/taskqueue/TaskQueueException.java
@@ -0,0 +1,43 @@
+package org.codehaus.plexus.taskqueue;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+public class TaskQueueException
+ extends Exception
+{
+ public TaskQueueException( String message )
+ {
+ super( message );
+ }
+
+ public TaskQueueException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+}
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/TaskViabilityEvaluator.java b/src/main/java/org/codehaus/plexus/taskqueue/TaskViabilityEvaluator.java
new file mode 100644
index 0000000..2ee2fc2
--- /dev/null
+++ b/src/main/java/org/codehaus/plexus/taskqueue/TaskViabilityEvaluator.java
@@ -0,0 +1,45 @@
+package org.codehaus.plexus.taskqueue;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import java.util.Collection;
+
+/**
+ * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+public interface TaskViabilityEvaluator
+{
+ String ROLE = TaskViabilityEvaluator.class.getName();
+
+ /**
+ * @param tasks The tasks to evaluate
+ * @return Returns a list of tasks to remove from the queue.
+ * @throws TaskQueueException
+ */
+ Collection<Task> evaluate( Collection tasks )
+ throws TaskQueueException;
+}
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutionException.java b/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutionException.java
new file mode 100644
index 0000000..aac0f81
--- /dev/null
+++ b/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutionException.java
@@ -0,0 +1,43 @@
+package org.codehaus.plexus.taskqueue.execution;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+public class TaskExecutionException
+ extends Exception
+{
+ public TaskExecutionException( String message )
+ {
+ super( message );
+ }
+
+ public TaskExecutionException( String message, Throwable cause )
+ {
+ super( message, cause );
+ }
+}
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutor.java b/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutor.java
new file mode 100644
index 0000000..15bea9d
--- /dev/null
+++ b/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskExecutor.java
@@ -0,0 +1,37 @@
+package org.codehaus.plexus.taskqueue.execution;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import org.codehaus.plexus.taskqueue.Task;
+
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+public interface TaskExecutor
+{
+ void executeTask( Task task )
+ throws TaskExecutionException;
+}
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutor.java b/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutor.java
new file mode 100644
index 0000000..e097bc1
--- /dev/null
+++ b/src/main/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutor.java
@@ -0,0 +1,52 @@
+package org.codehaus.plexus.taskqueue.execution;
+
+import org.codehaus.plexus.taskqueue.Task;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+public interface TaskQueueExecutor
+{
+ String ROLE = TaskQueueExecutor.class.getName();
+
+ /**
+ * Returns the currently executing task.
+ *
+ * @return the currently executing task.
+ */
+ Task getCurrentTask();
+
+ /**
+ * Cancels execution of this task, if it's currently running.
+ * Does NOT remove it from the associated queue!
+ *
+ * @param task The task to cancel
+ * @return true if the task was cancelled, false if the task was not executing.
+ */
+ boolean cancelTask( Task task );
+}
diff --git a/src/main/java/org/codehaus/plexus/taskqueue/execution/ThreadedTaskQueueExecutor.java b/src/main/java/org/codehaus/plexus/taskqueue/execution/ThreadedTaskQueueExecutor.java
new file mode 100644
index 0000000..c827e18
--- /dev/null
+++ b/src/main/java/org/codehaus/plexus/taskqueue/execution/ThreadedTaskQueueExecutor.java
@@ -0,0 +1,378 @@
+package org.codehaus.plexus.taskqueue.execution;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import org.apache.commons.lang.StringUtils;
+import org.codehaus.plexus.taskqueue.Task;
+import org.codehaus.plexus.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;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @author <a href="mailto:kenney@codehaus.org">Kenney Westerhof</a>
+ * @version $Id$
+ */
+public class ThreadedTaskQueueExecutor
+ implements TaskQueueExecutor
+{
+
+ private Logger logger = LoggerFactory.getLogger( getClass() );
+
+ private static final int SHUTDOWN = 1;
+
+ private static final int CANCEL_TASK = 2;
+
+ /**
+ * requirement
+ */
+ private TaskQueue queue;
+
+ /**
+ * requirement
+ */
+ private TaskExecutor executor;
+
+ /**
+ * configuration
+ */
+ private String name;
+
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
+ private ExecutorRunnable executorRunnable;
+
+ private ExecutorService executorService;
+
+ private Task currentTask;
+
+ private class ExecutorRunnable
+ extends Thread
+ {
+ private volatile int command;
+
+ private boolean done;
+
+ public void run()
+ {
+ while ( command != SHUTDOWN )
+ {
+ final Task task;
+
+ currentTask = null;
+
+ try
+ {
+ task = queue.poll( 100, TimeUnit.MILLISECONDS );
+ }
+ catch ( InterruptedException e )
+ {
+ logger.info( "Executor thread interrupted, command: {}", ( command == SHUTDOWN
+ ? "Shutdown"
+ : command == CANCEL_TASK ? "Cancel task" : "Unknown" ) );
+ continue;
+ }
+
+ if ( task == null )
+ {
+ continue;
+ }
+
+ currentTask = task;
+
+ Future future = executorService.submit( new Runnable()
+ {
+ public void run()
+ {
+ try
+ {
+ executor.executeTask( task );
+ }
+ catch ( TaskExecutionException e )
+ {
+ logger.error( "Error executing task", e );
+ }
+ }
+ } );
+
+ try
+ {
+ waitForTask( task, future );
+ }
+ catch ( ExecutionException e )
+ {
+ logger.error( "Error executing task", e );
+ }
+ }
+
+ currentTask = null;
+
+ logger.info( "Executor thread '{}' exited.", name );
+
+ done = true;
+
+ synchronized ( this )
+ {
+ notifyAll();
+ }
+ }
+
+ private void waitForTask( Task task, Future future )
+ throws ExecutionException
+ {
+ boolean stop = false;
+
+ while ( !stop )
+ {
+ try
+ {
+ if ( task.getMaxExecutionTime() == 0 )
+ {
+ logger.debug( "Waiting indefinitely for task to complete" );
+ future.get();
+ return;
+ }
+ else
+ {
+ logger.debug( "Waiting at most {} ms for task completion", task.getMaxExecutionTime() );
+ future.get( task.getMaxExecutionTime(), TimeUnit.MILLISECONDS );
+ logger.debug( "Task completed within {} ms", task.getMaxExecutionTime() );
+ return;
+ }
+ }
+ catch ( InterruptedException e )
+ {
+ switch ( command )
+ {
+ case SHUTDOWN:
+ {
+ logger.info( "Shutdown command received. Cancelling task." );
+ cancel( future );
+ return;
+ }
+
+ case CANCEL_TASK:
+ {
+ command = 0;
+ logger.info( "Cancelling task" );
+ cancel( future );
+ return;
+ }
+
+ default:
+ // when can this thread be interrupted, and should we ignore it if shutdown = false?
+ logger.warn( "Interrupted while waiting for task to complete; ignoring", e );
+ break;
+ }
+ }
+ catch ( TimeoutException e )
+ {
+ logger.warn( "Task {} didn't complete within time, cancelling it.", task );
+ cancel( future );
+ return;
+ }
+ catch ( CancellationException e )
+ {
+ logger.warn( "The task was cancelled", e );
+ return;
+ }
+ }
+ }
+
+ private void cancel( Future future )
+ {
+ if ( !future.cancel( true ) )
+ {
+ if ( !future.isDone() && !future.isCancelled() )
+ {
+ logger.warn( "Unable to cancel task" );
+ }
+ else
+ {
+ logger.warn(
+ "Task not cancelled (Flags: done: " + future.isDone() + " cancelled: " + future.isCancelled()
+ + ")" );
+ }
+ }
+ else
+ {
+ logger.debug( "Task successfully cancelled" );
+ }
+ }
+
+ public synchronized void shutdown()
+ {
+ logger.debug( "Signalling executor thread to shutdown" );
+
+ command = SHUTDOWN;
+
+ interrupt();
+ }
+
+ public synchronized boolean cancelTask( Task task )
+ {
+ if ( !task.equals( currentTask ) )
+ {
+ logger.debug( "Not cancelling task - it is not running" );
+ return false;
+ }
+
+ if ( command != SHUTDOWN )
+ {
+ logger.debug( "Signalling executor thread to cancel task" );
+
+ command = CANCEL_TASK;
+
+ interrupt();
+ }
+ else
+ {
+ logger.debug( "Executor thread already stopping; task will be cancelled automatically" );
+ }
+
+ return true;
+ }
+
+ public boolean isDone()
+ {
+ return done;
+ }
+ }
+
+ // ----------------------------------------------------------------------
+ // Component lifecycle
+ // ----------------------------------------------------------------------
+
+ @PostConstruct
+ public void start()
+ {
+
+ if ( StringUtils.isBlank( name ) )
+ {
+ throw new IllegalArgumentException( "'name' must be set." );
+ }
+
+ logger.info( "Starting task executor, thread name '{}'.", name );
+
+ this.executorService = Executors.newSingleThreadExecutor();
+
+ executorRunnable = new ExecutorRunnable();
+
+ executorRunnable.setDaemon( true );
+
+ executorRunnable.start();
+ }
+
+ @PreDestroy
+ public void stop()
+ {
+ executorRunnable.shutdown();
+
+ int maxSleep = 10 * 1000; // 10 seconds
+
+ int interval = 1000;
+
+ long endTime = System.currentTimeMillis() + maxSleep;
+
+ while ( !executorRunnable.isDone() && executorRunnable.isAlive() )
+ {
+ if ( System.currentTimeMillis() > endTime )
+ {
+ logger.warn( "Timeout waiting for executor thread '" + name + "' to stop, aborting" );
+ break;
+ }
+
+ logger.info( "Waiting until task executor '" + name + "' is idling..." );
+
+ try
+ {
+ synchronized ( executorRunnable )
+ {
+ executorRunnable.wait( interval );
+ }
+ }
+ catch ( InterruptedException ex )
+ {
+ // ignore
+ }
+
+ // notify again, just in case.
+ executorRunnable.shutdown();
+ }
+ }
+
+ public Task getCurrentTask()
+ {
+ return currentTask;
+ }
+
+ public synchronized boolean cancelTask( Task task )
+ {
+ return executorRunnable.cancelTask( task );
+ }
+
+ public TaskQueue getQueue()
+ {
+ return queue;
+ }
+
+ public void setQueue( TaskQueue queue )
+ {
+ this.queue = queue;
+ }
+
+ public TaskExecutor getExecutor()
+ {
+ return executor;
+ }
+
+ public void setExecutor( TaskExecutor executor )
+ {
+ this.executor = executor;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName( String name )
+ {
+ this.name = name;
+ }
+}
diff --git a/src/main/resources/META-INF/spring-context.xml b/src/main/resources/META-INF/spring-context.xml
new file mode 100755
index 0000000..08cf61b
--- /dev/null
+++ b/src/main/resources/META-INF/spring-context.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<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"
+ default-lazy-init="true">
+
+ <context:annotation-config />
+ <context:component-scan
+ base-package="org.codehaus.plexus.taskqueue"/>
+
+</beans>
\ No newline at end of file
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/ATaskEntryEvaluator.java b/src/test/java/org/codehaus/plexus/taskqueue/ATaskEntryEvaluator.java
new file mode 100644
index 0000000..3a90140
--- /dev/null
+++ b/src/test/java/org/codehaus/plexus/taskqueue/ATaskEntryEvaluator.java
@@ -0,0 +1,42 @@
+package org.codehaus.plexus.taskqueue;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import org.springframework.stereotype.Service;
+
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+@Service("taskEntryEvaluator#a")
+public class ATaskEntryEvaluator
+ implements TaskEntryEvaluator
+{
+ public boolean evaluate( Task task )
+ throws TaskQueueException
+ {
+ return ( (BuildProjectTask) task).isPassAEntryEvaluator();
+ }
+}
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/ATaskExitEvaluator.java b/src/test/java/org/codehaus/plexus/taskqueue/ATaskExitEvaluator.java
new file mode 100644
index 0000000..0effd93
--- /dev/null
+++ b/src/test/java/org/codehaus/plexus/taskqueue/ATaskExitEvaluator.java
@@ -0,0 +1,42 @@
+package org.codehaus.plexus.taskqueue;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import org.springframework.stereotype.Service;
+
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+@Service("taskExitEvaluator#a")
+public class ATaskExitEvaluator
+ implements TaskExitEvaluator
+{
+ public boolean evaluate( Task task )
+ throws TaskQueueException
+ {
+ return ( (BuildProjectTask) task ).isPassAExitEvaluator();
+ }
+}
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/BTaskEntryEvaluator.java b/src/test/java/org/codehaus/plexus/taskqueue/BTaskEntryEvaluator.java
new file mode 100644
index 0000000..591e176
--- /dev/null
+++ b/src/test/java/org/codehaus/plexus/taskqueue/BTaskEntryEvaluator.java
@@ -0,0 +1,42 @@
+package org.codehaus.plexus.taskqueue;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import org.springframework.stereotype.Service;
+
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+@Service("taskEntryEvaluator#b")
+public class BTaskEntryEvaluator
+ implements TaskEntryEvaluator
+{
+ public boolean evaluate( Task task )
+ throws TaskQueueException
+ {
+ return ( (BuildProjectTask) task ).isPassBEntryEvaluator();
+ }
+}
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/BTaskExitEvaluator.java b/src/test/java/org/codehaus/plexus/taskqueue/BTaskExitEvaluator.java
new file mode 100644
index 0000000..367bbb4
--- /dev/null
+++ b/src/test/java/org/codehaus/plexus/taskqueue/BTaskExitEvaluator.java
@@ -0,0 +1,42 @@
+package org.codehaus.plexus.taskqueue;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import org.springframework.stereotype.Service;
+
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+@Service("taskExitEvaluator#b")
+public class BTaskExitEvaluator
+ implements TaskExitEvaluator
+{
+ public boolean evaluate( Task task )
+ throws TaskQueueException
+ {
+ return ( (BuildProjectTask) task ).isPassBExitEvaluator();
+ }
+}
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTask.java b/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTask.java
new file mode 100644
index 0000000..c2f1a82
--- /dev/null
+++ b/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTask.java
@@ -0,0 +1,160 @@
+package org.codehaus.plexus.taskqueue;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+public class BuildProjectTask
+ implements Task
+{
+ private boolean passAEntryEvaluator;
+
+ private boolean passBEntryEvaluator;
+
+ private boolean passAExitEvaluator;
+
+ private boolean passBExitEvaluator;
+
+ private long timestamp;
+
+ private long maxExecutionTime;
+
+ private long executionTime;
+
+ private boolean cancelled;
+
+ private boolean done;
+
+ private boolean started;
+
+ private boolean ignoreInterrupts;
+
+ public BuildProjectTask( boolean passAEntryEvaluator, boolean passBEntryEvaluator, boolean passAExitEvaluator,
+ boolean passBExitEvaluator )
+ {
+ this.passAEntryEvaluator = passAEntryEvaluator;
+
+ this.passBEntryEvaluator = passBEntryEvaluator;
+
+ this.passAExitEvaluator = passAExitEvaluator;
+
+ this.passBExitEvaluator = passBExitEvaluator;
+ }
+
+ public BuildProjectTask( long timestamp )
+ {
+ this( true, true, true, true );
+
+ this.timestamp = timestamp;
+ }
+
+ public boolean isPassAEntryEvaluator()
+ {
+ return passAEntryEvaluator;
+ }
+
+ public boolean isPassBEntryEvaluator()
+ {
+ return passBEntryEvaluator;
+ }
+
+ public boolean isPassAExitEvaluator()
+ {
+ return passAExitEvaluator;
+ }
+
+ public boolean isPassBExitEvaluator()
+ {
+ return passBExitEvaluator;
+ }
+
+ public long getTimestamp()
+ {
+ return timestamp;
+ }
+
+ public long getMaxExecutionTime()
+ {
+ return maxExecutionTime;
+ }
+
+ public void setMaxExecutionTime( long timeout )
+ {
+ maxExecutionTime = timeout;
+ }
+
+ public void setExecutionTime( long l )
+ {
+ this.executionTime = l;
+ }
+
+ public long getExecutionTime()
+ {
+ return executionTime;
+ }
+
+ public boolean isCancelled()
+ {
+ return cancelled;
+ }
+
+ public void cancel()
+ {
+ cancelled = true;
+ }
+
+ public void done()
+ {
+ this.done = true;
+ }
+
+ public boolean isDone()
+ {
+ return done;
+ }
+
+ public boolean isStarted()
+ {
+ return started;
+ }
+
+ public void start()
+ {
+ this.started = true;
+ }
+
+ public void setIgnoreInterrupts( boolean ignore )
+ {
+ this.ignoreInterrupts = ignore;
+ }
+
+ public boolean ignoreInterrupts()
+ {
+ return ignoreInterrupts;
+ }
+
+}
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTaskViabilityEvaluator.java b/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTaskViabilityEvaluator.java
new file mode 100644
index 0000000..222dab4
--- /dev/null
+++ b/src/test/java/org/codehaus/plexus/taskqueue/BuildProjectTaskViabilityEvaluator.java
@@ -0,0 +1,68 @@
+package org.codehaus.plexus.taskqueue;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+@Service( "taskViabilityEvaluator#build-project" )
+public class BuildProjectTaskViabilityEvaluator
+ implements TaskViabilityEvaluator
+{
+ public Collection evaluate( Collection tasks )
+ throws TaskQueueException
+ {
+ BuildProjectTask okTask = null;
+
+ List toBeRemoved = new ArrayList( tasks.size() );
+
+ for ( Iterator it = tasks.iterator(); it.hasNext(); )
+ {
+ BuildProjectTask buildProjectTask = (BuildProjectTask) it.next();
+
+ if ( okTask == null )
+ {
+ okTask = buildProjectTask;
+
+ continue;
+ }
+
+ if ( buildProjectTask.getTimestamp() - okTask.getTimestamp() < 100 )
+ {
+ toBeRemoved.add( buildProjectTask );
+ }
+ }
+
+ return toBeRemoved;
+ }
+}
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/TaskQueueTest.java b/src/test/java/org/codehaus/plexus/taskqueue/TaskQueueTest.java
new file mode 100644
index 0000000..7465ffe
--- /dev/null
+++ b/src/test/java/org/codehaus/plexus/taskqueue/TaskQueueTest.java
@@ -0,0 +1,191 @@
+package org.codehaus.plexus.taskqueue;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+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;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+/**
+ * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+ * @version $Id$
+ */
+@RunWith( SpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
+public class TaskQueueTest
+ extends TestCase
+{
+ @Inject
+ @Named( value = "taskQueue#taskQueueTest" )
+ private TaskQueue taskQueue;
+
+
+ // NOTE: If we were using a blocking queue, the sleep/continue in the ThreadedTaskQueueExecutor wouldn't
+ // be necessary; the queue would block until an element was available.
+ @Test
+ public void testEmptyQueue()
+ throws Exception
+ {
+ assertNull( taskQueue.take() );
+ }
+
+ @Test
+ public void testTaskEntryAndExitEvaluators()
+ throws Exception
+ {
+ assertTaskIsAccepted( new BuildProjectTask( true, true, true, true ) );
+
+ assertTaskIsRejected( new BuildProjectTask( false, true, true, true ) );
+
+ assertTaskIsRejected( new BuildProjectTask( true, false, true, true ) );
+
+ assertTaskIsRejected( new BuildProjectTask( true, true, false, true ) );
+
+ assertTaskIsRejected( new BuildProjectTask( true, true, true, false ) );
+ }
+
+ @Test
+ public void testTaskViabilityEvaluators()
+ throws Exception
+ {
+ // The first and last task should be accepted
+
+ Task task1 = new BuildProjectTask( 0 );
+
+ Task task2 = new BuildProjectTask( 10 );
+
+ Task task3 = new BuildProjectTask( 20 );
+
+ Task task4 = new BuildProjectTask( 30 );
+
+ Task task5 = new BuildProjectTask( 40 );
+
+ Task task6 = new BuildProjectTask( 100 );
+
+ assertTrue( taskQueue.put( task1 ) );
+
+ assertTrue( taskQueue.put( task2 ) );
+
+ assertTrue( taskQueue.put( task3 ) );
+
+ assertTrue( taskQueue.put( task4 ) );
+
+ assertTrue( taskQueue.put( task5 ) );
+
+ assertTrue( taskQueue.put( task6 ) );
+
+ Task actualTask1 = taskQueue.take();
+
+ assertNotNull( actualTask1 );
+
+ assertEquals( task1, actualTask1 );
+
+ Task actualTask6 = taskQueue.take();
+
+ assertNotNull( actualTask6 );
+
+ assertEquals( task6, actualTask6 );
+
+ assertNull( taskQueue.take() );
+ }
+
+ @Test
+ public void testRemoveTask()
+ throws Exception
+ {
+ Task task = new BuildProjectTask( 0 );
+
+ taskQueue.put( task );
+
+ taskQueue.remove( task );
+
+ assertNull( taskQueue.take() );
+ }
+
+ @Test
+ public void testRemoveAll()
+ throws Exception
+ {
+
+ BlockingQueue<String> foo = new LinkedBlockingQueue<String>();
+ foo.offer("1");
+ foo.offer("2");
+
+ Task firstTask = new BuildProjectTask( 110 );
+
+ taskQueue.put( firstTask );
+
+ Task secondTask = new BuildProjectTask( 11120 );
+
+ taskQueue.put( secondTask );
+
+ assertEquals( 2, taskQueue.getQueueSnapshot().size() );
+
+ List tasks = new ArrayList();
+
+ tasks.add( firstTask );
+
+ tasks.add( secondTask );
+
+ taskQueue.removeAll( tasks );
+
+ assertTrue( taskQueue.getQueueSnapshot().isEmpty() );
+ }
+
+ // ----------------------------------------------------------------------
+ //
+ // ----------------------------------------------------------------------
+
+ private void assertTaskIsAccepted( Task expectedTask )
+ throws Exception
+ {
+ taskQueue.put( expectedTask );
+
+ Task actualTask = taskQueue.take();
+
+ assertEquals( expectedTask, actualTask );
+ }
+
+ private void assertTaskIsRejected( Task expectedTask )
+ throws Exception
+ {
+ taskQueue.put( expectedTask );
+
+ Task actualTask = taskQueue.take();
+
+ assertNull( actualTask );
+ }
+}
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/execution/BuildProjectTaskExecutor.java b/src/test/java/org/codehaus/plexus/taskqueue/execution/BuildProjectTaskExecutor.java
new file mode 100644
index 0000000..cd05683
--- /dev/null
+++ b/src/test/java/org/codehaus/plexus/taskqueue/execution/BuildProjectTaskExecutor.java
@@ -0,0 +1,81 @@
+package org.codehaus.plexus.taskqueue.execution;
+
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.codehaus.plexus.taskqueue.BuildProjectTask;
+import org.codehaus.plexus.taskqueue.Task;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
+ *
+ */
+@Service("taskExecutor#build-project")
+public class BuildProjectTaskExecutor
+ implements TaskExecutor
+{
+
+ private Logger logger = LoggerFactory.getLogger( getClass() );
+
+ public void executeTask( Task task0 )
+ throws TaskExecutionException
+ {
+ BuildProjectTask task = (BuildProjectTask) task0;
+
+ task.start();
+
+ logger.info( "Task: " + task + " cancelled: " + task.isCancelled() + "; done: " + task.isDone() );
+
+ long time = System.currentTimeMillis();
+
+ long endTime = task.getExecutionTime() + time;
+
+ for ( long timeToSleep = endTime - time; timeToSleep > 0; timeToSleep = endTime - System.currentTimeMillis() )
+ {
+ try
+ {
+ logger.info( "Sleeping " + timeToSleep + "ms (interrupts ignored: " + task.ignoreInterrupts() + ")" );
+ Thread.sleep( timeToSleep );
+
+ task.done();
+
+ logger.info( "Task completed normally: " + task + " cancelled: " + task.isCancelled() + "; done: "
+ + task.isDone() );
+ }
+ catch ( InterruptedException e )
+ {
+ if ( !task.ignoreInterrupts() )
+ {
+ task.cancel();
+
+ logger.info(
+ "Task cancelled: " + task + " cancelled: " + task.isCancelled() + "; done: " + task.isDone() );
+
+ throw new TaskExecutionException( "Never interrupt sleeping threads! :)", e );
+ }
+ else
+ {
+ logger.info( "Ignoring interrupt" );
+ }
+ }
+ }
+
+ }
+}
diff --git a/src/test/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutorTest.java b/src/test/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutorTest.java
new file mode 100644
index 0000000..ae1ed0c
--- /dev/null
+++ b/src/test/java/org/codehaus/plexus/taskqueue/execution/TaskQueueExecutorTest.java
@@ -0,0 +1,112 @@
+package org.codehaus.plexus.taskqueue.execution;
+
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004, The Codehaus
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import junit.framework.TestCase;
+import org.codehaus.plexus.taskqueue.BuildProjectTask;
+import org.codehaus.plexus.taskqueue.TaskQueue;
+import org.codehaus.plexus.taskqueue.TaskQueueException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+/**
+ * @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
+ */
+@RunWith( SpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
+public class TaskQueueExecutorTest
+ extends TestCase
+{
+ @Inject
+ @Named( value = "taskQueue#default" )
+ private TaskQueue taskQueue;
+
+ // inject this to start the executor see @PostConstruct in {@link ThreadedTaskQueueExecutor
+ @Inject
+ @Named( value = "queueExecutor#default" )
+ private TaskQueueExecutor taskQueueExecutor;
+
+
+ @Test
+ public void testTimeoutWithInterrupts()
+ throws TaskQueueException, InterruptedException
+ {
+ BuildProjectTask task = putTask( 2 * 1000, false );
+
+ waitForExpectedTaskEnd( task );
+
+ assertTrue( task.isCancelled() );
+ assertFalse( task.isDone() );
+ }
+
+ @Test
+ public void testTimeoutWithoutInterrupts()
+ throws TaskQueueException, InterruptedException
+ {
+ BuildProjectTask task = putTask( 2 * 1000, true );
+
+ waitForExpectedTaskEnd( task );
+
+ // the thread is killed so the task is neither done nor cancelled
+ assertFalse( task.isCancelled() );
+ assertFalse( task.isDone() );
+ }
+
+ private BuildProjectTask putTask( int executionTime, boolean ignoreInterrupts )
+ throws TaskQueueException
+ {
+ BuildProjectTask task = new BuildProjectTask( 100 );
+ task.setMaxExecutionTime( executionTime );
+ task.setExecutionTime( 10 * executionTime );
+ task.setIgnoreInterrupts( ignoreInterrupts );
+
+ taskQueue.put( task );
+ return task;
+ }
+
+ private static void waitForExpectedTaskEnd( BuildProjectTask task )
+ throws InterruptedException
+ {
+ // thread scheduling may take some time, so we want to wait until the task
+ // is actually running before starting to count the timeout.
+ for ( int i = 0; i < 500; i++ )
+ {
+ if ( task.isStarted() )
+ {
+ break;
+ }
+ Thread.sleep( 10 );
+ }
+
+ assertTrue( "Task not started in 5 seconds - heavy load?", task.isStarted() );
+
+ Thread.sleep( task.getMaxExecutionTime() );
+ }
+}
diff --git a/src/test/resources/spring-context.xml b/src/test/resources/spring-context.xml
new file mode 100644
index 0000000..ad66c03
--- /dev/null
+++ b/src/test/resources/spring-context.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<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"
+ default-lazy-init="true">
+
+ <bean name="queueExecutor#default" class="org.codehaus.plexus.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">
+ <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">
+ <property name="taskEntryEvaluators">
+ <list>
+ <ref bean="taskEntryEvaluator#a"/>
+ <ref bean="taskEntryEvaluator#b"/>
+ </list>
+ </property>
+ <property name="taskExitEvaluators">
+ <list>
+ <ref bean="taskExitEvaluator#a"/>
+ <ref bean="taskExitEvaluator#b"/>
+ </list>
+ </property>
+ <property name="taskViabilityEvaluators">
+ <list>
+ <ref bean="taskViabilityEvaluator#build-project"/>
+ </list>
+ </property>
+ </bean>
+
+ <bean name="taskQueue#default" parent="abstractQueue"/>
+
+ <bean name="taskQueue#taskQueueTest" parent="abstractQueue"/>
+
+</beans>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 15/37: use a staged
released parent
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 0d3f5fd8884d2973c64b8b82b64d3731fe3bda80
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Sep 21 11:28:22 2012 +0000
use a staged released parent
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1388432 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 48a8f23..1f11952 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 17/37:
[maven-release-plugin] prepare release spring-taskqueue-2.0
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 928b5428913be2921c7f85d792d932258e2243cc
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Sep 21 14:11:48 2012 +0000
[maven-release-plugin] prepare release spring-taskqueue-2.0
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1388509 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1ffd26f..ca964cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0</version>
<artifactId>spring-taskqueue</artifactId>
<packaging>bundle</packaging>
<name>Spring Task Queue</name>
@@ -43,9 +43,9 @@
</distributionManagement>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-taskqueue/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-taskqueue/</developerConnection>
- <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/tags/spring-taskqueue-2.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/tags/spring-taskqueue-2.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/tags/spring-taskqueue-2.0</url>
</scm>
<dependencies>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 12/37: configure
svnpub for redback-components site
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 54e549e537e4d7f13836c39e01476baea77b5084
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Tue Aug 28 20:19:24 2012 +0000
configure svnpub for redback-components site
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1378297 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 7 -------
1 file changed, 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index c3b6de7..a3286dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,13 +34,6 @@
<url>http://archiva.apache.org/redback/components/${project.artifactId}</url>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scp://people.apache.org/www/archiva.apache.org/redback/components/${project.artifactId}</url>
- </site>
- </distributionManagement>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-taskqueue/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-taskqueue/</developerConnection>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 21/37: back to parent
snapshot
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit e64917f0f3d00f1932cae52d1bb6c85812ba09a1
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sun Apr 28 09:44:00 2013 +0000
back to parent snapshot
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1476744 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 02077b0..da2b933 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.archiva.redback.components</groupId>
<artifactId>redback-components</artifactId>
- <version>2.1</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>../redback-components-parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 08/37: no more need
of plexus stuff
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit de3d4f33a3f3dd755946f7c4fc0e12407bd4c1de
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sat Apr 21 15:32:03 2012 +0000
no more need of plexus stuff
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1328694 13f79535-47bb-0310-9956-ffa450edef68
---
.../redback/components/taskqueue/TaskEntryEvaluator.java | 2 --
.../redback/components/taskqueue/TaskExitEvaluator.java | 2 --
.../archiva/redback/components/taskqueue/TaskQueue.java | 15 +++++----------
.../components/taskqueue/TaskViabilityEvaluator.java | 1 -
.../components/taskqueue/execution/TaskQueueExecutor.java | 2 --
5 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java
index 7d9825a..86ff674 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java
@@ -26,8 +26,6 @@ package org.apache.archiva.redback.components.taskqueue;
*/
public interface TaskEntryEvaluator
{
- String ROLE = TaskEntryEvaluator.class.getName();
-
boolean evaluate( Task task )
throws TaskQueueException;
}
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java
index ce6a04e..5e68aa0 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java
@@ -26,8 +26,6 @@ package org.apache.archiva.redback.components.taskqueue;
*/
public interface TaskExitEvaluator
{
- String ROLE = TaskExitEvaluator.class.getName();
-
boolean evaluate( Task task )
throws TaskQueueException;
}
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
index e853fcb..68bf9a3 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
@@ -31,15 +31,13 @@ import java.util.concurrent.TimeUnit;
*/
public interface TaskQueue
{
- String ROLE = TaskQueue.class.getName();
// ----------------------------------------------------------------------
// Queue operations
// ----------------------------------------------------------------------
/**
- * @param task
- * The task to add to the queue.
+ * @param task The task to add to the queue.
* @return Returns true if the task was accepted into the queue.
*/
boolean put( Task task )
@@ -50,7 +48,7 @@ public interface TaskQueue
boolean remove( Task task )
throws ClassCastException, NullPointerException;
-
+
boolean removeAll( List tasks )
throws ClassCastException, NullPointerException;
@@ -64,13 +62,10 @@ public interface TaskQueue
/**
* Retrieves and removes the head of the queue, waiting at most timeout timeUnit when no element is available.
*
- * @param timeout
- * time to wait, in timeUnit units
- * @param timeUnit
- * how to interpret the timeout parameter.
+ * @param timeout time to wait, in timeUnit units
+ * @param timeUnit how to interpret the timeout parameter.
* @return the head of the queue, or null if the timeout elapsed
- * @throws InterruptedException
- * when this thread is interrupted while waiting
+ * @throws InterruptedException when this thread is interrupted while waiting
*/
Task poll( int timeout, TimeUnit timeUnit )
throws InterruptedException;
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
index dd31ec9..84eeafe 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
@@ -28,7 +28,6 @@ import java.util.Collection;
*/
public interface TaskViabilityEvaluator
{
- String ROLE = TaskViabilityEvaluator.class.getName();
/**
* @param tasks The tasks to evaluate
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java
index 0e9e326..2303715 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java
@@ -22,14 +22,12 @@ package org.apache.archiva.redback.components.taskqueue.execution;
import org.apache.archiva.redback.components.taskqueue.Task;
-
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
*/
public interface TaskQueueExecutor
{
- String ROLE = TaskQueueExecutor.class.getName();
/**
* Returns the currently executing task.
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 09/37: remove
@version $Id$
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit b058ca7605842f5e63e1c25803571e6105445b7d
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Thu Jul 5 20:51:15 2012 +0000
remove @version $Id$
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1357900 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java | 2 +-
src/main/java/org/apache/archiva/redback/components/taskqueue/Task.java | 2 +-
.../apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java | 2 +-
.../apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java | 2 +-
.../java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java | 2 +-
.../apache/archiva/redback/components/taskqueue/TaskQueueException.java | 2 +-
.../archiva/redback/components/taskqueue/TaskViabilityEvaluator.java | 2 +-
.../redback/components/taskqueue/execution/TaskExecutionException.java | 2 +-
.../archiva/redback/components/taskqueue/execution/TaskExecutor.java | 2 +-
.../redback/components/taskqueue/execution/TaskQueueExecutor.java | 2 +-
.../components/taskqueue/execution/ThreadedTaskQueueExecutor.java | 2 +-
.../archiva/redback/components/taskqueue/ATaskEntryEvaluator.java | 2 +-
.../apache/archiva/redback/components/taskqueue/ATaskExitEvaluator.java | 2 +-
.../archiva/redback/components/taskqueue/BTaskEntryEvaluator.java | 2 +-
.../apache/archiva/redback/components/taskqueue/BTaskExitEvaluator.java | 2 +-
.../apache/archiva/redback/components/taskqueue/BuildProjectTask.java | 2 +-
.../components/taskqueue/BuildProjectTaskViabilityEvaluator.java | 2 +-
.../org/apache/archiva/redback/components/taskqueue/TaskQueueTest.java | 2 +-
18 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
index c8390bf..2ab4161 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
@@ -35,7 +35,7 @@ import java.util.concurrent.TimeUnit;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
+ *
*/
public class DefaultTaskQueue
implements TaskQueue
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/Task.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/Task.java
index 32e8c7d..5bc4e08 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/Task.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/Task.java
@@ -22,7 +22,7 @@ package org.apache.archiva.redback.components.taskqueue;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
+ *
*/
public interface Task
{
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java
index 86ff674..9ea2043 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskEntryEvaluator.java
@@ -22,7 +22,7 @@ package org.apache.archiva.redback.components.taskqueue;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
+ *
*/
public interface TaskEntryEvaluator
{
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java
index 5e68aa0..b92f5f7 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskExitEvaluator.java
@@ -22,7 +22,7 @@ package org.apache.archiva.redback.components.taskqueue;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
+ *
*/
public interface TaskExitEvaluator
{
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
index 68bf9a3..0f642fa 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
+ *
*/
public interface TaskQueue
{
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueueException.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueueException.java
index 93c197d..62895d6 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueueException.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueueException.java
@@ -21,7 +21,7 @@ package org.apache.archiva.redback.components.taskqueue;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
+ *
*/
public class TaskQueueException
extends Exception
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
index 84eeafe..801b994 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskViabilityEvaluator.java
@@ -24,7 +24,7 @@ import java.util.Collection;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
+ *
*/
public interface TaskViabilityEvaluator
{
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutionException.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutionException.java
index dab4fe0..5a9a308 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutionException.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutionException.java
@@ -21,7 +21,7 @@ package org.apache.archiva.redback.components.taskqueue.execution;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
+ *
*/
public class TaskExecutionException
extends Exception
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java
index 21b3783..dd8820e 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskExecutor.java
@@ -23,7 +23,7 @@ import org.apache.archiva.redback.components.taskqueue.Task;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
+ *
*/
public interface TaskExecutor
{
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java
index 2303715..28d1c39 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/TaskQueueExecutor.java
@@ -24,7 +24,7 @@ import org.apache.archiva.redback.components.taskqueue.Task;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
+ *
*/
public interface TaskQueueExecutor
{
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
index 5301d5f..6401696 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
@@ -38,7 +38,7 @@ import java.util.concurrent.TimeoutException;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @author <a href="mailto:kenney@codehaus.org">Kenney Westerhof</a>
- * @version $Id$
+ *
*/
public class ThreadedTaskQueueExecutor
implements TaskQueueExecutor
diff --git a/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskEntryEvaluator.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskEntryEvaluator.java
index 0e00c2c..6730f07 100644
--- a/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskEntryEvaluator.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskEntryEvaluator.java
@@ -23,7 +23,7 @@ import org.springframework.stereotype.Service;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
+ *
*/
@Service("taskEntryEvaluator#a")
public class ATaskEntryEvaluator
diff --git a/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskExitEvaluator.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskExitEvaluator.java
index 7ba0d88..e6e7762 100644
--- a/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskExitEvaluator.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/ATaskExitEvaluator.java
@@ -23,7 +23,7 @@ import org.springframework.stereotype.Service;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
+ *
*/
@Service("taskExitEvaluator#a")
public class ATaskExitEvaluator
diff --git a/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskEntryEvaluator.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskEntryEvaluator.java
index d75c90b..0da349e 100644
--- a/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskEntryEvaluator.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskEntryEvaluator.java
@@ -23,7 +23,7 @@ import org.springframework.stereotype.Service;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
+ *
*/
@Service("taskEntryEvaluator#b")
public class BTaskEntryEvaluator
diff --git a/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskExitEvaluator.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskExitEvaluator.java
index 10db4d5..9d0227f 100644
--- a/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskExitEvaluator.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/BTaskExitEvaluator.java
@@ -23,7 +23,7 @@ import org.springframework.stereotype.Service;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
+ *
*/
@Service("taskExitEvaluator#b")
public class BTaskExitEvaluator
diff --git a/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTask.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTask.java
index 739c797..4b5e953 100644
--- a/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTask.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTask.java
@@ -23,7 +23,7 @@ import org.apache.archiva.redback.components.taskqueue.Task;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
+ *
*/
public class BuildProjectTask
implements Task
diff --git a/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTaskViabilityEvaluator.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTaskViabilityEvaluator.java
index fe65024..110e1fd 100644
--- a/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTaskViabilityEvaluator.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/BuildProjectTaskViabilityEvaluator.java
@@ -28,7 +28,7 @@ import java.util.List;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
+ *
*/
@Service( "taskViabilityEvaluator#build-project" )
public class BuildProjectTaskViabilityEvaluator
diff --git a/src/test/java/org/apache/archiva/redback/components/taskqueue/TaskQueueTest.java b/src/test/java/org/apache/archiva/redback/components/taskqueue/TaskQueueTest.java
index e9c7d5d..b57ba7c 100644
--- a/src/test/java/org/apache/archiva/redback/components/taskqueue/TaskQueueTest.java
+++ b/src/test/java/org/apache/archiva/redback/components/taskqueue/TaskQueueTest.java
@@ -34,7 +34,7 @@ import java.util.concurrent.LinkedBlockingQueue;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
- * @version $Id$
+ *
*/
@RunWith( SpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 27/37: generics
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit fa2dc281064533de96510fccfdecb261651008f2
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Tue Dec 10 01:22:22 2013 +0000
generics
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1549730 13f79535-47bb-0310-9956-ffa450edef68
---
.../archiva/redback/components/taskqueue/DefaultTaskQueue.java | 6 +++---
.../org/apache/archiva/redback/components/taskqueue/TaskQueue.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
index 2ab4161..d85ae73 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/DefaultTaskQueue.java
@@ -95,9 +95,9 @@ public class DefaultTaskQueue
Collection<Task> toBeRemoved =
taskViabilityEvaluator.evaluate( Collections.unmodifiableCollection( queue ) );
- for ( Iterator<Task> it2 = toBeRemoved.iterator(); it2.hasNext(); )
+ for ( Iterator<Task> it = toBeRemoved.iterator(); it.hasNext(); )
{
- Task t = it2.next();
+ Task t = it.next();
queue.remove( t );
}
@@ -152,7 +152,7 @@ public class DefaultTaskQueue
return queue.remove( task );
}
- public boolean removeAll( List tasks )
+ public boolean removeAll( List<Task> tasks )
throws ClassCastException, NullPointerException
{
return queue.removeAll( tasks );
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
index 0f642fa..8b5794f 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/TaskQueue.java
@@ -49,14 +49,14 @@ public interface TaskQueue
boolean remove( Task task )
throws ClassCastException, NullPointerException;
- boolean removeAll( List tasks )
+ boolean removeAll( List<Task> tasks )
throws ClassCastException, NullPointerException;
// ----------------------------------------------------------------------
// Queue Inspection
// ----------------------------------------------------------------------
- List getQueueSnapshot()
+ List<Task> getQueueSnapshot()
throws TaskQueueException;
/**
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 37/37: Adding
gitignore
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 5a28df44950342f92aed760934bb649408b7477d
Author: Martin Stockhammer <m....@web.de>
AuthorDate: Mon Apr 9 22:19:04 2018 +0200
Adding gitignore
---
.gitignore | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6f52bf1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+.idea/**
+.project
+.classpath
+.settings
+.java-version
+target
+.DS_Store
+.site-content
+out
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 22/37: fix various
path for deployment
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 0545f7a0e1a623bba71a4b7a75de2b139a145350
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Sun May 5 10:53:13 2013 +0000
fix various path for deployment
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1479288 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index da2b933..0bacf20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<distributionManagement>
<site>
<id>apache.website</id>
- <url>file://${user.home}/redback-components-site-deploy/${project.artifactId}</url>
+ <url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/redback/components/${project.artifactId}</url>
</site>
</distributionManagement>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 06/37: fix pom due to
asf move
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit 7654ac19260f2584c55a567d4508796556314f83
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Fri Apr 6 22:40:56 2012 +0000
fix pom due to asf move
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1310624 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3808edf..b93dff4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,21 +27,21 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-taskqueue</artifactId>
<name>Spring Task Queue</name>
- <version>1.1-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
- <url>http://redback.codehaus.org/components/${project.artifactId}</url>
+ <url>http://archiva.apache.org/redback/components/${project.artifactId}</url>
<distributionManagement>
<site>
- <id>codehaus.org</id>
- <url>dav:https://dav.codehaus.org/redback/components/${project.artifactId}</url>
+ <id>apache.website</id>
+ <url>scp://people.apache.org/www/archiva.apache.org/redback/components/${project.artifactId}</url>
</site>
</distributionManagement>
<scm>
- <connection>scm:svn:https://svn.codehaus.org/redback/components/trunk/spring-taskqueue</connection>
- <developerConnection>scm:svn:https://svn.codehaus.org/redback/components/trunk/spring-taskqueue</developerConnection>
- <url>http://fisheye.codehaus.org/browse/redback/components/trunk/spring-taskqueue</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-taskqueue/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk/spring-taskqueue/</developerConnection>
+ <url>http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/</url>
</scm>
<dependencies>
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.
[archiva-redback-components-spring-taskqueue] 25/37: fix logging
warn level
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-taskqueue.git
commit e406935f52f876897ab17212a40578cbc2269cf7
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Mon Dec 2 02:55:36 2013 +0000
fix logging warn level
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1546881 13f79535-47bb-0310-9956-ffa450edef68
---
.../components/taskqueue/execution/ThreadedTaskQueueExecutor.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
index 213f6dc..c79dc43 100644
--- a/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
+++ b/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
@@ -218,8 +218,7 @@ public class ThreadedTaskQueueExecutor
else
{
logger.warn(
- "Task not cancelled (Flags: done: " + future.isDone() + " cancelled: " + future.isCancelled()
- + ")" );
+ "Task not cancelled (Flags: done: {} cancelled: {})", future.isDone(), future.isCancelled() );
}
}
else
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.