You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:25:30 UTC

[sling-org-apache-sling-commons-threads] annotated tag org.apache.sling.commons.threads-3.0.2 created (now f6849a7)

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a change to annotated tag org.apache.sling.commons.threads-3.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git.


      at f6849a7  (tag)
 tagging c17f28cfc2ff7a6821ac30bccde22a09d79e571d (commit)
      by Carsten Ziegeler
      on Wed Sep 1 08:38:20 2010 +0000

- Log -----------------------------------------------------------------
org.apache.sling.commons.threads-3.0.2
-----------------------------------------------------------------------

This annotated tag includes the following new commits:

     new cdf4581  Add new threads module for providing thread pools.
     new c3a54e0  Set svn:ignore
     new 6569a93  Use thread pool to create new threads instead of directly instantiating threads.
     new a216040  Create own thread pool for eventing.
     new 5dfc716  Use thread pooling for scheduler as well. Create own pool for eventing.
     new f8c7fb7  Use jvm default thread factory and always provide priority and daemon settings.
     new a5761c4  Use thread pool configuration object to be extensible.
     new b9020b0  Move licence and notice to top level dir.
     new e413af3  Add incubator disclaimer.
     new 1597daa  Add notice files.
     new 3020eb2  Write first element in pom in one line (to avoid problems with the maven release plugin) and minor pom fixes.
     new 2c687bd  Update notice files.
     new 4c666b9  SLING-417: Move sling/threads to commons/threads
     new 8d1f9f1  SLING-417: Move threads to commons.
     new 23e3268  Eclude maven-eclipse.xml generated by the maven eclipse plugin.
     new 5fa8b5a  SLING-442: Clean up exports, imports, dependencies and used plugins.
     new f7b228d  SLING-479 Fix @scr.tags:   - normalize metadata attribute settings to "no"   - ensure proper metadata and ds attributes are set   - create metatype.properties files where required   - fix metatype.properties files
     new b8442a7  SLING-483: Add excludes for javadocs (WiP)
     new f31810f  SLING-495 - NOTICE files generated using mknotice script
     new 7a30ca2  SLING-495 - NOTICE files updated according to changes in revision 662927
     new fc95c64  SLING-495 - NOTICE files regenerated with revision 663097 changes
     new 601db57  Use released version of parent pom.
     new e4986f9  [maven-release-plugin] prepare release org.apache.sling.commons.threads-2.0.0-incubator
     new 7097543  [maven-release-plugin] prepare for next development iteration
     new bac4721  Fix reference to parent pom.
     new 88286dd  SLING-521: Restore more notice files.
     new dc0cc02  SLING-521: Separate between notice files for bin and src dists.
     new 82242fd  SLING-521: Separate between notice files for bin and src dists.
     new 64c2458  SLING-521: Separate between notice files for bin and src dists.
     new b29c28c  Change copyright year to 2008.
     new 88db633  Update to released versions.
     new 3aaff93  [maven-release-plugin] prepare release org.apache.sling.commons.threads-2.0.2-incubator
     new c5e1a11  [maven-release-plugin] prepare for next development iteration
     new bac3bfb  Use latest snapshots again to make project buildable.
     new 0720836  Use released parent pom where possible.
     new bb289e6  SLING-555 : Update all poms to use the latest parent pom; update parent pom to include the incubator repo for plugins and use latest plugins.
     new daee250  SLING-758 : Correctly evaluate block policy and use the correct handler.
     new 194ca0d  Add more logging to easier detect pool problems.
     new 21e9144  SLING-808 : Increase version to 5-incubator-SNAPSHOT
     new 3ad9b97  Update notice files to include 2009 in copyright statement.
     new 58081a1  SLING-829 Cosmetics to the bundle/project names
     new 3a9b17c  SLING-865 : Move to bundles
     new ae528ef  SLING-865 : Adjust reactor pom and svn information in each module.
     new 6807294  SLING-865 : Adjust path to parent pom and add profiles for samples and contrib
     new 7807d1c  Use release parent pom
     new 03fc7dc  [maven-release-plugin] prepare release org.apache.sling.commons.threads-2.0.4-incubator
     new a28c935  [maven-release-plugin] prepare for next development iteration
     new 4ca55b3  Use next dev version of parent pom
     new bed1b63  Set parent pom to released version.
     new 6ad9afb  Move Sling to new TLP location
     new 10df9b4  SLING-1011 : Remove disclaimer file.
     new ae744d2  SLING-1011 : Adjust svn location
     new 97b3488  SLING-1011 : Remove disclaimer from readme's, adjust links to webite, fix versions in poms.
     new 97733b6  SLING-1033 Upgrade to Sling parent POM 6 (and ensure web app has the leglize stuff, too)
     new ca64268  SLING-1205 Upgrade all projects to parent POM 8 and use OSGi provided OSGi libraries
     new 3423042  SLING-1244 : Redesign thread pool management
     new 1be56f6  [maven-release-plugin] prepare release org.apache.sling.commons.threads-3.0.0
     new d87e5e7  [maven-release-plugin] prepare for next development iteration
     new b56bac2  Add some more debug information.
     new 60be200  Fix typo
     new c65358b  Use released parent pom.
     new 8145a6d  SLING-1699 : New default configuration is created on each startup
     new 7ec685e  Update notice files
     new f0b3a2a  [maven-release-plugin] prepare release org.apache.sling.commons.threads-3.0.2
     new c17f28c  [maven-scm] copy for tag org.apache.sling.commons.threads-3.0.2

