You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/12/19 14:33:28 UTC
[karaf] branch karaf-4.1.x updated: [KARAF-5511] Proper
Provide-Capability for org.apache.karaf.jaas.modules.EncryptionService
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.1.x by this push:
new 5432079 [KARAF-5511] Proper Provide-Capability for org.apache.karaf.jaas.modules.EncryptionService
5432079 is described below
commit 54320790292f66e5727f61e48081db95f7fdda75
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Dec 19 15:05:54 2017 +0100
[KARAF-5511] Proper Provide-Capability for org.apache.karaf.jaas.modules.EncryptionService
---
jaas/jasypt/pom.xml | 3 +++
jaas/modules/pom.xml | 3 +++
.../src/main/java/org/apache/karaf/jaas/modules/impl/Activator.java | 3 +--
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/jaas/jasypt/pom.xml b/jaas/jasypt/pom.xml
index 8510d06..3dc3631 100644
--- a/jaas/jasypt/pom.xml
+++ b/jaas/jasypt/pom.xml
@@ -155,6 +155,9 @@
<Bundle-Activator>
org.apache.karaf.jaas.jasypt.impl.Activator
</Bundle-Activator>
+ <Provide-Capability>
+ osgi.service;effective:=active;name=jasypt;objectClass="org.apache.karaf.jaas.modules.EncryptionService"
+ </Provide-Capability>
</instructions>
</configuration>
</plugin>
diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml
index aa66191..ff443f1 100644
--- a/jaas/modules/pom.xml
+++ b/jaas/modules/pom.xml
@@ -171,6 +171,9 @@
org.apache.http*,
org.apache.commons.codec*
</Private-Package>
+ <Provide-Capability>
+ osgi.service;effective:=active;name=basic;objectClass="org.apache.karaf.jaas.modules.EncryptionService"
+ </Provide-Capability>
</instructions>
</configuration>
</plugin>
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/Activator.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/Activator.java
index 8e37aea..f8af2d6 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/Activator.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/Activator.java
@@ -38,8 +38,7 @@ import org.osgi.service.cm.ManagedService;
@Managed("org.apache.karaf.jaas")
@Services(provides = {
@ProvideService(JaasRealm.class),
- @ProvideService(BackingEngineFactory.class),
- @ProvideService(EncryptionService.class)
+ @ProvideService(BackingEngineFactory.class)
})
public class Activator extends BaseActivator implements ManagedService {
--
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <co...@karaf.apache.org>'].