Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 41854 invoked from network); 5 May 2008 06:31:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 May 2008 06:31:31 -0000 Received: (qmail 37623 invoked by uid 500); 5 May 2008 06:31:32 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 37587 invoked by uid 500); 5 May 2008 06:31:32 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 37578 invoked by uid 99); 5 May 2008 06:31:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 May 2008 23:31:32 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 May 2008 06:30:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D563723889C0; Sun, 4 May 2008 23:31:06 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r653306 - in /incubator/sling/trunk: ./ commons/threads/ commons/threads/src/main/java/org/apache/sling/commons/ commons/threads/src/main/java/org/apache/sling/commons/threads/ commons/threads/src/main/java/org/apache/sling/commons/threads/... Date: Mon, 05 May 2008 06:31:06 -0000 To: sling-commits@incubator.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080505063106.D563723889C0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Sun May 4 23:31:05 2008 New Revision: 653306 URL: http://svn.apache.org/viewvc?rev=653306&view=rev Log: SLING-417: Move threads to commons. Added: incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/ incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/ incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPool.java - copied, changed from r653302, incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/threads/ThreadPool.java incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPoolConfig.java - copied, changed from r653302, incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/threads/ThreadPoolConfig.java incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPoolManager.java - copied, changed from r653302, incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/threads/ThreadPoolManager.java incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/ - copied from r653302, incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/threads/impl/ Removed: incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/threads/ Modified: incubator/sling/trunk/commons/threads/pom.xml incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPool.java incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactory.java incubator/sling/trunk/launchpad/app/pom.xml incubator/sling/trunk/pom.xml incubator/sling/trunk/sling/event/pom.xml incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/AbstractRepositoryEventHandlerTest.java incubator/sling/trunk/sling/scheduler/pom.xml incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzScheduler.java Modified: incubator/sling/trunk/commons/threads/pom.xml URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/threads/pom.xml?rev=653306&r1=653305&r2=653306&view=diff ============================================================================== --- incubator/sling/trunk/commons/threads/pom.xml (original) +++ incubator/sling/trunk/commons/threads/pom.xml Sun May 4 23:31:05 2008 @@ -27,7 +27,7 @@ ../../parent/pom.xml - org.apache.sling.threads + org.apache.sling.commons.threads bundle 2.0.0-incubator-SNAPSHOT @@ -38,13 +38,13 @@ - scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/sling/threads + scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/commons/threads - scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/sling/threads + scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/commons/threads - http://svn.apache.org/viewvc/incubator/sling/trunk/sling/threads + http://svn.apache.org/viewvc/incubator/sling/trunk/commons/threads @@ -61,10 +61,10 @@ - org.apache.sling.threads + org.apache.sling.commons.threads - org.apache.sling.threads.impl + org.apache.sling.commons.threads.impl Copied: incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPool.java (from r653302, incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/threads/ThreadPool.java) URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPool.java?p2=incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPool.java&p1=incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/threads/ThreadPool.java&r1=653302&r2=653306&rev=653306&view=diff ============================================================================== --- incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/threads/ThreadPool.java (original) +++ incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPool.java Sun May 4 23:31:05 2008 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.threads; +package org.apache.sling.commons.threads; /** * The ThreadPool interface allows to start runnables by Copied: incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPoolConfig.java (from r653302, incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/threads/ThreadPoolConfig.java) URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPoolConfig.java?p2=incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPoolConfig.java&p1=incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/threads/ThreadPoolConfig.java&r1=653302&r2=653306&rev=653306&view=diff ============================================================================== --- incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/threads/ThreadPoolConfig.java (original) +++ incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPoolConfig.java Sun May 4 23:31:05 2008 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.threads; +package org.apache.sling.commons.threads; import java.util.concurrent.ThreadFactory; Copied: incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPoolManager.java (from r653302, incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/threads/ThreadPoolManager.java) URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPoolManager.java?p2=incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPoolManager.java&p1=incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/threads/ThreadPoolManager.java&r1=653302&r2=653306&rev=653306&view=diff ============================================================================== --- incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/threads/ThreadPoolManager.java (original) +++ incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/ThreadPoolManager.java Sun May 4 23:31:05 2008 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.threads; +package org.apache.sling.commons.threads; /** Modified: incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPool.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPool.java?rev=653306&r1=653302&r2=653306&view=diff ============================================================================== --- incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPool.java (original) +++ incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPool.java Sun May 4 23:31:05 2008 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.threads.impl; +package org.apache.sling.commons.threads.impl; import java.util.concurrent.BlockingQueue; import java.util.concurrent.Executors; @@ -25,9 +25,9 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import org.apache.sling.threads.ThreadPool; -import org.apache.sling.threads.ThreadPoolConfig; -import org.apache.sling.threads.ThreadPoolManager; +import org.apache.sling.commons.threads.ThreadPool; +import org.apache.sling.commons.threads.ThreadPoolConfig; +import org.apache.sling.commons.threads.ThreadPoolManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -137,7 +137,7 @@ } /** - * @see org.apache.sling.threads.ThreadPool#getName() + * @see org.apache.sling.commons.threads.ThreadPool#getName() */ public String getName() { return name; @@ -145,14 +145,14 @@ /** - * @see org.apache.sling.threads.ThreadPool#getConfiguration() + * @see org.apache.sling.commons.threads.ThreadPool#getConfiguration() */ public ThreadPoolConfig getConfiguration() { return this.configuration; } /** - * @see org.apache.sling.threads.ThreadPool#execute(java.lang.Runnable) + * @see org.apache.sling.commons.threads.ThreadPool#execute(java.lang.Runnable) */ public void execute(Runnable runnable) { if ( this.executor == null ) { @@ -166,7 +166,7 @@ } /** - * @see org.apache.sling.threads.ThreadPool#shutdown() + * @see org.apache.sling.commons.threads.ThreadPool#shutdown() */ public void shutdown() { if ( this.executor != null ) { Modified: incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java?rev=653306&r1=653302&r2=653306&view=diff ============================================================================== --- incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java (original) +++ incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java Sun May 4 23:31:05 2008 @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.threads.impl; +package org.apache.sling.commons.threads.impl; import java.util.HashMap; import java.util.Map; -import org.apache.sling.threads.ThreadPool; -import org.apache.sling.threads.ThreadPoolConfig; -import org.apache.sling.threads.ThreadPoolManager; +import org.apache.sling.commons.threads.ThreadPool; +import org.apache.sling.commons.threads.ThreadPoolConfig; +import org.apache.sling.commons.threads.ThreadPoolManager; import org.osgi.service.component.ComponentContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +31,7 @@ * and is responsible to manage {@link ThreadPool}s. * * @scr.component metatype="false" - * @scr.service interface="org.apache.sling.threads.ThreadPoolManager" + * @scr.service interface="org.apache.sling.commons.threads.ThreadPoolManager" * * @version $Id$ */ @@ -78,7 +78,7 @@ } /** - * @see org.apache.sling.threads.ThreadPoolManager#add(org.apache.sling.threads.ThreadPool) + * @see org.apache.sling.commons.threads.ThreadPoolManager#add(org.apache.sling.commons.threads.ThreadPool) */ public boolean add(ThreadPool pool) { synchronized ( this.pools ) { @@ -91,7 +91,7 @@ } /** - * @see org.apache.sling.threads.ThreadPoolManager#get(java.lang.String) + * @see org.apache.sling.commons.threads.ThreadPoolManager#get(java.lang.String) */ public ThreadPool get(String name) { if ( name == null ) { @@ -108,7 +108,7 @@ } /** - * @see org.apache.sling.threads.ThreadPoolManager#create(java.lang.String, org.apache.sling.threads.ThreadPoolConfig) + * @see org.apache.sling.commons.threads.ThreadPoolManager#create(java.lang.String, org.apache.sling.commons.threads.ThreadPoolConfig) */ public ThreadPool create(String name, ThreadPoolConfig config) { Modified: incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactory.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactory.java?rev=653306&r1=653302&r2=653306&view=diff ============================================================================== --- incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactory.java (original) +++ incubator/sling/trunk/commons/threads/src/main/java/org/apache/sling/commons/threads/impl/ExtendedThreadFactory.java Sun May 4 23:31:05 2008 @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sling.threads.impl; +package org.apache.sling.commons.threads.impl; import java.util.concurrent.ThreadFactory; -import org.apache.sling.threads.ThreadPoolConfig; +import org.apache.sling.commons.threads.ThreadPoolConfig; /** * This class is responsible to create new Thread instances. * It's a very basic implementation. * - * @version $Id: DefaultThreadFactory.java 628678 2008-02-18 10:40:12Z cziegeler $ + * @version $Id$ */ public final class ExtendedThreadFactory implements ThreadFactory { Modified: incubator/sling/trunk/launchpad/app/pom.xml URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/pom.xml?rev=653306&r1=653305&r2=653306&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/app/pom.xml (original) +++ incubator/sling/trunk/launchpad/app/pom.xml Sun May 4 23:31:05 2008 @@ -316,7 +316,7 @@ org.apache.sling - org.apache.sling.threads + org.apache.sling.commons.threads 2.0.0-incubator-SNAPSHOT true Modified: incubator/sling/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/sling/trunk/pom.xml?rev=653306&r1=653305&r2=653306&view=diff ============================================================================== --- incubator/sling/trunk/pom.xml (original) +++ incubator/sling/trunk/pom.xml Sun May 4 23:31:05 2008 @@ -74,6 +74,7 @@ commons/mime commons/osgi commons/testing + commons/threads jcr/api @@ -104,7 +105,6 @@ sling/scheduler sling/servlets-get sling/servlets-post - sling/threads sling/bundleresource Modified: incubator/sling/trunk/sling/event/pom.xml URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/event/pom.xml?rev=653306&r1=653305&r2=653306&view=diff ============================================================================== --- incubator/sling/trunk/sling/event/pom.xml (original) +++ incubator/sling/trunk/sling/event/pom.xml Sun May 4 23:31:05 2008 @@ -109,7 +109,7 @@ org.apache.sling - org.apache.sling.threads + org.apache.sling.commons.threads 2.0.0-incubator-SNAPSHOT Modified: incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java?rev=653306&r1=653305&r2=653306&view=diff ============================================================================== --- incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java (original) +++ incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java Sun May 4 23:31:05 2008 @@ -35,11 +35,11 @@ import javax.jcr.Session; import javax.jcr.observation.EventListener; +import org.apache.sling.commons.threads.ThreadPool; +import org.apache.sling.commons.threads.ThreadPoolConfig; +import org.apache.sling.commons.threads.ThreadPoolManager; import org.apache.sling.event.EventUtil; import org.apache.sling.jcr.api.SlingRepository; -import org.apache.sling.threads.ThreadPool; -import org.apache.sling.threads.ThreadPoolConfig; -import org.apache.sling.threads.ThreadPoolManager; import org.osgi.service.component.ComponentContext; import org.osgi.service.event.Event; import org.osgi.service.event.EventAdmin; Modified: incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/AbstractRepositoryEventHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/AbstractRepositoryEventHandlerTest.java?rev=653306&r1=653305&r2=653306&view=diff ============================================================================== --- incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/AbstractRepositoryEventHandlerTest.java (original) +++ incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/AbstractRepositoryEventHandlerTest.java Sun May 4 23:31:05 2008 @@ -32,10 +32,10 @@ import javax.jcr.observation.EventListenerIterator; import org.apache.sling.commons.testing.jcr.RepositoryUtil; +import org.apache.sling.commons.threads.ThreadPool; +import org.apache.sling.commons.threads.ThreadPoolConfig; +import org.apache.sling.commons.threads.ThreadPoolManager; import org.apache.sling.jcr.api.SlingRepository; -import org.apache.sling.threads.ThreadPool; -import org.apache.sling.threads.ThreadPoolConfig; -import org.apache.sling.threads.ThreadPoolManager; import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.integration.junit4.JMock; Modified: incubator/sling/trunk/sling/scheduler/pom.xml URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/scheduler/pom.xml?rev=653306&r1=653305&r2=653306&view=diff ============================================================================== --- incubator/sling/trunk/sling/scheduler/pom.xml (original) +++ incubator/sling/trunk/sling/scheduler/pom.xml Sun May 4 23:31:05 2008 @@ -101,7 +101,7 @@ org.apache.sling - org.apache.sling.threads + org.apache.sling.commons.threads 2.0.0-incubator-SNAPSHOT Modified: incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzScheduler.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzScheduler.java?rev=653306&r1=653305&r2=653306&view=diff ============================================================================== --- incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzScheduler.java (original) +++ incubator/sling/trunk/sling/scheduler/src/main/java/org/apache/sling/scheduler/impl/QuartzScheduler.java Sun May 4 23:31:05 2008 @@ -25,10 +25,10 @@ import java.util.NoSuchElementException; import java.util.UUID; +import org.apache.sling.commons.threads.ThreadPool; +import org.apache.sling.commons.threads.ThreadPoolManager; import org.apache.sling.scheduler.Job; import org.apache.sling.scheduler.Scheduler; -import org.apache.sling.threads.ThreadPool; -import org.apache.sling.threads.ThreadPoolManager; import org.osgi.framework.Constants; import org.osgi.framework.ServiceReference; import org.osgi.service.component.ComponentContext;