The 65 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
['"commits@sling.apache.org" <co...@sling.apache.org>'].

[sling-org-apache-sling-commons-threads] 05/08: SLING-1699 : New default configuration is created on each startup

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.commons.threads-3.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git

commit 8145a6dd9de8132dc18af4f110ff2e0fdccd420d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Aug 27 08:36:15 2010 +0000

    SLING-1699 : New default configuration is created on each startup
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads@990068 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                            |   9 ++
 .../sling/commons/threads/impl/Activator.java      |  10 ++
 .../threads/impl/DefaultThreadPoolManager.java     | 105 +++++++------------
 .../commons/threads/impl/WebConsolePrinter.java    | 115 +++++++++++++++++++++
 src/main/resources/OSGI-INF/metatype/metatype.xml  |   6 +-
 5 files changed, 173 insertions(+), 72 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1f2701f..e67b911 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,9 @@
                         <Private-Package>
                             org.apache.sling.commons.threads.impl
                         </Private-Package>
+                        <Import-Package>
+                            org.apache.felix.webconsole;resolution:=optional, *
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
@@ -94,5 +97,11 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.webconsole</artifactId>
+            <version>3.0.0</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/org/apache/sling/commons/threads/impl/Activator.java b/src/main/java/org/apache/sling/commons/threads/impl/Activator.java
index 7d02ae5..1e76887 100644
--- a/src/main/java/org/apache/sling/commons/threads/impl/Activator.java
+++ b/src/main/java/org/apache/sling/commons/threads/impl/Activator.java
@@ -54,12 +54,22 @@ public class Activator implements BundleActivator {
         this.service = new DefaultThreadPoolManager(this.bundleContext, props);
         this.serviceReg = this.bundleContext.registerService(new String[] {ThreadPoolManager.class.getName(),
                 ManagedServiceFactory.class.getName()}, service, props);
+        try {
+            WebConsolePrinter.initPlugin(this.bundleContext, this.service);
+        } catch (Throwable ignore) {
+            // we just ignore this
+        }
     }
 
     /**
      * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
      */
     public void stop(BundleContext context) {
+        try {
+            WebConsolePrinter.destroyPlugin();
+        } catch (Throwable ignore) {
+            // we just ignore this
+        }
         if ( this.serviceReg != null ) {
             this.serviceReg.unregister();
             this.serviceReg = null;
diff --git a/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java b/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java
index 3fbbc09..318e2cc 100644
--- a/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java
+++ b/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java
@@ -16,10 +16,8 @@
  */
 package org.apache.sling.commons.threads.impl;
 
-import java.io.IOException;
 import java.util.Dictionary;
 import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.Map;
 import java.util.UUID;
 
@@ -31,11 +29,8 @@ import org.apache.sling.commons.threads.ThreadPoolConfig.ThreadPoolPolicy;
 import org.apache.sling.commons.threads.ThreadPoolConfig.ThreadPriority;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.cm.ManagedServiceFactory;
-import org.osgi.util.tracker.ServiceTracker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,18 +53,13 @@ public class DefaultThreadPoolManager
     /** The bundle context. */
     protected final BundleContext bundleContext;
 
-    /** Service tracker for the config admin. */
-    protected final ServiceTracker configAdminTracker;
-
     /**
      * Constructor and activate this component.
      */
     public DefaultThreadPoolManager(final BundleContext bc, final Dictionary<String, Object> props) {
         this.properties = props;
         this.bundleContext = bc;
-        this.configAdminTracker = new ServiceTracker(bc, ConfigurationAdmin.class.getName(), null);
-        this.configAdminTracker.open();
-        this.logger.info("Started Apache Sling Thread Pool Manager: {}", getPid());
+        this.logger.info("Started Apache Sling Thread Pool Manager");
     }
 
     /**
@@ -78,42 +68,13 @@ public class DefaultThreadPoolManager
     public void destroy() {
         this.logger.debug("Disposing all thread pools");
 
-        this.configAdminTracker.close();
-
         synchronized ( this.pools ) {
             for (final Entry entry : this.pools.values()) {
                 entry.shutdown();
             }
             this.pools.clear();
         }
-        this.logger.info("Stopped Apache Sling Thread Pool Manager.");
-    }
-
-    /**
-     * Helper method to get the pid
-     */
-    private String getPid() {
-        // as the activator put a string in the props we know that this is a string
-        return this.properties.get(Constants.SERVICE_PID).toString();
-    }
-
-    /**
-     * Create a dictionary with configuration properties for the configuration
-     */
-    private Dictionary<String, Object> getProperties(final String poolName, final ThreadPoolConfig config) {
-        final Dictionary<String, Object> props = new Hashtable<String, Object>();
-        props.put(ModifiableThreadPoolConfig.PROPERTY_MIN_POOL_SIZE, config.getMinPoolSize());
-        props.put(ModifiableThreadPoolConfig.PROPERTY_MAX_POOL_SIZE, config.getMaxPoolSize());
-        props.put(ModifiableThreadPoolConfig.PROPERTY_QUEUE_SIZE, config.getQueueSize());
-        props.put(ModifiableThreadPoolConfig.PROPERTY_KEEP_ALIVE_TIME, config.getKeepAliveTime());
-        props.put(ModifiableThreadPoolConfig.PROPERTY_BLOCK_POLICY, config.getBlockPolicy().toString());
-        props.put(ModifiableThreadPoolConfig.PROPERTY_SHUTDOWN_GRACEFUL, config.isShutdownGraceful());
-        props.put(ModifiableThreadPoolConfig.PROPERTY_SHUTDOWN_WAIT_TIME, config.getShutdownWaitTimeMs());
-        props.put(ModifiableThreadPoolConfig.PROPERTY_PRIORITY, config.getPriority().toString());
-        props.put(ModifiableThreadPoolConfig.PROPERTY_DAEMON, config.isDaemon());
-        props.put(ModifiableThreadPoolConfig.PROPERTY_NAME, poolName);
-
-        return props;
+        this.logger.info("Stopped Apache Sling Thread Pool Manager");
     }
 
     /**
@@ -162,30 +123,11 @@ public class DefaultThreadPoolManager
             if ( entry == null ) {
                 this.logger.debug("Creating new pool with name {}", poolName);
                 final ModifiableThreadPoolConfig config = new ModifiableThreadPoolConfig();
-                // check for config admin
-                final ConfigurationAdmin ca = (ConfigurationAdmin) this.configAdminTracker.getService();
-                if ( ca != null ) {
-                    try {
-                        final Configuration caConfig = ca.createFactoryConfiguration(getPid());
-                        caConfig.update(this.getProperties(poolName, config));
-                        entry = new Entry(caConfig.getProperties().get(Constants.SERVICE_PID).toString(), config, poolName);
-                    } catch (IOException e) {
-                        // there is not much we can do if we get an io exception
-                        // just log and continue
-                        this.logger.error("Unable to create configuration for thread pool " + poolName, e);
-                    }
-                } else {
-                    this.logger.error("Configuration admin is not available.");
-                }
-                // sanity check - if CA is not available or a problem occured during persisting
-                // we don't have an entry
-                if ( entry == null ) {
-                    entry = new Entry(null, config, poolName);
-                }
+                entry = new Entry(null, config, poolName);
+
                 this.pools.put(poolName, entry);
             }
             return entry.incUsage();
-
         }
     }
 
@@ -227,6 +169,15 @@ public class DefaultThreadPoolManager
     }
 
     /**
+     * Return all configurations for the web console printer
+     */
+    public Entry[] getConfigurations() {
+        synchronized ( this.pools ) {
+            return this.pools.values().toArray(new Entry[this.pools.size()]);
+        }
+    }
+
+    /**
      * @see org.osgi.service.cm.ManagedServiceFactory#updated(java.lang.String, java.util.Dictionary)
      */
     @SuppressWarnings("unchecked")
@@ -238,15 +189,26 @@ public class DefaultThreadPoolManager
         }
         this.logger.debug("Updating {} with {}", pid, properties);
         synchronized ( this.pools ) {
+            final ThreadPoolConfig config = this.createConfig(properties);
+
             Entry foundEntry = null;
-            // we have to search the config by using the pid!
+            // we have to search the config by using the pid first!
             for (final Entry entry : this.pools.values()) {
                 if ( pid.equals(entry.getPid()) ) {
                     foundEntry = entry;
                     break;
                 }
             }
-            final ThreadPoolConfig config = this.createConfig(properties);
+            // if we haven't found it by pid we search by name
+            if ( foundEntry == null ) {
+                for (final Entry entry : this.pools.values()) {
+                    if ( name.equals(entry.getName()) ) {
+                        foundEntry = entry;
+                        break;
+                    }
+                }
+            }
+
             if ( foundEntry != null ) {
                 // if the name changed - we have to reregister(!)
                 if ( !name.equals(foundEntry.getName()) ) {
@@ -254,7 +216,7 @@ public class DefaultThreadPoolManager
                     this.pools.put(name, foundEntry);
                 }
                 // update
-                foundEntry.update(config, name);
+                foundEntry.update(config, name, pid);
             } else {
                 // create
                 this.pools.put(name, new Entry(pid, config, name));
@@ -283,16 +245,16 @@ public class DefaultThreadPoolManager
                 if ( foundEntry.isUsed() ) {
                     // we register this with a new name
                     final String name = "ThreadPool-" + UUID.randomUUID().toString();
-                    foundEntry.update(new ModifiableThreadPoolConfig(), name);
+                    foundEntry.update(new ModifiableThreadPoolConfig(), name, null);
                     this.pools.put(name, foundEntry);
                 }
             }
         }
     }
 
