Use property() instead of getFullName()

git-svn-id: https://svn.argeo.org/commons/trunk@8409 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java
index 7ead081510e7ba3088f7b03786edc998154b5e24..d19324f2518766ac49523da3dc50f70300ccdbd5 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeUserAdmin.java
@@ -122,7 +122,7 @@ public class NodeUserAdmin implements UserAdmin {
 
                Dictionary<String, ?> nodeRolesProperties = UserAdminProps
                                .uriAsProperties(nodeRolesUri);
-               if (!nodeRolesProperties.get(UserAdminProps.baseDn.getFullName())
+               if (!nodeRolesProperties.get(UserAdminProps.baseDn.property())
                                .equals(baseNodeRoleDn)) {
                        throw new CmsException("Invalid base dn for node roles");
                        // TODO deal with "mounted" roles with a different baseDN

diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifUserAdmin.java b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifUserAdmin.java
index 830488589c2331311d1f7148e0dc31b6b4993046..fa4526ac6a6084b20464964831bf8b8bdefaeee6 100644 (file)
--- a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifUserAdmin.java
+++ b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifUserAdmin.java
@@ -48,8 +48,8 @@ public class LdifUserAdmin extends AbstractUserDirectory {
 
        private static Dictionary<String, Object> fromUri(String uri, String baseDn) {
                Hashtable<String, Object> res = new Hashtable<String, Object>();
-               res.put(UserAdminProps.uri.getFullName(), uri);
-               res.put(UserAdminProps.baseDn.getFullName(), baseDn);
+               res.put(UserAdminProps.uri.property(), uri);
+               res.put(UserAdminProps.baseDn.property(), baseDn);
                return res;
        }
 

diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/UserAdminProps.java b/org.argeo.security.core/src/org/argeo/osgi/useradmin/UserAdminProps.java
index 580110d7287afc557a9599e01dfd5b8af11947bf..0fe556ce082a4a4a1bca03f860cb75e06ffaea22 100644 (file)
--- a/org.argeo.security.core/src/org/argeo/osgi/useradmin/UserAdminProps.java
+++ b/org.argeo.security.core/src/org/argeo/osgi/useradmin/UserAdminProps.java
@@ -49,7 +49,7 @@ public enum UserAdminProps {
                return def;
        }
 
-       public String getFullName() {
+       public String property() {
                return getPrefix() + name();
        }
 
@@ -66,7 +66,7 @@ public enum UserAdminProps {
 
        @SuppressWarnings("unchecked")
        public <T> T getRawValue(Dictionary<String, ?> properties) {
-               Object res = properties.get(getFullName());
+               Object res = properties.get(property());
                if (res == null)
                        res = getDefault();
                return (T) res;
@@ -80,8 +80,8 @@ public enum UserAdminProps {
                for (Enumeration<String> keys = properties.keys(); keys
                                .hasMoreElements();) {
                        String key = keys.nextElement();
-                       if (key.startsWith(PREFIX) && !key.equals(baseDn.getFullName())
-                                       && !key.equals(uri.getFullName())) {
+                       if (key.startsWith(PREFIX) && !key.equals(baseDn.property())
+                                       && !key.equals(uri.property())) {
                                if (first)
                                        first = false;
                                else
@@ -91,7 +91,7 @@ public enum UserAdminProps {
                        }
                }
 
-               String bDn = (String) properties.get(baseDn.getFullName());
+               String bDn = (String) properties.get(baseDn.property());
                try {
                        return new URI(null, null, bDn != null ? '/' + bDn : null,
                                        query.length() != 0 ? query.toString() : null, null);
@@ -129,13 +129,13 @@ public enum UserAdminProps {
                                UserAdminProps ldapProp = UserAdminProps.valueOf(key);
                                List<String> values = query.get(key);
                                if (values.size() == 1) {
-                                       res.put(ldapProp.getFullName(), values.get(0));
+                                       res.put(ldapProp.property(), values.get(0));
                                } else {
                                        throw new UserDirectoryException(
                                                        "Only single values are supported");
                                }
                        }
-                       res.put(baseDn.getFullName(), bDn);
+                       res.put(baseDn.property(), bDn);
                        if (principal != null)
                                res.put(Context.SECURITY_PRINCIPAL, principal);
                        if (credentials != null)
@@ -143,7 +143,7 @@ public enum UserAdminProps {
                        if (scheme != null) {
                                URI bareUri = new URI(scheme, null, u.getHost(), u.getPort(),
                                                scheme.equals("file") ? u.getPath() : null, null, null);
-                               res.put(uri.getFullName(), bareUri.toString());
+                               res.put(uri.property(), bareUri.toString());
                        }
                        return res;
                } catch (Exception e) {