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:39 UTC
[sling-org-apache-sling-commons-threads] annotated tag
org.apache.sling.commons.threads-3.1.0 created (now b040ffc)
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git.
at b040ffc (tag)
tagging 378b10ab0cc64d1ed556349ee5248995463b2d4e (commit)
by Carsten Ziegeler
on Tue Oct 12 09:36:45 2010 +0000
- Log -----------------------------------------------------------------
org.apache.sling.commons.threads-3.1.0
-----------------------------------------------------------------------
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 77bf590 [maven-release-plugin] prepare for next development iteration
new 33781d0 SLING-1819 : Unused custom thread pool is never removed
new 540bc62 SLING-1820 : Display current pool statistics in web console
new b92d2c5 SLING-1821 : Custom thread pools should get an optional label
new 6d5d355 Add a web console label
new 9499566 SLING-1833 : Remove direct dependency to web console by using new configuration printer support
new 358040b Prepare for release.
new b6b8506 [maven-release-plugin] prepare release org.apache.sling.commons.threads-3.1.0
new 378b10a [maven-scm] copy for tag org.apache.sling.commons.threads-3.1.0
The 73 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] 01/09:
[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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git
commit 77bf590c6b5f8e59b47fda5827e20eca6e6bb8fa
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Sep 1 08:38:38 2010 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads@991469 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index e827590..c488de8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.commons.threads</artifactId>
<packaging>bundle</packaging>
- <version>3.0.2</version>
+ <version>3.0.3-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.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>
+ <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/09: SLING-1820 :
Display current pool statistics in web console
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git
commit 540bc621fd98af244d38dbcf10a67169ff24308e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 6 14:07:45 2010 +0000
SLING-1820 : Display current pool statistics in web console
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads@1005046 13f79535-47bb-0310-9956-ffa450edef68
---
.../commons/threads/impl/DefaultThreadPool.java | 4 +++
.../threads/impl/DefaultThreadPoolManager.java | 8 +++++
.../commons/threads/impl/ThreadPoolFacade.java | 6 ++++
.../commons/threads/impl/WebConsolePrinter.java | 38 +++++++++++++++++-----
4 files changed, 47 insertions(+), 9 deletions(-)
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 2a97469..dee1524 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
@@ -199,4 +199,8 @@ public class DefaultThreadPool
}
this.logger.info("Thread pool [{}] is shut down.", this.name);
}
+
+ public ThreadPoolExecutor getExecutor() {
+ return this.executor;
+ }
}
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 b99c653..0d70f61 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
@@ -20,6 +20,7 @@ import java.util.Dictionary;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import java.util.concurrent.ThreadPoolExecutor;
import org.apache.sling.commons.threads.ModifiableThreadPoolConfig;
import org.apache.sling.commons.threads.ThreadPool;
@@ -326,5 +327,12 @@ public class DefaultThreadPoolManager
public ThreadPoolConfig getConfig() {
return this.config;
}
+
+ public ThreadPoolExecutor getExecutor() {
+ if ( this.pool != null ) {
+ return this.pool.getExecutor();
+ }
+ return null;
+ }
}
}
diff --git a/src/main/java/org/apache/sling/commons/threads/impl/ThreadPoolFacade.java b/src/main/java/org/apache/sling/commons/threads/impl/ThreadPoolFacade.java
index 145c9c8..0135e3c 100644
--- a/src/main/java/org/apache/sling/commons/threads/impl/ThreadPoolFacade.java
+++ b/src/main/java/org/apache/sling/commons/threads/impl/ThreadPoolFacade.java
@@ -16,6 +16,8 @@
*/
package org.apache.sling.commons.threads.impl;
+import java.util.concurrent.ThreadPoolExecutor;
+
import org.apache.sling.commons.threads.ThreadPool;
import org.apache.sling.commons.threads.ThreadPoolConfig;
@@ -81,4 +83,8 @@ public final class ThreadPoolFacade implements ThreadPool {
this.delegatee = pool;
oldPool.shutdown();
}
+
+ public ThreadPoolExecutor getExecutor() {
+ return this.delegatee.getExecutor();
+ }
}
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
index b0aedf0..9adc5e5 100644
--- a/src/main/java/org/apache/sling/commons/threads/impl/WebConsolePrinter.java
+++ b/src/main/java/org/apache/sling/commons/threads/impl/WebConsolePrinter.java
@@ -21,8 +21,10 @@ package org.apache.sling.commons.threads.impl;
import java.io.PrintWriter;
import java.util.Dictionary;
import java.util.Hashtable;
+import java.util.concurrent.ThreadPoolExecutor;
import org.apache.felix.webconsole.ConfigurationPrinter;
+import org.apache.sling.commons.threads.ThreadPoolConfig;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
@@ -80,6 +82,7 @@ public class WebConsolePrinter implements ConfigurationPrinter {
final DefaultThreadPoolManager.Entry[] configs = this.mgr.getConfigurations();
if ( configs.length > 0 ) {
for(final DefaultThreadPoolManager.Entry entry : configs ) {
+ final ThreadPoolConfig config = entry.getConfig();
pw.print("Pool ");
pw.println(entry.getName());
if ( entry.getPid() != null ) {
@@ -89,23 +92,40 @@ public class WebConsolePrinter implements ConfigurationPrinter {
pw.print("- used : ");
pw.println(entry.isUsed());
pw.print("- min pool size : ");
- pw.println(entry.getConfig().getMinPoolSize());
+ pw.println(config.getMinPoolSize());
pw.print("- max pool size : ");
- pw.println(entry.getConfig().getMaxPoolSize());
+ pw.println(config.getMaxPoolSize());
pw.print("- queue size : ");
- pw.println(entry.getConfig().getQueueSize());
+ pw.println(config.getQueueSize());
pw.print("- keep alive time : ");
- pw.println(entry.getConfig().getKeepAliveTime());
+ pw.println(config.getKeepAliveTime());
pw.print("- block policy : ");
- pw.println(entry.getConfig().getBlockPolicy());
+ pw.println(config.getBlockPolicy());
pw.print("- priority : ");
- pw.println(entry.getConfig().getPriority());
+ pw.println(config.getPriority());
pw.print("- shutdown graceful : ");
- pw.println(entry.getConfig().isShutdownGraceful());
+ pw.println(config.isShutdownGraceful());
pw.print("- shutdown wait time : ");
- pw.println(entry.getConfig().getShutdownWaitTimeMs());
+ pw.println(config.getShutdownWaitTimeMs());
pw.print("- daemon : ");
- pw.println(entry.getConfig().isDaemon());
+ pw.println(config.isDaemon());
+ final ThreadPoolExecutor tpe = entry.getExecutor();
+ if ( tpe != null ) {
+ pw.print("- active count : ");
+ pw.println(tpe.getActiveCount());
+ pw.print("- completed task count : ");
+ pw.println(tpe.getCompletedTaskCount());
+ pw.print("- core pool size : ");
+ pw.println(tpe.getCorePoolSize());
+ pw.print("- largest pool size : ");
+ pw.println(tpe.getLargestPoolSize());
+ pw.print("- maximum pool size : ");
+ pw.println(tpe.getMaximumPoolSize());
+ pw.print("- pool size : ");
+ pw.println(tpe.getPoolSize());
+ pw.print("- task count : ");
+ pw.println(tpe.getTaskCount());
+ }
pw.println();
}
} else {
--
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/09: SLING-1819 : Unused
custom thread pool is never removed
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git
commit 33781d016354b5d21798540e775a1644c2626ced
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 6 13:18:57 2010 +0000
SLING-1819 : Unused custom thread pool is never removed
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads@1005021 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/commons/threads/impl/DefaultThreadPoolManager.java | 5 ++++-
1 file changed, 4 insertions(+), 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 318e2cc..b99c653 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
@@ -24,9 +24,9 @@ import java.util.UUID;
import org.apache.sling.commons.threads.ModifiableThreadPoolConfig;
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.commons.threads.ThreadPoolConfig.ThreadPoolPolicy;
import org.apache.sling.commons.threads.ThreadPoolConfig.ThreadPriority;
+import org.apache.sling.commons.threads.ThreadPoolManager;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.service.cm.ConfigurationException;
@@ -140,6 +140,9 @@ public class DefaultThreadPoolManager
final Entry entry = this.pools.get(pool.getName());
if ( entry != null ) {
entry.decUsage();
+ if ( !entry.isUsed() ) {
+ this.pools.remove(pool.getName());
+ }
}
}
}
--
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/09: SLING-1821 : Custom
thread pools should get an optional label
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git
commit b92d2c593341ac0fbb2dd54ea10e63c0ab7066a9
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 6 14:16:16 2010 +0000
SLING-1821 : Custom thread pools should get an optional label
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads@1005048 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
.../org/apache/sling/commons/threads/ThreadPoolManager.java | 12 ++++++++++++
.../sling/commons/threads/impl/DefaultThreadPoolManager.java | 7 ++++++-
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index c488de8..7a25b7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
org.apache.sling.commons.threads.impl.Activator
</Bundle-Activator>
<Export-Package>
- org.apache.sling.commons.threads;version=3.0.0
+ org.apache.sling.commons.threads;version=3.1.0
</Export-Package>
<Private-Package>
org.apache.sling.commons.threads.impl
diff --git a/src/main/java/org/apache/sling/commons/threads/ThreadPoolManager.java b/src/main/java/org/apache/sling/commons/threads/ThreadPoolManager.java
index e94a116..871729e 100644
--- a/src/main/java/org/apache/sling/commons/threads/ThreadPoolManager.java
+++ b/src/main/java/org/apache/sling/commons/threads/ThreadPoolManager.java
@@ -47,6 +47,18 @@ public interface ThreadPoolManager {
ThreadPool create(ThreadPoolConfig config);
/**
+ * Create a new thread pool with this configuration.
+ * A thread pool must be released when not used anymore with the
+ * {@link #release(ThreadPool)} method.
+ * @param config The thread pool configuration.
+ * @param label An optional label for the thread pool. The label
+ * will be appended to the name of the pool.
+ * @return A new thread pool.
+ * @since 3.1
+ */
+ ThreadPool create(ThreadPoolConfig config, String label);
+
+ /**
* Release the thread pool again.
*/
void release(ThreadPool pool);
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 0d70f61..e2cd301 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
@@ -154,10 +154,15 @@ public class DefaultThreadPoolManager
* @see org.apache.sling.commons.threads.ThreadPoolManager#create(org.apache.sling.commons.threads.ThreadPoolConfig)
*/
public ThreadPool create(ThreadPoolConfig config) {
+ return this.create(config, null);
+ }
+
+ public ThreadPool create(ThreadPoolConfig config, String label) {
if ( config == null ) {
throw new IllegalArgumentException("Config must not be null.");
}
- final String name = "ThreadPool-" + UUID.randomUUID().toString();
+ final String name = "ThreadPool-" + UUID.randomUUID().toString() +
+ (label == null ? "" : " (" + label + ")");
final Entry entry = new Entry(null, config, name);
synchronized ( this.pools ) {
this.pools.put(name, entry);
--
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/09: Add a web console
label
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git
commit 6d5d355049f740fcd6563ff5fdc7a59dde264a16
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 6 15:14:59 2010 +0000
Add a web console label
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads@1005078 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/commons/threads/impl/WebConsolePrinter.java | 1 +
1 file changed, 1 insertion(+)
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
index 9adc5e5..1e1d92e 100644
--- a/src/main/java/org/apache/sling/commons/threads/impl/WebConsolePrinter.java
+++ b/src/main/java/org/apache/sling/commons/threads/impl/WebConsolePrinter.java
@@ -45,6 +45,7 @@ public class WebConsolePrinter implements ConfigurationPrinter {
props.put(Constants.SERVICE_DESCRIPTION,
"Apache Sling Thread Pool Configuration Printer");
props.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation");
+ props.put("felix.webconsole.label", "slingthreadpools");
plugin = bundleContext.registerService(ConfigurationPrinter.class.getName(),
propertiesPrinter, props);
--
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/09: SLING-1833 : Remove
direct dependency to web console by using new configuration printer support
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git
commit 949956697f6f8168c09ccca59b7fc2ca15164d4e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Oct 11 15:31:21 2010 +0000
SLING-1833 : Remove direct dependency to web console by using new configuration printer support
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads@1021386 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 9 ---------
.../org/apache/sling/commons/threads/impl/Activator.java | 13 +++----------
.../commons/threads/impl/DefaultThreadPoolManager.java | 2 +-
.../sling/commons/threads/impl/WebConsolePrinter.java | 14 ++++----------
4 files changed, 8 insertions(+), 30 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7a25b7a..799d394 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,9 +63,6 @@
<Private-Package>
org.apache.sling.commons.threads.impl
</Private-Package>
- <Import-Package>
- org.apache.felix.webconsole;resolution:=optional, *
- </Import-Package>
</instructions>
</configuration>
</plugin>
@@ -97,11 +94,5 @@
<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 1e76887..5bb85fe 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,22 +54,15 @@ 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
- }
+
+ WebConsolePrinter.initPlugin(this.bundleContext, this.service);
}
/**
* @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
- }
+ WebConsolePrinter.destroyPlugin();
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 e2cd301..3344313 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
@@ -189,7 +189,7 @@ public class DefaultThreadPoolManager
/**
* @see org.osgi.service.cm.ManagedServiceFactory#updated(java.lang.String, java.util.Dictionary)
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public void updated(String pid, Dictionary properties)
throws ConfigurationException {
final String name = (String) properties.get(ModifiableThreadPoolConfig.PROPERTY_NAME);
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
index 1e1d92e..c2f8eaa 100644
--- a/src/main/java/org/apache/sling/commons/threads/impl/WebConsolePrinter.java
+++ b/src/main/java/org/apache/sling/commons/threads/impl/WebConsolePrinter.java
@@ -23,7 +23,6 @@ import java.util.Dictionary;
import java.util.Hashtable;
import java.util.concurrent.ThreadPoolExecutor;
-import org.apache.felix.webconsole.ConfigurationPrinter;
import org.apache.sling.commons.threads.ThreadPoolConfig;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -34,7 +33,7 @@ import org.osgi.framework.ServiceRegistration;
* prints out the thread pools.
*
*/
-public class WebConsolePrinter implements ConfigurationPrinter {
+public class WebConsolePrinter {
private static ServiceRegistration plugin;
@@ -46,8 +45,10 @@ public class WebConsolePrinter implements ConfigurationPrinter {
"Apache Sling Thread Pool Configuration Printer");
props.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation");
props.put("felix.webconsole.label", "slingthreadpools");
+ props.put("felix.webconsole.title", "Sling Thread Pools");
+ props.put("felix.webconsole.configprinter.modes", "always");
- plugin = bundleContext.registerService(ConfigurationPrinter.class.getName(),
+ plugin = bundleContext.registerService(WebConsolePrinter.class.getName(),
propertiesPrinter, props);
}
@@ -67,13 +68,6 @@ public class WebConsolePrinter implements ConfigurationPrinter {
}
/**
- * @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)
*/
--
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/09: Prepare for release.
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git
commit 358040b5fbc6fd5dca04b3ae9f8d5f1c42272571
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Oct 12 08:47:29 2010 +0000
Prepare for release.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads@1021679 13f79535-47bb-0310-9956-ffa450edef68
---
LICENSE | 202 ------------------------------------
NOTICE | 8 --
src/main/resources/META-INF/LICENSE | 202 ------------------------------------
src/main/resources/META-INF/NOTICE | 8 --
4 files changed, 420 deletions(-)
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index 2c19591..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Sling Threads
-Copyright 2008-2010 The Apache Software Foundation
-
-Apache Sling is based on source code originally developed
-by Day Software (http://www.day.com/).
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/src/main/resources/META-INF/LICENSE b/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
diff --git a/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 2c19591..0000000
--- a/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Sling Threads
-Copyright 2008-2010 The Apache Software Foundation
-
-Apache Sling is based on source code originally developed
-by Day Software (http://www.day.com/).
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-threads] 09/09: [maven-scm] copy
for tag org.apache.sling.commons.threads-3.1.0
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git
commit 378b10ab0cc64d1ed556349ee5248995463b2d4e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Oct 12 09:36:45 2010 +0000
[maven-scm] copy for tag org.apache.sling.commons.threads-3.1.0
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.threads-3.1.0@1021709 13f79535-47bb-0310-9956-ffa450edef68
--
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/09:
[maven-release-plugin] prepare release
org.apache.sling.commons.threads-3.1.0
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-threads.git
commit b6b8506bea43a22b4fa7b0815a9a6a691e015c19
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Oct 12 09:36:23 2010 +0000
[maven-release-plugin] prepare release org.apache.sling.commons.threads-3.1.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads@1021708 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 799d394..92e7cd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.commons.threads</artifactId>
<packaging>bundle</packaging>
- <version>3.0.3-SNAPSHOT</version>
+ <version>3.1.0</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.1.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.threads-3.1.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.threads-3.1.0</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.