-    private static final class Entry {
+    protected static final class Entry {
         /** The configuration pid. (might be null for anonymous pools.*/
-        private final String pid;
+        private volatile String pid;
 
         /** Usage count. */
         private volatile int count;
@@ -338,7 +300,7 @@ public class DefaultThreadPoolManager
             }
         }
 
-        public void update(final ThreadPoolConfig config, final String name) {
+        public void update(final ThreadPoolConfig config, final String name, final String pid) {
             if ( this.pool != null ) {
                 this.pool.setName(name);
                 if ( !this.config.equals(config) ) {
@@ -347,6 +309,7 @@ public class DefaultThreadPoolManager
             }
             this.config = config;
             this.name = name;
+            this.pid = pid;
         }
 
         public String getName() {
@@ -356,5 +319,9 @@ public class DefaultThreadPoolManager
         public boolean isUsed() {
             return this.count > 0;
         }
+
+        public ThreadPoolConfig getConfig() {
+            return this.config;
+        }
     }
 }
diff --git a/src/main/java/org/apache/sling/commons/threads/impl/WebConsolePrinter.java b/src/main/java/org/apache/sling/commons/threads/impl/WebConsolePrinter.java
new file mode 100644
index 0000000..b0aedf0
--- /dev/null
+++ b/src/main/java/org/apache/sling/commons/threads/impl/WebConsolePrinter.java
@@ -0,0 +1,115 @@
+/*
+ * 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.
+ */
+package org.apache.sling.commons.threads.impl;
+
+import java.io.PrintWriter;
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+import org.apache.felix.webconsole.ConfigurationPrinter;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceRegistration;
+
+/**
+ * This is a configuration printer for the web console which
+ * prints out the thread pools.
+ *
+ */
+public class WebConsolePrinter implements ConfigurationPrinter {
+
+    private static ServiceRegistration plugin;
+
+    public static void initPlugin(final BundleContext bundleContext,
+            final DefaultThreadPoolManager dtpm) {
+        final WebConsolePrinter propertiesPrinter = new WebConsolePrinter(dtpm);
+        final Dictionary<String, String> props = new Hashtable<String, String>();
+        props.put(Constants.SERVICE_DESCRIPTION,
+            "Apache Sling Thread Pool Configuration Printer");
+        props.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation");
+
+        plugin = bundleContext.registerService(ConfigurationPrinter.class.getName(),
+                                               propertiesPrinter, props);
+    }
+
+    public static void destroyPlugin() {
+        if ( plugin != null) {
+            plugin.unregister();
+            plugin = null;
+        }
+    }
+
+    private static String HEADLINE = "Apache Sling Thread Pools";
+
+    private final DefaultThreadPoolManager mgr;
+
+    public WebConsolePrinter(final DefaultThreadPoolManager dtpm) {
+        this.mgr = dtpm;
+    }
+
+    /**
+     * @see org.apache.felix.webconsole.ConfigurationPrinter#getTitle()
+     */
+    public String getTitle() {
+        return "Sling Thread Pools";
+    }
+
+    /**
+     * Print out the servlet filter chains.
+     * @see org.apache.felix.webconsole.ConfigurationPrinter#printConfiguration(java.io.PrintWriter)
+     */
+    public void printConfiguration(PrintWriter pw) {
+        pw.println(HEADLINE);
+        pw.println();
+        final DefaultThreadPoolManager.Entry[] configs = this.mgr.getConfigurations();
+        if ( configs.length > 0 ) {
+            for(final DefaultThreadPoolManager.Entry entry : configs ) {
+                pw.print("Pool ");
+                pw.println(entry.getName());
+                if ( entry.getPid() != null ) {
+                    pw.print("- from configuration : ");
+                    pw.println(entry.getPid());
+                }
+                pw.print("- used : ");
+                pw.println(entry.isUsed());
+                pw.print("- min pool size : ");
+                pw.println(entry.getConfig().getMinPoolSize());
+                pw.print("- max pool size : ");
+                pw.println(entry.getConfig().getMaxPoolSize());
+                pw.print("- queue size : ");
+                pw.println(entry.getConfig().getQueueSize());
+                pw.print("- keep alive time : ");
+                pw.println(entry.getConfig().getKeepAliveTime());
+                pw.print("- block policy : ");
+                pw.println(entry.getConfig().getBlockPolicy());
+                pw.print("- priority : ");
+                pw.println(entry.getConfig().getPriority());
+                pw.print("- shutdown graceful : ");
+                pw.println(entry.getConfig().isShutdownGraceful());
+                pw.print("- shutdown wait time : ");
+                pw.println(entry.getConfig().getShutdownWaitTimeMs());
+                pw.print("- daemon : ");
+                pw.println(entry.getConfig().isDaemon());
+                pw.println();
+            }
+        } else {
+            pw.println("No pools configured.");
+        }
+    }
+}
diff --git a/src/main/resources/OSGI-INF/metatype/metatype.xml b/src/main/resources/OSGI-INF/metatype/metatype.xml
index 6e3ff8c..a6c3f73 100644
--- a/src/main/resources/OSGI-INF/metatype/metatype.xml
+++ b/src/main/resources/OSGI-INF/metatype/metatype.xml
@@ -32,7 +32,7 @@
             type="Integer" default="5" name="%minPoolSize.name"
             description="%minPoolSize.description"/>
         <metatype:AD id="maxPoolSize"
-            type="Integer" default="5" name="%queueSize.name"
+            type="Integer" default="5" name="%maxPoolSize.name"
             description="%maxPoolSize.description" />
         <metatype:AD id="queueSize"
             type="Integer" default="-1" name="%queueSize.name"
@@ -52,10 +52,10 @@
             type="Boolean" default="false" name="%shutdownGraceful.name"
             description="%shutdownGraceful.description" />
         <metatype:AD id="daemon"
-            type="Integer" default="-1" name="%daemon.name"
+            type="Boolean" default="false" name="%daemon.name"
             description="%daemon.description" />
         <metatype:AD id="shutdownWaitTime"
-            type="Boolean" default="false" name="%shutdownWaitTime.name"
+            type="Integer" default="-1" name="%shutdownWaitTime.name"
             description="%shutdownWaitTime.description" />
         <metatype:AD id="priority"
             type="String" default="NORM" name="%priority.name"

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-commons-threads] 01/08: [maven-release-plugin] prepare for next development iteration

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.commons.threads-3.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git

