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 10:14:55 UTC
[sling-org-apache-sling-serviceusermapper] annotated tag
org.apache.sling.serviceusermapper-1.3.2 created (now af8ae01)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.serviceusermapper-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git.
at af8ae01 (tag)
tagging fd22c686a7d0a6ca7beca2cd63025e92d468bba2 (commit)
by Robert Munteanu
on Thu May 18 13:42:34 2017 +0000
- Log -----------------------------------------------------------------
org.apache.sling.serviceusermapper-1.3.2
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new e689b69 Working on a prototype to deprecate loginAdministrative
new c5e0963 change api: use ServiceFactory approach and service bundle is actually the using bundle
new 7d98561 Switch back to using a regular ServiceUserName service tacking the service bundle as an argument.
new 1b03026 Implement support for service based ResourceResolver and Session access
new 3ecf9df Implement support for service based ResourceResolver and Session access
new f39b2fc SLING-2944 Implement Service User Mapper
new 0a5259b SLING-2944 : Replace administrative login by service-based login
new e9b4e3e Update to parent pom 18
new 145bf95 SLING-3286 - Remove plugin version overrides from poms
new e1a1537 Add svn info
new ce124d6 [maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.0.0
new b1c7389 [maven-release-plugin] prepare for next development iteration
new e40493e Update to parent pom v19
new 90f2a66 SLING-3578 : Support mapping amendments
new fe71e7f [maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.0.2
new 0394164 [maven-release-plugin] prepare for next development iteration
new dad1f70 SLING-3465 : Wrong description for "user.mapping" property of ServiceUserMapperImpl. Apply patch from Tobias Bocanegra and also fix the copied info in the new MappingConfigAmendment
new a8f6248 SLING-3757 : cannot add more than 1 service user with the OSGI console
new 3c2449b [maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.0.4
new d6a1293 [maven-release-plugin] prepare for next development iteration
new fdec4ca Updated to parent version 20
new a151b5a Update to Sling Parent POM 22 with baselining enabled
new 3d65ad7 SLING-3854 - Add configuration option to restrict service user mapper to system users
new eb2a1ce SLING-4312: Register an osgi service for each available service user
new 84260c0 SLING-4312: revert revision 1661081 due to a compile error on java 1.6
new 79cfa85 [maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.1.0
new 23de558 [maven-release-plugin] prepare for next development iteration
new d3e3149 SLING-4312: Register an osgi service for each available service user (+ change tests to mockito)
new 6bc2582 SLING-4312: changed name from ServiceUserMapping to ServiceUserMapped and removed all metohds
new dd3c265 SLING-4495 : Improve ServiceUserMapperImpl#isValidUser
new ff10f6a SLING-4312 : update javadocs
new 8f7e8ab [maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.2.0
new ddeb68b [maven-release-plugin] prepare for next development iteration
new 8f8ddd7 Add missing licence header
new 87a8eef SLING-4742 Service User Mapper: Web Console Name Hints for Mapping Configurations
new d10ff51 Update to Sling Parent 23
new 470edb7 set parent version to 24 and add empty relativePath where missing
new 9780c5b SLING-4930 - InventoryPrinter for service user mappings
new d45db0b SLING-4930 - keep only the 'mappings by user' section, I think the raw mappings are redundant
new 1029fe5 SLING-4930 : InventoryPrinter for Service User Mappings
new 6934258 SLING-4930 : InventoryPrinter for Service User Mappings
new ccf117e SLING-4895: Service registry should not be called from within synchronized block
new b1a6848 SLING-5019 : ServiceUserMappedBundleFilter should be immediate
new bebc3e4 SLING-5006 restart ServiceUserMapped services in case a ServiceUserValidator has been changed.
new c904ef4 Update the main reactor to parent 25
new ff12b1f SLING-5006: do service registrations asyncronously and outside syncronized area
new c98618d SLING-5006: set executorService to null on deactivate
new 07e1e1b [maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.2.2
new ae5f528 [maven-release-plugin] prepare for next development iteration
new 54e156d [maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.2.4
new cb28970 [maven-release-plugin] prepare for next development iteration
new aed1e64 Switch back to 1.2.3-SNAPSHOT
new 5d8bd40 Switch to parent pom 26
new 8013242 SLING-5484 - more logging for ServiceUserMapperImpl.getServiceUserID and related methods
new 87c737f SLING-5484 - add debug log for default user
new f2dda72 SLING-5484 - typo
new c32106c SLING-5484 - log the active mappings update as well
new ece541c SLING-5484 - tweak debug logs
new 8a5761a SLING-6397 : Error logged by ServiceUserMapperImpl while unregistering an already unregistered service
new c3f5d9d [maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.2.4
new ce974aa [maven-release-plugin] prepare for next development iteration
new dfbde94 SLING-6555 : Migrate to R6 annotations, clean up dependencies
new 847de08 SLING-6555 : Migrate to R6 annotations, clean up dependencies
new ece807e use Sling Parent 30
new f217eff add missing Felix SCR annotations
new 0baa5ba Remove unused SCR plugin, fix javadoc
new 743c855 [maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.2.6
new 5248f77 [maven-release-plugin] prepare for next development iteration
new 13fa883 SLING-6772 : Provide default mapping for service users
new 8667bd8 [maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.3.0
new 23bbae1 [maven-release-plugin] prepare for next development iteration
new 82c9445 SLING-6772 : Provide default mapping for service users
new cb3e0b7 [maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.3.0
new 465e219 [maven-release-plugin] prepare for next development iteration
new 3d7293d SLING-6864 Service User Mapping: webconsole.configurationFactory.nameHint Property has to be part of OCD
new b02023f [maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.3.2
new fd22c68 [maven-release-plugin] copy for tag org.apache.sling.serviceusermapper-1.3.2
The 77 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-serviceusermapper] 07/07:
[maven-release-plugin] copy for tag
org.apache.sling.serviceusermapper-1.3.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.serviceusermapper-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git
commit fd22c686a7d0a6ca7beca2cd63025e92d468bba2
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 18 13:42:34 2017 +0000
[maven-release-plugin] copy for tag org.apache.sling.serviceusermapper-1.3.2
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.serviceusermapper-1.3.2@1795529 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-serviceusermapper] 03/07:
[maven-release-plugin] prepare release
org.apache.sling.serviceusermapper-1.3.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.serviceusermapper-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git
commit cb3e0b787473c5452abfd9478bdeb0f5ee89a720
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Apr 28 13:30:30 2017 +0000
[maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.3.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper@1793084 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index eb542dd..a52b6bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.serviceusermapper</artifactId>
<packaging>bundle</packaging>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.0</version>
<name>Apache Sling Service User Mapper</name>
<description>
@@ -40,9 +40,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.serviceusermapper-1.3.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.serviceusermapper-1.3.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.serviceusermapper-1.3.0</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-serviceusermapper] 02/07: SLING-6772 :
Provide default mapping for service users
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.serviceusermapper-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git
commit 82c9445bd0b5487c44d2a2145a70402a4d164082
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Apr 10 05:15:14 2017 +0000
SLING-6772 : Provide default mapping for service users
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper@1790773 13f79535-47bb-0310-9956-ffa450edef68
---
.../serviceusermapping/impl/ServiceUserMapperImpl.java | 6 +++---
.../impl/ServiceUserMapperImplTest.java | 18 +++++++++---------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java b/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
index 46f266e..a7b8c48 100644
--- a/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
+++ b/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
@@ -79,7 +79,7 @@ public class ServiceUserMapperImpl implements ServiceUserMapper {
description = "If enabled and no mapping for a requested service user exists and no " +
" default user is defined, a " +
"default mapping is applied which uses the service user \"serviceuser@\" + {bundleId} + [\":\" + subServiceName]")
- boolean user_default_mapping() default true;
+ boolean user_enable_default_mapping() default true;
}
/** default log */
@@ -132,7 +132,7 @@ public class ServiceUserMapperImpl implements ServiceUserMapper {
this.globalServiceUserMappings = new Mapping[0];
}
this.defaultUser = config.user_default();
- this.useDefaultMapping = config.user_default_mapping();
+ this.useDefaultMapping = config.user_enable_default_mapping();
RegistrationSet registrationSet = null;
this.bundleContext = bundleContext;
@@ -379,7 +379,7 @@ public class ServiceUserMapperImpl implements ServiceUserMapper {
// use default mapping if configured and no default user
if ( this.defaultUser == null || this.defaultUser.isEmpty() ) {
- final String userName = "serviceuser@" + serviceName + (subServiceName == null ? "" : ":" + subServiceName);
+ final String userName = "serviceuser--" + serviceName + (subServiceName == null ? "" : "--" + subServiceName);
log.debug("internalGetUserId: no mapping found, using default mapping [{}]", userName);
return userName;
diff --git a/src/test/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImplTest.java b/src/test/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImplTest.java
index 97917a4..8d0b719 100644
--- a/src/test/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImplTest.java
+++ b/src/test/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImplTest.java
@@ -83,7 +83,7 @@ public class ServiceUserMapperImplTest {
BUNDLE_SYMBOLIC2 + ":" + SUB + "=" + ANOTHER_SUB //
});
when(config.user_default()).thenReturn(NONE);
- when(config.user_default_mapping()).thenReturn(false);
+ when(config.user_enable_default_mapping()).thenReturn(false);
final ServiceUserMapperImpl sum = new ServiceUserMapperImpl();
sum.configure(null, config);
@@ -108,7 +108,7 @@ public class ServiceUserMapperImplTest {
BUNDLE_SYMBOLIC2 + ":" + SUB + "=" + ANOTHER_SUB //
});
when(config.user_default()).thenReturn(NONE);
- when(config.user_default_mapping()).thenReturn(true);
+ when(config.user_enable_default_mapping()).thenReturn(true);
final ServiceUserMapperImpl sum = new ServiceUserMapperImpl();
sum.configure(null, config);
@@ -133,7 +133,7 @@ public class ServiceUserMapperImplTest {
BUNDLE_SYMBOLIC2 + ":" + SUB + "=" + ANOTHER_SUB //
});
when(config.user_default()).thenReturn(null);
- when(config.user_default_mapping()).thenReturn(true);
+ when(config.user_enable_default_mapping()).thenReturn(true);
final ServiceUserMapperImpl sum = new ServiceUserMapperImpl();
sum.configure(null, config);
@@ -144,8 +144,8 @@ public class ServiceUserMapperImplTest {
TestCase.assertEquals(ANOTHER, sum.getServiceUserID(BUNDLE2, ""));
TestCase.assertEquals(SAMPLE_SUB, sum.getServiceUserID(BUNDLE1, SUB));
TestCase.assertEquals(ANOTHER_SUB, sum.getServiceUserID(BUNDLE2, SUB));
- TestCase.assertEquals("serviceuser@" + BUNDLE_SYMBOLIC3, sum.getServiceUserID(BUNDLE3, null));
- TestCase.assertEquals("serviceuser@" + BUNDLE_SYMBOLIC3 + ":" + SUB, sum.getServiceUserID(BUNDLE3, SUB));
+ TestCase.assertEquals("serviceuser--" + BUNDLE_SYMBOLIC3, sum.getServiceUserID(BUNDLE3, null));
+ TestCase.assertEquals("serviceuser--" + BUNDLE_SYMBOLIC3 + "--" + SUB, sum.getServiceUserID(BUNDLE3, SUB));
}
@Test
@@ -158,7 +158,7 @@ public class ServiceUserMapperImplTest {
BUNDLE_SYMBOLIC2 + ":" + SUB + "=" + ANOTHER_SUB //
});
when(config.user_default()).thenReturn(NONE);
- when(config.user_default_mapping()).thenReturn(false);
+ when(config.user_enable_default_mapping()).thenReturn(false);
final ServiceUserMapperImpl sum = new ServiceUserMapperImpl();
sum.configure(null, config);
@@ -191,7 +191,7 @@ public class ServiceUserMapperImplTest {
BUNDLE_SYMBOLIC1 + ":" + SUB + "=" + SAMPLE_SUB, //
});
when(config.user_default()).thenReturn(NONE);
- when(config.user_default_mapping()).thenReturn(false);
+ when(config.user_enable_default_mapping()).thenReturn(false);
final ServiceUserMapperImpl sum = new ServiceUserMapperImpl();
sum.configure(null, config);
@@ -233,7 +233,7 @@ public class ServiceUserMapperImplTest {
ServiceUserMapperImpl.Config config = mock(ServiceUserMapperImpl.Config.class);
when(config.user_mapping()).thenReturn(new String[] {});
when(config.user_default()).thenReturn(NONE);
- when(config.user_default_mapping()).thenReturn(false);
+ when(config.user_enable_default_mapping()).thenReturn(false);
final ServiceUserMapperImpl sum = new ServiceUserMapperImpl();
sum.configure(null, config);
@@ -276,7 +276,7 @@ public class ServiceUserMapperImplTest {
BUNDLE_SYMBOLIC1 + ":" + SUB + "=" + SAMPLE_SUB, //
});
when(config.user_default()).thenReturn(NONE);
- when(config.user_default_mapping()).thenReturn(false);
+ when(config.user_enable_default_mapping()).thenReturn(false);
final ServiceUserMapperImpl sum = new ServiceUserMapperImpl();
sum.registerAsync = false;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-serviceusermapper] 01/07:
[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.serviceusermapper-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git
commit 23bbae17d1cef9c52ecbbfe81c0e2fd16c6a9818
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Apr 6 07:39:36 2017 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper@1790355 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index a52b6bb..eb542dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.serviceusermapper</artifactId>
<packaging>bundle</packaging>
- <version>1.3.0</version>
+ <version>1.3.1-SNAPSHOT</version>
<name>Apache Sling Service User Mapper</name>
<description>
@@ -40,9 +40,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.serviceusermapper-1.3.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.serviceusermapper-1.3.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.serviceusermapper-1.3.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper</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-serviceusermapper] 04/07:
[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.serviceusermapper-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git
commit 465e219e04e2fb54aa7f5be9dcebdaba94fa4cae
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Apr 28 13:30:48 2017 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper@1793086 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index a52b6bb..eb542dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.serviceusermapper</artifactId>
<packaging>bundle</packaging>
- <version>1.3.0</version>
+ <version>1.3.1-SNAPSHOT</version>
<name>Apache Sling Service User Mapper</name>
<description>
@@ -40,9 +40,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.serviceusermapper-1.3.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.serviceusermapper-1.3.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.serviceusermapper-1.3.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper</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-serviceusermapper] 06/07:
[maven-release-plugin] prepare release
org.apache.sling.serviceusermapper-1.3.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.serviceusermapper-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git
commit b02023fa37d092fbe1c2d922bf4f01339b1cd13d
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 18 13:42:21 2017 +0000
[maven-release-plugin] prepare release org.apache.sling.serviceusermapper-1.3.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper@1795528 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index eb542dd..bfaec2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.serviceusermapper</artifactId>
<packaging>bundle</packaging>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2</version>
<name>Apache Sling Service User Mapper</name>
<description>
@@ -40,9 +40,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.serviceusermapper-1.3.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.serviceusermapper-1.3.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.serviceusermapper-1.3.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-serviceusermapper] 05/07: SLING-6864
Service User Mapping: webconsole.configurationFactory.nameHint Property has
to be part of OCD
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.serviceusermapper-1.3.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-serviceusermapper.git
commit 3d7293d902a4c3d7a7640a8bbf85b2c0588d39a1
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu May 18 12:28:17 2017 +0000
SLING-6864 Service User Mapping: webconsole.configurationFactory.nameHint Property has to be part of OCD
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper@1795509 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/serviceusermapping/impl/MappingConfigAmendment.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/serviceusermapping/impl/MappingConfigAmendment.java b/src/main/java/org/apache/sling/serviceusermapping/impl/MappingConfigAmendment.java
index ff631cf..c0fe863 100644
--- a/src/main/java/org/apache/sling/serviceusermapping/impl/MappingConfigAmendment.java
+++ b/src/main/java/org/apache/sling/serviceusermapping/impl/MappingConfigAmendment.java
@@ -33,10 +33,7 @@ import org.slf4j.LoggerFactory;
@Designate(factory=true, ocd=MappingConfigAmendment.Config.class)
@Component(name = "org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended",
configurationPolicy=ConfigurationPolicy.REQUIRE,
- service={MappingConfigAmendment.class},
- property= {
- "webconsole.configurationFactory.nameHint=Mapping: {user.mapping}",
- })
+ service={MappingConfigAmendment.class})
public class MappingConfigAmendment implements Comparable<MappingConfigAmendment> {
@ObjectClassDefinition(name ="Apache Sling Service User Mapper Service Amendment",
@@ -54,6 +51,10 @@ public class MappingConfigAmendment implements Comparable<MappingConfigAmendment
+ "where bundleId and subServiceName identify the service and userName "
+ "defines the name of the user to provide to the service. Invalid entries are logged and ignored.")
String[] user_mapping() default {};
+
+ // Internal Name hint for web console.
+ String webconsole_configurationFactory_nameHint() default "Mapping: {user.mapping}";
+
}
/** default logger */
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.