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

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

commit dad1f7059aec8c27fe037ec6b2841e8042042a8a
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Wed May 28 05:42:01 2014 +0000

    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
    
    git-svn-id: 
https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper@1597928
 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/sling/serviceusermapping/impl/MappingConfigAmendment.java  | 4 ++--
 .../apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java   | 4 ++--
 2 files changed, 4 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 2c2c962..44265fe 100644
--- 
a/src/main/java/org/apache/sling/serviceusermapping/impl/MappingConfigAmendment.java
+++ 
b/src/main/java/org/apache/sling/serviceusermapping/impl/MappingConfigAmendment.java
@@ -50,8 +50,8 @@ public class MappingConfigAmendment implements 
Comparable<MappingConfigAmendment
     @Property(
             label = "Service Mappings",
             description = "Provides mappings from service name to user names. "
-                + "Each entry is of the form 'serviceName [ \":\" 
subServiceName ] \"=\" userName' "
-                + "where serviceName and subServiceName identify the service 
and userName "
+                + "Each entry is of the form 'bundleId [ \":\" subServiceName 
] \"=\" userName' "
+                + "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.",
             unbounded = PropertyUnbounded.ARRAY)
     private static final String PROP_SERVICE2USER_MAPPING = "user.mapping";
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 f044e02..ecd29ef 100644
--- 
a/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
+++ 
b/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
@@ -55,8 +55,8 @@ public class ServiceUserMapperImpl implements 
ServiceUserMapper {
     @Property(
             label = "Service Mappings",
             description = "Provides mappings from service name to user names. "
-                + "Each entry is of the form 'serviceName [ \":\" 
subServiceName ] \"=\" userName' "
-                + "where serviceName and subServiceName identify the service 
and userName "
+                + "Each entry is of the form 'bundleId [ \":\" subServiceName 
] \"=\" userName' "
+                + "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.",
             unbounded = PropertyUnbounded.ARRAY)
     private static final String PROP_SERVICE2USER_MAPPING = "user.mapping";

-- 
To stop receiving notification emails like this one, please contact
"[email protected]" <[email protected]>.

Reply via email to