commit d87e5e79fccab5255fdb8a53539437a2f4132bbe
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Dec 17 13:49:57 2009 +0000

    [maven-release-plugin] prepare for next development iteration
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads@891704 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index a31c400..5e76ee5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
     <artifactId>org.apache.sling.commons.threads</artifactId>
     <packaging>bundle</packaging>
-    <version>3.0.0</version>
+    <version>3.0.1-SNAPSHOT</version>
 
     <name>Apache Sling Thread Support</name>
     <description>
@@ -37,9 +37,9 @@
     </description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.threads-3.0.0</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.threads-3.0.0</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.threads-3.0.0</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads</url>
     </scm>
 
     <build>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-commons-threads] 03/08: Fix typo

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.commons.threads-3.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git

commit 60be2003b9f0fcad6764ad61e27804ab1cf840b0
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Dec 30 10:20:50 2009 +0000

    Fix typo
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads@894578 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java b/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java
index c70dac6..3fbbc09 100644
--- a/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java
+++ b/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPoolManager.java
@@ -69,7 +69,7 @@ public class DefaultThreadPoolManager
         this.bundleContext = bc;
         this.configAdminTracker = new ServiceTracker(bc, ConfigurationAdmin.class.getName(), null);
         this.configAdminTracker.open();
