incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
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 GMT
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 @@
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
-    <artifactId>org.apache.sling.threads</artifactId>
+    <artifactId>org.apache.sling.commons.threads</artifactId>
     <packaging>bundle</packaging>
     <version>2.0.0-incubator-SNAPSHOT</version>
 
@@ -38,13 +38,13 @@
 
     <scm>
         <connection>
-            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
         </connection>
         <developerConnection>
-            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
         </developerConnection>
         <url>
-            http://svn.apache.org/viewvc/incubator/sling/trunk/sling/threads
+            http://svn.apache.org/viewvc/incubator/sling/trunk/commons/threads
         </url>
     </scm>
 
@@ -61,10 +61,10 @@
                 <configuration>
                     <instructions>
                         <Export-Package>
-                            org.apache.sling.threads
+                            org.apache.sling.commons.threads
                         </Export-Package>
                         <Private-Package>
-                            org.apache.sling.threads.impl
+                            org.apache.sling.commons.threads.impl
                         </Private-Package>
                     </instructions>
                 </configuration>

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 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.threads</artifactId>
+            <artifactId>org.apache.sling.commons.threads</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
             <optional>true</optional>
         </dependency>

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 @@
         <module>commons/mime</module>
         <module>commons/osgi</module>
         <module>commons/testing</module>
+        <module>commons/threads</module>
                 
         <!-- The JCR sub project -->
         <module>jcr/api</module>
@@ -104,7 +105,6 @@
         <module>sling/scheduler</module>
         <module>sling/servlets-get</module>
         <module>sling/servlets-post</module>
-        <module>sling/threads</module>
         <module>sling/bundleresource</module>
 
         <!-- Scripting Support -->

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 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.threads</artifactId>
+            <artifactId>org.apache.sling.commons.threads</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
         </dependency>
         <dependency>

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 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.threads</artifactId>
+            <artifactId>org.apache.sling.commons.threads</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
         </dependency>
         <!-- The following dependencies will be replaced by using the quartz wrapper bundle
-->

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;



Mime
View raw message