You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2018/12/03 08:25:36 UTC
[sling-org-apache-sling-jcr-oak-server] branch master updated
(776255b -> 7fb7ea3)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-oak-server.git.
from 776255b trivial: added license header to *.md files
new 1b46ef1 SLING-7607 Move ThreadPool (Executor) handling out of OakSlingRepositoryManager
new 7fb7ea3 SLING-8152 Update to Sling Parent 34
The 2 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.
Summary of changes:
bnd.bnd | 10 ----------
pom.xml | 2 +-
.../jcr/oak/server/internal/DefaultThreadPoolRegistrar.java | 2 +-
3 files changed, 2 insertions(+), 12 deletions(-)
[sling-org-apache-sling-jcr-oak-server] 02/02: SLING-8152 Update to
Sling Parent 34
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-oak-server.git
commit 7fb7ea344c679937db0616e892f26f1c59cef46a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Dec 3 09:07:39 2018 +0100
SLING-8152 Update to Sling Parent 34
---
bnd.bnd | 10 ----------
pom.xml | 2 +-
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index c5e2edb..b9aac30 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -1,13 +1,3 @@
-Bundle-Category: sling
-
-Bundle-Description: ${project.description}
-
-Bundle-DocURL: https://sling.apache.org
-
-Bundle-License: Apache License, Version 2.0
-
-Bundle-Vendor: The Apache Software Foundation
-
Import-Package:\
com.mongodb;resolution:=optional,\
org.apache.felix.jaas.boot,\
diff --git a/pom.xml b/pom.xml
index 54ab64b..b7cac44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>33</version>
+ <version>34</version>
<relativePath />
</parent>
[sling-org-apache-sling-jcr-oak-server] 01/02: SLING-7607 Move
ThreadPool (Executor) handling out of OakSlingRepositoryManager
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-oak-server.git
commit 1b46ef17bbfc584a3264b759c25d74937d197d47
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Dec 3 08:59:21 2018 +0100
SLING-7607 Move ThreadPool (Executor) handling out of OakSlingRepositoryManager
style
---
.../sling/jcr/oak/server/internal/DefaultThreadPoolRegistrar.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/jcr/oak/server/internal/DefaultThreadPoolRegistrar.java b/src/main/java/org/apache/sling/jcr/oak/server/internal/DefaultThreadPoolRegistrar.java
index 48b26e5..62b5237 100644
--- a/src/main/java/org/apache/sling/jcr/oak/server/internal/DefaultThreadPoolRegistrar.java
+++ b/src/main/java/org/apache/sling/jcr/oak/server/internal/DefaultThreadPoolRegistrar.java
@@ -49,7 +49,7 @@ public class DefaultThreadPoolRegistrar {
private void activate(final BundleContext bundleContext) {
threadPool = threadPoolManager.get(ThreadPoolManager.DEFAULT_THREADPOOL_NAME);
final Dictionary<String, String> properties = new Hashtable<>();
- properties.put("name", ThreadPoolManager.DEFAULT_THREADPOOL_NAME);
+ properties.put("name", threadPool.getName());
serviceRegistration = bundleContext.registerService(ThreadPool.class, threadPool, properties);
}