-        this.logger.info("Startet Apache Sling Thread Pool Manager: {}", getPid());
+        this.logger.info("Started Apache Sling Thread Pool Manager: {}", getPid());
     }
 
     /**

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-commons-threads] 04/08: Use released parent pom.

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.commons.threads-3.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git

commit c65358b76a1b489dfe8fa1d827047ff98690f53b
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon May 17 13:42:29 2010 +0000

    Use released parent pom.
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads@945149 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5e76ee5..1f2701f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>8</version>
+        <version>9</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-commons-threads] 07/08: [maven-release-plugin] prepare release org.apache.sling.commons.threads-3.0.2

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.commons.threads-3.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git

commit f0b3a2a9c06726dc9aeb07a3dc725befd6683361
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Sep 1 08:37:47 2010 +0000

    [maven-release-plugin] prepare release org.apache.sling.commons.threads-3.0.2
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads@991467 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index e67b911..e827590 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
     <artifactId>org.apache.sling.commons.threads</artifactId>
     <packaging>bundle</packaging>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.2</version>
 
     <name>Apache Sling Thread Support</name>
     <description>
@@ -37,9 +37,9 @@
     </description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.threads-3.0.2</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.threads-3.0.2</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.threads-3.0.2</url>
     </scm>
 
     <build>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-commons-threads] 02/08: Add some more debug information.

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.commons.threads-3.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git

commit b56bac237a233c80fad29e9fbc3c714a4760472c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Dec 18 09:20:15 2009 +0000

    Add some more debug information.
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads@892191 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/sling/commons/threads/impl/DefaultThreadPool.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPool.java b/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPool.java
index bc954bf..2a97469 100644
--- a/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPool.java
+++ b/src/main/java/org/apache/sling/commons/threads/impl/DefaultThreadPool.java
@@ -158,9 +158,10 @@ public class DefaultThreadPool
         }
         if ( runnable != null ) {
             if ( this.logger.isDebugEnabled() ) {
-                this.logger.debug("Executing runnable: {}, pool={}, corePoolSize={}, maxPoolSize={}, queueSize={}",
+                this.logger.debug("Executing runnable: {}, pool={}, active={}, corePoolSize={}, maxPoolSize={}, queueSize={}",
                         new Object[] {runnable,
                                       this.name,
+                                      this.executor.getActiveCount(),
                                       this.executor.getCorePoolSize(),
                                       this.executor.getMaximumPoolSize(),
                                       this.executor.getQueue().size()});

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-commons-threads] 06/08: Update notice files

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.commons.threads-3.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git

commit 7ec685ede078986291eec522bf6b1d7b2261cb1d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Sep 1 08:36:52 2010 +0000

    Update notice files
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads@991466 13f79535-47bb-0310-9956-ffa450edef68
---
 NOTICE                             | 2 +-
 src/main/resources/META-INF/NOTICE | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/NOTICE b/NOTICE
index 6bd7482..2c19591 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Sling Threads
-Copyright 2008-2009 The Apache Software Foundation
+Copyright 2008-2010 The Apache Software Foundation
 
 Apache Sling is based on source code originally developed 
 by Day Software (http://www.day.com/).
diff --git a/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE
index 6bd7482..2c19591 100644
--- a/src/main/resources/META-INF/NOTICE
+++ b/src/main/resources/META-INF/NOTICE
@@ -1,5 +1,5 @@
 Apache Sling Threads
-Copyright 2008-2009 The Apache Software Foundation
+Copyright 2008-2010 The Apache Software Foundation
 
 Apache Sling is based on source code originally developed 
 by Day Software (http://www.day.com/).

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-commons-threads] 08/08: [maven-scm] copy for tag org.apache.sling.commons.threads-3.0.2

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.commons.threads-3.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git

commit c17f28cfc2ff7a6821ac30bccde22a09d79e571d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Sep 1 08:38:20 2010 +0000

    [maven-scm] copy for tag org.apache.sling.commons.threads-3.0.2
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.threads-3.0.2@991468 13f79535-47bb-0310-9956-ffa450edef68

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.