Author: tv
Date: Tue Sep 17 18:04:55 2013
New Revision: 1524149
URL: http://svn.apache.org/r1524149
Log:
Adjust to API
Added:
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/AbstractLDAPUserImpl.java
(with props)
Modified:
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/LDAPUserManagerImpl.java
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/basic/LDAPBasicUser.java
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/dynamic/LDAPDynamicUser.java
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineUser.java
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineUserManagerImpl.java
turbine/fulcrum/trunk/security/ldap/src/test/TurbineLDAPRoleConfig.xml
Added:
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/AbstractLDAPUserImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/AbstractLDAPUserImpl.java?rev=1524149&view=auto
==============================================================================
---
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/AbstractLDAPUserImpl.java
(added)
+++
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/AbstractLDAPUserImpl.java
Tue Sep 17 18:04:55 2013
@@ -0,0 +1,339 @@
+package org.apache.fulcrum.security.ldap;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.Hashtable;
+
+import org.apache.fulcrum.security.entity.User;
+import org.apache.fulcrum.security.entity.impl.SecurityEntityImpl;
+
+/**
+ * LDAPBasicUser implements User and provides access to a user who accesses the
+ * system via LDAP.
+ *
+ * @author <a href="mailto:[email protected]";>Craig D. Berry</a>
+ * @author <a href="mailto:[email protected]";>Tracy M. Adewunmi</a>
+ * @author <a href="mailto:[email protected]";>Leonard J. Flournoy </a>
+ * @author <a href="mailto:[email protected]";>Daniel Rall</a>
+ * @author <a href="mailto:[email protected]";>Humberto Hernandez</a>
+ * @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
+ * @version $Id: LDAPBasicUser.java 534527 2007-05-02 16:10:59Z tv $
+ */
+public abstract class AbstractLDAPUserImpl extends SecurityEntityImpl
+ implements LDAPUser
+{
+ /** Serial Version UID */
+ private static final long serialVersionUID = 3953123276619326752L;
+
+ /** The password */
+ private String password;
+
+ /** This is data that will survive a servlet engine restart. */
+ private Hashtable<String, Object> permStorage = null;
+
+ /** This is data that will not survive a servlet engine restart. */
+ private Hashtable<String, Object> tempStorage = null;
+
+ /**
+ * Constructor.
+ * Create a new User and set the createDate.
+ */
+ public AbstractLDAPUserImpl()
+ {
+ tempStorage = new Hashtable<String, Object>(10);
+ permStorage = new Hashtable<String, Object>(10);
+ }
+
+ /**
+ * Returns the user's password. This method should not be used by the
+ * application directly, because it's meaning depends upon the
+ * implementation of UserManager that manages this particular user object.
+ * Some implementations will use this attribute for storing a password
+ * encrypted in some way, other will not use it at all, when user entered
+ * password is presented to some external authority (like NT domain
+ * controller) to validate it. See also
+ * {@link
org.apache.fulcrum.security.UserManager#authenticate(User,String)}
+ * .
+ *
+ * @return A String with the password for the user.
+ */
+ public String getPassword()
+ {
+ return password;
+ }
+
+ /**
+ * Set password. Application should not use this method directly, see
+ * {@link #getPassword()}. See also
+ * {@link
org.apache.fulcrum.security.UserManager#changePassword(User,String,String)}
+ * .
+ *
+ * @param password
+ * The new password.
+ */
+ public void setPassword(String password)
+ {
+ this.password = password;
+ }
+
+ /**
+ * Returns the Email for this user. If this is defined, then
+ * the user is considered logged in.
+ *
+ * @return A String with the user's Email.
+ */
+ public String getEmail()
+ {
+ String tmp = null;
+
+ tmp = (String) getPerm(LDAPUserManagerImpl.LDAP_USER_EMAIL_KEY);
+ if (tmp != null && tmp.length() == 0)
+ {
+ tmp = null;
+ }
+ return tmp;
+ }
+
+ /**
+ * Get an object from permanent storage.
+ * @param name The object's name.
+ * @return An Object with the given name.
+ */
+ public Object getPerm(String name)
+ {
+ return permStorage.get(name);
+ }
+
+ /**
+ * Get an object from permanent storage; return default if value
+ * is null.
+ *
+ * @param name The object's name.
+ * @param def A default value to return.
+ * @return An Object with the given name.
+ */
+ public Object getPerm(String name, Object def)
+ {
+ try
+ {
+ Object val = permStorage.get(name);
+
+ if (val == null)
+ {
+ return def;
+ }
+ return val;
+ }
+ catch (Exception e)
+ {
+ return def;
+ }
+ }
+
+ /**
+ * This should only be used in the case where we want to save the
+ * data to the database.
+ *
+ * @return A Hashtable.
+ */
+ public Hashtable<String, Object> getPermStorage()
+ {
+ if (this.permStorage == null)
+ {
+ this.permStorage = new Hashtable<String, Object>();
+ }
+ return this.permStorage;
+ }
+
+ /**
+ * Get an object from temporary storage.
+ *
+ * @param name The object's name.
+ * @return An Object with the given name.
+ */
+ public Object getTemp(String name)
+ {
+ return tempStorage.get(name);
+ }
+
+ /**
+ * Get an object from temporary storage; return default if value
+ * is null.
+ *
+ * @param name The object's name.
+ * @param def A default value to return.
+ * @return An Object with the given name.
+ */
+ public Object getTemp(String name, Object def)
+ {
+ Object val;
+
+ try
+ {
+ val = tempStorage.get(name);
+ if (val == null)
+ {
+ val = def;
+ }
+ }
+ catch (Exception e)
+ {
+ val = def;
+ }
+ return val;
+ }
+
+ /**
+ * Returns the first name for this user. If this is defined, then
+ * the user is considered logged in.
+ *
+ * @return A String with the user's first name.
+ */
+ public String getFirstName()
+ {
+ String tmp = null;
+
+ tmp = (String) getPerm(LDAPUserManagerImpl.LDAP_USER_FIRSTNAME_KEY);
+ if (tmp != null && tmp.length() == 0)
+ {
+ tmp = null;
+ }
+ return tmp;
+ }
+
+ /**
+ * Returns the last name for this user. If this is defined, then
+ * the user is considered logged in.
+ *
+ * @return A String with the user's last name.
+ */
+ public String getLastName()
+ {
+ String tmp = null;
+
+ tmp = (String) getPerm(LDAPUserManagerImpl.LDAP_USER_LASTNAME_KEY);
+ if (tmp != null && tmp.length() == 0)
+ {
+ tmp = null;
+ }
+ return tmp;
+ }
+
+ /**
+ * Remove an object from temporary storage and return the object.
+ *
+ * @param name The name of the object to remove.
+ * @return An Object.
+ */
+ public Object removeTemp(String name)
+ {
+ return tempStorage.remove(name);
+ }
+
+ /**
+ * Set the users Email
+ *
+ * @param email The new email.
+ */
+ public void setEmail(String email)
+ {
+ setPerm(LDAPUserManagerImpl.LDAP_USER_EMAIL_KEY, email);
+ }
+
+ /**
+ * Set the users First Name
+ *
+ * @param fname The new firstname.
+ */
+ public void setFirstName(String fname)
+ {
+ setPerm(LDAPUserManagerImpl.LDAP_USER_FIRSTNAME_KEY, fname);
+ }
+
+ /**
+ * Set the users Last Name
+ * Sets the last name for this user.
+ *
+ * @param lname The new lastname.
+ */
+ public void setLastName(String lname)
+ {
+ setPerm(LDAPUserManagerImpl.LDAP_USER_LASTNAME_KEY, lname);
+ }
+
+ /**
+ * Put an object into permanent storage.
+ *
+ * @param name The object's name.
+ * @param value The object.
+ */
+ public void setPerm(String name, Object value)
+ {
+ permStorage.put(name, value);
+ }
+
+ /**
+ * This should only be used in the case where we want to save the
+ * data to the database.
+ *
+ * @param stuff A Hashtable.
+ */
+ public void setPermStorage(Hashtable<String, Object> stuff)
+ {
+ this.permStorage = stuff;
+ }
+
+ /**
+ * This should only be used in the case where we want to save the
+ * data to the database.
+ *
+ * @return A Hashtable.
+ */
+ public Hashtable<String, Object> getTempStorage()
+ {
+ if (this.tempStorage == null)
+ {
+ this.tempStorage = new Hashtable<String, Object>();
+ }
+ return this.tempStorage;
+ }
+
+ /**
+ * This should only be used in the case where we want to save the
+ * data to the database.
+ *
+ * @param storage A Hashtable.
+ */
+ public void setTempStorage(Hashtable<String, Object> storage)
+ {
+ this.tempStorage = storage;
+ }
+
+ /**
+ * Put an object into temporary storage.
+ *
+ * @param name The object's name.
+ * @param value The object.
+ */
+ public void setTemp(String name, Object value)
+ {
+ tempStorage.put(name, value);
+ }
+}
Propchange:
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/AbstractLDAPUserImpl.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/LDAPUserManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/LDAPUserManagerImpl.java?rev=1524149&r1=1524148&r2=1524149&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/LDAPUserManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/LDAPUserManagerImpl.java
Tue Sep 17 18:04:55 2013
@@ -55,7 +55,7 @@ import org.apache.fulcrum.security.util.
* @author <a href="mailto:[email protected]";>Humberto Hernandez</a>
* @author <a href="mailto:[email protected]";>Eric Pugh</a>
* @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
- *
+ *
* @version $Id:LDAPUserManagerImpl.java 535465 2007-05-05 06:58:06Z tv $
*/
public class LDAPUserManagerImpl extends AbstractUserManager
@@ -193,12 +193,12 @@ public class LDAPUserManagerImpl extends
{
return String.valueOf(++uniqueId);
}
-
+
/**
* Check whether a specified user's account exists.
- *
+ *
* The login name is used for looking up the account.
- *
+ *
* @param userName
* The name of the user to be checked.
* @return true if the specified account exists
@@ -209,7 +209,7 @@ public class LDAPUserManagerImpl extends
{
try
{
- User ldapUser = getUser(userName);
+ getUser(userName);
}
catch (UnknownEntityException ex)
{
@@ -221,7 +221,7 @@ public class LDAPUserManagerImpl extends
/**
* Retrieves all users defined in the system.
- *
+ *
* @return the names of all users defined in the system.
* @throws DataBackendException
* if there was an error accessing the data backend.
@@ -241,12 +241,12 @@ public class LDAPUserManagerImpl extends
*/
SearchControls ctls = new SearchControls();
- NamingEnumeration answer =
+ NamingEnumeration<SearchResult> answer =
ctx.search(this.ldapBasesearch, filter, ctls);
while (answer.hasMore())
{
- SearchResult sr = (SearchResult) answer.next();
+ SearchResult sr = answer.next();
Attributes attribs = sr.getAttributes();
User ldapUser = getUserInstance();
@@ -266,7 +266,7 @@ public class LDAPUserManagerImpl extends
/**
* Removes an user account from the system.
- *
+ *
* @param user
* the object describing the account to be removed.
* @throws DataBackendException
@@ -298,24 +298,24 @@ public class LDAPUserManagerImpl extends
/**
* Creates new user account with specified attributes.
- *
+ *
* @param user
* the object describing account to be created.
* @param password
* The password to use for the account.
- *
+ *
* @throws DataBackendException
* if there was an error accessing the data backend.
*/
- protected User persistNewUser(User user) throws DataBackendException
+ protected <T extends User> T persistNewUser(T user) throws
DataBackendException
{
if (checkExists(user))
{
throw new DataBackendException("The account '"
+ user.getName() + "' already exists");
}
-
- /*
+
+ /*
* Set a numeric id in case the framework does not provide one.
* This is meant to be a last-resort solution and should not be
* relied upon.
@@ -344,7 +344,7 @@ public class LDAPUserManagerImpl extends
/**
* Stores User attributes. The User is required to exist in the system.
- *
+ *
* @param role
* The User to be stored.
* @throws DataBackendException
@@ -377,7 +377,7 @@ public class LDAPUserManagerImpl extends
/**
* Override password change. We do not support it with LDAP
- *
+ *
* @see
org.apache.fulcrum.security.spi.AbstractUserManager#changePassword(org.apache.fulcrum.security.entity.User,
java.lang.String, java.lang.String)
*/
public void changePassword(User user, String oldPassword, String
newPassword) throws PasswordMismatchException,
@@ -388,7 +388,7 @@ public class LDAPUserManagerImpl extends
/**
* Override password change. We do not support it with LDAP
- *
+ *
* @see
org.apache.fulcrum.security.spi.AbstractUserManager#forcePassword(org.apache.fulcrum.security.entity.User,
java.lang.String)
*/
public void forcePassword(User user, String password) throws
UnknownEntityException, DataBackendException
@@ -401,14 +401,14 @@ public class LDAPUserManagerImpl extends
* key.
*
* @param name the name of the user.
- *
+ *
* @return an User object.
* @exception UnknownEntityException if the user's account does not
* exist in the database.
* @exception DataBackendException if there is a problem accessing the
* storage.
*/
- public User getUser(String name) throws DataBackendException,
UnknownEntityException
+ public <T extends User> T getUser(String name) throws
DataBackendException, UnknownEntityException
{
try
{
@@ -424,15 +424,15 @@ public class LDAPUserManagerImpl extends
*/
SearchControls ctls = new SearchControls();
- NamingEnumeration answer =
+ NamingEnumeration<SearchResult> answer =
ctx.search(this.ldapBasesearch, filter, ctls);
if (answer.hasMore())
{
- SearchResult sr = (SearchResult) answer.next();
+ SearchResult sr = answer.next();
Attributes attribs = sr.getAttributes();
-
- User ldapUser = getUserInstance();
+
+ T ldapUser = getUserInstance();
setLDAPAttributes(ldapUser, attribs);
return ldapUser;
@@ -460,7 +460,7 @@ public class LDAPUserManagerImpl extends
* @throws DataBackendException if there is a problem accessing the
* storage.
*/
- public User getUserById(Object id) throws DataBackendException,
UnknownEntityException
+ public <T extends User> T getUserById(Object id) throws
DataBackendException, UnknownEntityException
{
try
{
@@ -476,15 +476,15 @@ public class LDAPUserManagerImpl extends
*/
SearchControls ctls = new SearchControls();
- NamingEnumeration answer =
+ NamingEnumeration<SearchResult> answer =
ctx.search(this.ldapBasesearch, filter, ctls);
if (answer.hasMore())
{
- SearchResult sr = (SearchResult) answer.next();
+ SearchResult sr = answer.next();
Attributes attribs = sr.getAttributes();
- User ldapUser = getUserInstance();
+ T ldapUser = getUserInstance();
setLDAPAttributes(ldapUser, attribs);
return ldapUser;
@@ -504,20 +504,20 @@ public class LDAPUserManagerImpl extends
/**
* Avalon Service lifecycle method
- *
+ *
* @see
org.apache.fulcrum.security.spi.AbstractEntityManager#configure(org.apache.avalon.framework.configuration.Configuration)
*/
public void configure(Configuration conf) throws ConfigurationException
{
super.configure(conf);
-
+
Configuration ldap = conf.getChild(LDAP_KEY, false);
-
+
if (ldap == null)
{
throw new ConfigurationException("LDAP configuration is
mandatory.", conf);
}
-
+
this.ldapBasesearch =
ldap.getChild(LDAP_BASE_SEARCH_KEY).getValue(null);
if (this.ldapBasesearch == null)
@@ -543,9 +543,9 @@ public class LDAPUserManagerImpl extends
this.ldapPort =
ldap.getChild(LDAP_PORT_KEY).getValue(LDAP_PORT_DEFAULT);
this.ldapProvider =
ldap.getChild(LDAP_PROVIDER_KEY).getValue(LDAP_PROVIDER_DEFAULT);
this.ldapSecurityAuthentication =
ldap.getChild(LDAP_AUTH_KEY).getValue(LDAP_AUTH_DEFAULT);
-
+
Configuration ldapUser = ldap.getChild(LDAP_USER_KEY, false);
-
+
if (ldapUser == null)
{
getLogger().info("No LDAP user attributes defined, using
defaults.");
@@ -568,7 +568,7 @@ public class LDAPUserManagerImpl extends
this.ldapPassword =
ldapUser.getChild(LDAP_USER_PASSWORD_KEY).getValue(LDAP_USER_PASSWORD_DEFAULT);
}
}
-
+
/**
* Bind as the admin user.
*
@@ -598,7 +598,7 @@ public class LDAPUserManagerImpl extends
* creating an initial context using Sun's client
* LDAP Provider.
*/
- Hashtable env = new Hashtable();
+ Hashtable<String, String> env = new Hashtable<String, String>();
env.put(Context.INITIAL_CONTEXT_FACTORY, this.ldapProvider);
env.put(Context.PROVIDER_URL, providerURL);
@@ -610,7 +610,7 @@ public class LDAPUserManagerImpl extends
return ctx;
}
-
+
/**
* Populates the user with values obtained from the LDAP Service.
* This method could be redefined in subclasses.
@@ -647,21 +647,21 @@ public class LDAPUserManagerImpl extends
if (user instanceof LDAPUser)
{
LDAPUser u = (LDAPUser)user;
-
+
// Set the Firstname.
attr = attribs.get(this.ldapFirstname);
if (attr != null && attr.get() != null)
{
u.setFirstName(attr.get().toString());
}
-
+
// Set the Lastname.
attr = attribs.get(this.ldapLastname);
if (attr != null && attr.get() != null)
{
u.setLastName(attr.get().toString());
}
-
+
// Set the E-Mail
attr = attribs.get(this.ldapEmail);
if (attr != null && attr.get() != null)
@@ -721,28 +721,28 @@ public class LDAPUserManagerImpl extends
if (user instanceof LDAPUser)
{
LDAPUser u = (LDAPUser)user;
-
+
// Set the Firstname.
value = u.getFirstName();
-
+
if (value != null)
{
Attribute attr = new BasicAttribute(this.ldapFirstname, value);
attribs.put(attr);
}
-
+
// Set the Lastname.
value = u.getLastName();
-
+
if (value != null)
{
Attribute attr = new BasicAttribute(this.ldapLastname, value);
attribs.put(attr);
}
-
+
// Set the E-Mail.
value = u.getEmail();
-
+
if (value != null)
{
Attribute attr = new BasicAttribute(this.ldapEmail, value);
@@ -752,13 +752,13 @@ public class LDAPUserManagerImpl extends
return attribs;
}
-
+
/**
* Gets the distinguished name (DN) of the User.
* This method could be redefined in a subclass.
- *
+ *
* @param user The user to provide the DN for
- *
+ *
* @return The Distinguished Name of the user.
*/
public String getDN(User user)
Modified:
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/basic/LDAPBasicUser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/basic/LDAPBasicUser.java?rev=1524149&r1=1524148&r2=1524149&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/basic/LDAPBasicUser.java
(original)
+++
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/basic/LDAPBasicUser.java
Tue Sep 17 18:04:55 2013
@@ -19,11 +19,12 @@ package org.apache.fulcrum.security.ldap
* under the License.
*/
-import java.util.Hashtable;
+import java.util.Set;
-import org.apache.fulcrum.security.ldap.LDAPUser;
-import org.apache.fulcrum.security.ldap.LDAPUserManagerImpl;
-import org.apache.fulcrum.security.model.basic.entity.impl.BasicUserImpl;
+import org.apache.fulcrum.security.entity.Group;
+import org.apache.fulcrum.security.ldap.AbstractLDAPUserImpl;
+import org.apache.fulcrum.security.model.basic.entity.BasicUser;
+import org.apache.fulcrum.security.util.GroupSet;
/**
* LDAPBasicUser implements User and provides access to a user who accesses the
@@ -37,269 +38,63 @@ import org.apache.fulcrum.security.model
* @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
* @version $Id: LDAPBasicUser.java 534527 2007-05-02 16:10:59Z tv $
*/
-public class LDAPBasicUser extends BasicUserImpl
- implements LDAPUser
+public class LDAPBasicUser extends AbstractLDAPUserImpl
+ implements BasicUser
{
/** Serial Version UID */
private static final long serialVersionUID = 3953123276619326752L;
- /** This is data that will survive a servlet engine restart. */
- private Hashtable permStorage = null;
-
- /** This is data that will not survive a servlet engine restart. */
- private Hashtable tempStorage = null;
-
- /**
- * Constructor.
- * Create a new User and set the createDate.
- */
- public LDAPBasicUser()
- {
- tempStorage = new Hashtable(10);
- permStorage = new Hashtable(10);
- }
-
- /**
- * Returns the Email for this user. If this is defined, then
- * the user is considered logged in.
- *
- * @return A String with the user's Email.
- */
- public String getEmail()
- {
- String tmp = null;
-
- tmp = (String) getPerm(LDAPUserManagerImpl.LDAP_USER_EMAIL_KEY);
- if (tmp != null && tmp.length() == 0)
- {
- tmp = null;
- }
- return tmp;
- }
-
- /**
- * Get an object from permanent storage.
- * @param name The object's name.
- * @return An Object with the given name.
- */
- public Object getPerm(String name)
- {
- return permStorage.get(name);
- }
-
- /**
- * Get an object from permanent storage; return default if value
- * is null.
- *
- * @param name The object's name.
- * @param def A default value to return.
- * @return An Object with the given name.
- */
- public Object getPerm(String name, Object def)
- {
- try
- {
- Object val = permStorage.get(name);
-
- if (val == null)
- {
- return def;
- }
- return val;
- }
- catch (Exception e)
- {
- return def;
- }
- }
-
- /**
- * This should only be used in the case where we want to save the
- * data to the database.
- *
- * @return A Hashtable.
- */
- public Hashtable getPermStorage()
- {
- if (this.permStorage == null)
- {
- this.permStorage = new Hashtable();
- }
- return this.permStorage;
- }
-
- /**
- * Get an object from temporary storage.
- *
- * @param name The object's name.
- * @return An Object with the given name.
- */
- public Object getTemp(String name)
- {
- return tempStorage.get(name);
- }
-
- /**
- * Get an object from temporary storage; return default if value
- * is null.
- *
- * @param name The object's name.
- * @param def A default value to return.
- * @return An Object with the given name.
- */
- public Object getTemp(String name, Object def)
- {
- Object val;
-
- try
- {
- val = tempStorage.get(name);
- if (val == null)
- {
- val = def;
- }
- }
- catch (Exception e)
- {
- val = def;
- }
- return val;
- }
-
- /**
- * Returns the first name for this user. If this is defined, then
- * the user is considered logged in.
- *
- * @return A String with the user's first name.
- */
- public String getFirstName()
- {
- String tmp = null;
-
- tmp = (String) getPerm(LDAPUserManagerImpl.LDAP_USER_FIRSTNAME_KEY);
- if (tmp != null && tmp.length() == 0)
- {
- tmp = null;
- }
- return tmp;
- }
-
- /**
- * Returns the last name for this user. If this is defined, then
- * the user is considered logged in.
- *
- * @return A String with the user's last name.
- */
- public String getLastName()
- {
- String tmp = null;
-
- tmp = (String) getPerm(LDAPUserManagerImpl.LDAP_USER_LASTNAME_KEY);
- if (tmp != null && tmp.length() == 0)
- {
- tmp = null;
- }
- return tmp;
- }
-
- /**
- * Remove an object from temporary storage and return the object.
- *
- * @param name The name of the object to remove.
- * @return An Object.
- */
- public Object removeTemp(String name)
- {
- return tempStorage.remove(name);
- }
-
- /**
- * Set the users Email
- *
- * @param email The new email.
- */
- public void setEmail(String email)
- {
- setPerm(LDAPUserManagerImpl.LDAP_USER_EMAIL_KEY, email);
- }
-
- /**
- * Set the users First Name
- *
- * @param fname The new firstname.
- */
- public void setFirstName(String fname)
- {
- setPerm(LDAPUserManagerImpl.LDAP_USER_FIRSTNAME_KEY, fname);
- }
-
- /**
- * Set the users Last Name
- * Sets the last name for this user.
- *
- * @param lname The new lastname.
- */
- public void setLastName(String lname)
- {
- setPerm(LDAPUserManagerImpl.LDAP_USER_LASTNAME_KEY, lname);
- }
-
- /**
- * Put an object into permanent storage.
- *
- * @param name The object's name.
- * @param value The object.
- */
- public void setPerm(String name, Object value)
- {
- permStorage.put(name, value);
- }
-
- /**
- * This should only be used in the case where we want to save the
- * data to the database.
- *
- * @param stuff A Hashtable.
- */
- public void setPermStorage(Hashtable stuff)
- {
- this.permStorage = stuff;
- }
-
- /**
- * This should only be used in the case where we want to save the
- * data to the database.
- *
- * @return A Hashtable.
- */
- public Hashtable getTempStorage()
- {
- if (this.tempStorage == null)
- {
- this.tempStorage = new Hashtable();
- }
- return this.tempStorage;
- }
-
- /**
- * This should only be used in the case where we want to save the
- * data to the database.
- *
- * @param storage A Hashtable.
- */
- public void setTempStorage(Hashtable storage)
- {
- this.tempStorage = storage;
- }
-
- /**
- * Put an object into temporary storage.
- *
- * @param name The object's name.
- * @param value The object.
- */
- public void setTemp(String name, Object value)
- {
- tempStorage.put(name, value);
- }
+ /**
+ * @see
org.apache.fulcrum.security.model.basic.entity.BasicUser#getGroups()
+ */
+ public GroupSet getGroups()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.basic.entity.BasicUser#setGroups(org.apache.fulcrum.security.util.GroupSet)
+ */
+ public void setGroups(GroupSet groups)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.basic.entity.BasicUser#removeGroup(org.apache.fulcrum.security.entity.Group)
+ */
+ public void removeGroup(Group group)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.basic.entity.BasicUser#addGroup(org.apache.fulcrum.security.entity.Group)
+ */
+ public void addGroup(Group group)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.basic.entity.BasicUser#setGroupsAsSet(java.util.Set)
+ */
+ public <T extends Group> void setGroupsAsSet(Set<T> groups)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.basic.entity.BasicUser#getGroupsAsSet()
+ */
+ public <T extends Group> Set<T> getGroupsAsSet()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
Modified:
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/dynamic/LDAPDynamicUser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/dynamic/LDAPDynamicUser.java?rev=1524149&r1=1524148&r2=1524149&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/dynamic/LDAPDynamicUser.java
(original)
+++
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/dynamic/LDAPDynamicUser.java
Tue Sep 17 18:04:55 2013
@@ -19,11 +19,11 @@ package org.apache.fulcrum.security.ldap
* under the License.
*/
-import java.util.Hashtable;
+import java.util.Set;
-import org.apache.fulcrum.security.ldap.LDAPUser;
-import org.apache.fulcrum.security.ldap.LDAPUserManagerImpl;
-import org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicUserImpl;
+import org.apache.fulcrum.security.entity.User;
+import org.apache.fulcrum.security.ldap.basic.LDAPBasicUser;
+import org.apache.fulcrum.security.model.dynamic.entity.DynamicUser;
/**
* LDAPDynamicUser implements User and provides access to a user who accesses
the
@@ -37,269 +37,45 @@ import org.apache.fulcrum.security.model
* @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
* @version $Id: LDAPDynamicUser.java 534527 2007-05-02 16:10:59Z tv $
*/
-public class LDAPDynamicUser extends DynamicUserImpl
- implements LDAPUser
+public class LDAPDynamicUser extends LDAPBasicUser
+ implements DynamicUser
{
/** Serial Version UID */
private static final long serialVersionUID = 3953123276619326752L;
- /** This is data that will survive a servlet engine restart. */
- private Hashtable permStorage = null;
+ /**
+ * @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicUser#getDelegatees()
+ */
+ public <T extends User> Set<T> getDelegatees()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicUser#setDelegatees(java.util.Set)
+ */
+ public <T extends User> void setDelegatees(Set<T> delegatees)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicUser#getDelegators()
+ */
+ public <T extends User> Set<T> getDelegators()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.dynamic.entity.DynamicUser#setDelegators(java.util.Set)
+ */
+ public <T extends User> void setDelegators(Set<T> delegators)
+ {
+ // TODO Auto-generated method stub
- /** This is data that will not survive a servlet engine restart. */
- private Hashtable tempStorage = null;
-
- /**
- * Constructor.
- * Create a new User and set the createDate.
- */
- public LDAPDynamicUser()
- {
- tempStorage = new Hashtable(10);
- permStorage = new Hashtable(10);
- }
-
- /**
- * Returns the Email for this user. If this is defined, then
- * the user is considered logged in.
- *
- * @return A String with the user's Email.
- */
- public String getEmail()
- {
- String tmp = null;
-
- tmp = (String) getPerm(LDAPUserManagerImpl.LDAP_USER_EMAIL_KEY);
- if (tmp != null && tmp.length() == 0)
- {
- tmp = null;
- }
- return tmp;
- }
-
- /**
- * Get an object from permanent storage.
- * @param name The object's name.
- * @return An Object with the given name.
- */
- public Object getPerm(String name)
- {
- return permStorage.get(name);
- }
-
- /**
- * Get an object from permanent storage; return default if value
- * is null.
- *
- * @param name The object's name.
- * @param def A default value to return.
- * @return An Object with the given name.
- */
- public Object getPerm(String name, Object def)
- {
- try
- {
- Object val = permStorage.get(name);
-
- if (val == null)
- {
- return def;
- }
- return val;
- }
- catch (Exception e)
- {
- return def;
- }
- }
-
- /**
- * This should only be used in the case where we want to save the
- * data to the database.
- *
- * @return A Hashtable.
- */
- public Hashtable getPermStorage()
- {
- if (this.permStorage == null)
- {
- this.permStorage = new Hashtable();
- }
- return this.permStorage;
- }
-
- /**
- * Get an object from temporary storage.
- *
- * @param name The object's name.
- * @return An Object with the given name.
- */
- public Object getTemp(String name)
- {
- return tempStorage.get(name);
- }
-
- /**
- * Get an object from temporary storage; return default if value
- * is null.
- *
- * @param name The object's name.
- * @param def A default value to return.
- * @return An Object with the given name.
- */
- public Object getTemp(String name, Object def)
- {
- Object val;
-
- try
- {
- val = tempStorage.get(name);
- if (val == null)
- {
- val = def;
- }
- }
- catch (Exception e)
- {
- val = def;
- }
- return val;
- }
-
- /**
- * Returns the first name for this user. If this is defined, then
- * the user is considered logged in.
- *
- * @return A String with the user's first name.
- */
- public String getFirstName()
- {
- String tmp = null;
-
- tmp = (String) getPerm(LDAPUserManagerImpl.LDAP_USER_FIRSTNAME_KEY);
- if (tmp != null && tmp.length() == 0)
- {
- tmp = null;
- }
- return tmp;
- }
-
- /**
- * Returns the last name for this user. If this is defined, then
- * the user is considered logged in.
- *
- * @return A String with the user's last name.
- */
- public String getLastName()
- {
- String tmp = null;
-
- tmp = (String) getPerm(LDAPUserManagerImpl.LDAP_USER_LASTNAME_KEY);
- if (tmp != null && tmp.length() == 0)
- {
- tmp = null;
- }
- return tmp;
- }
-
- /**
- * Remove an object from temporary storage and return the object.
- *
- * @param name The name of the object to remove.
- * @return An Object.
- */
- public Object removeTemp(String name)
- {
- return tempStorage.remove(name);
- }
-
- /**
- * Set the users Email
- *
- * @param email The new email.
- */
- public void setEmail(String email)
- {
- setPerm(LDAPUserManagerImpl.LDAP_USER_EMAIL_KEY, email);
- }
-
- /**
- * Set the users First Name
- *
- * @param fname The new firstname.
- */
- public void setFirstName(String fname)
- {
- setPerm(LDAPUserManagerImpl.LDAP_USER_FIRSTNAME_KEY, fname);
- }
-
- /**
- * Set the users Last Name
- * Sets the last name for this user.
- *
- * @param lname The new lastname.
- */
- public void setLastName(String lname)
- {
- setPerm(LDAPUserManagerImpl.LDAP_USER_LASTNAME_KEY, lname);
- }
-
- /**
- * Put an object into permanent storage.
- *
- * @param name The object's name.
- * @param value The object.
- */
- public void setPerm(String name, Object value)
- {
- permStorage.put(name, value);
- }
-
- /**
- * This should only be used in the case where we want to save the
- * data to the database.
- *
- * @param stuff A Hashtable.
- */
- public void setPermStorage(Hashtable stuff)
- {
- this.permStorage = stuff;
- }
-
- /**
- * This should only be used in the case where we want to save the
- * data to the database.
- *
- * @return A Hashtable.
- */
- public Hashtable getTempStorage()
- {
- if (this.tempStorage == null)
- {
- this.tempStorage = new Hashtable();
- }
- return this.tempStorage;
- }
-
- /**
- * This should only be used in the case where we want to save the
- * data to the database.
- *
- * @param storage A Hashtable.
- */
- public void setTempStorage(Hashtable storage)
- {
- this.tempStorage = storage;
- }
-
- /**
- * Put an object into temporary storage.
- *
- * @param name The object's name.
- * @param value The object.
- */
- public void setTemp(String name, Object value)
- {
- tempStorage.put(name, value);
- }
+ }
}
Modified:
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineUser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineUser.java?rev=1524149&r1=1524148&r2=1524149&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineUser.java
(original)
+++
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineUser.java
Tue Sep 17 18:04:55 2013
@@ -19,11 +19,11 @@ package org.apache.fulcrum.security.ldap
* under the License.
*/
-import java.util.Hashtable;
+import java.util.Set;
-import org.apache.fulcrum.security.ldap.LDAPUser;
-import org.apache.fulcrum.security.ldap.LDAPUserManagerImpl;
-import org.apache.fulcrum.security.model.turbine.entity.impl.TurbineUserImpl;
+import org.apache.fulcrum.security.ldap.AbstractLDAPUserImpl;
+import org.apache.fulcrum.security.model.turbine.entity.TurbineUser;
+import org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole;
/**
* LDAPTurbineUser implements User and provides access to a user who accesses
the
@@ -37,269 +37,58 @@ import org.apache.fulcrum.security.model
* @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
* @version $Id: LDAPTurbineUser.java 534527 2007-05-02 16:10:59Z tv $
*/
-public class LDAPTurbineUser extends TurbineUserImpl
- implements LDAPUser
+public class LDAPTurbineUser extends AbstractLDAPUserImpl
+ implements TurbineUser
{
/** Serial Version UID */
private static final long serialVersionUID = 3953123276619326752L;
- /** This is data that will survive a servlet engine restart. */
- private Hashtable permStorage = null;
-
- /** This is data that will not survive a servlet engine restart. */
- private Hashtable tempStorage = null;
-
- /**
- * Constructor.
- * Create a new User and set the createDate.
- */
- public LDAPTurbineUser()
- {
- tempStorage = new Hashtable(10);
- permStorage = new Hashtable(10);
- }
-
- /**
- * Returns the Email for this user. If this is defined, then
- * the user is considered logged in.
- *
- * @return A String with the user's Email.
- */
- public String getEmail()
- {
- String tmp = null;
-
- tmp = (String) getPerm(LDAPUserManagerImpl.LDAP_USER_EMAIL_KEY);
- if (tmp != null && tmp.length() == 0)
- {
- tmp = null;
- }
- return tmp;
- }
-
- /**
- * Get an object from permanent storage.
- * @param name The object's name.
- * @return An Object with the given name.
- */
- public Object getPerm(String name)
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRoleEntity#getUserGroupRoleSet()
+ */
+ public <T extends TurbineUserGroupRole> Set<T> getUserGroupRoleSet()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRoleEntity#setUserGroupRoleSet(java.util.Set)
+ */
+ public <T extends TurbineUserGroupRole> void setUserGroupRoleSet(
+ Set<T> userGroupRoleSet)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRoleEntity#addUserGroupRole(org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole)
+ */
+ public void addUserGroupRole(TurbineUserGroupRole userGroupRole)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /**
+ * @see
org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRoleEntity#removeUserGroupRole(org.apache.fulcrum.security.model.turbine.entity.TurbineUserGroupRole)
+ */
+ public void removeUserGroupRole(TurbineUserGroupRole userGroupRole)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public byte[] getObjectdata()
{
- return permStorage.get(name);
+ // TODO Auto-generated method stub
+ return null;
}
- /**
- * Get an object from permanent storage; return default if value
- * is null.
- *
- * @param name The object's name.
- * @param def A default value to return.
- * @return An Object with the given name.
- */
- public Object getPerm(String name, Object def)
+ public void setObjectdata(byte[] objectdata)
{
- try
- {
- Object val = permStorage.get(name);
-
- if (val == null)
- {
- return def;
- }
- return val;
- }
- catch (Exception e)
- {
- return def;
- }
- }
+ // TODO Auto-generated method stub
- /**
- * This should only be used in the case where we want to save the
- * data to the database.
- *
- * @return A Hashtable.
- */
- public Hashtable getPermStorage()
- {
- if (this.permStorage == null)
- {
- this.permStorage = new Hashtable();
- }
- return this.permStorage;
- }
-
- /**
- * Get an object from temporary storage.
- *
- * @param name The object's name.
- * @return An Object with the given name.
- */
- public Object getTemp(String name)
- {
- return tempStorage.get(name);
- }
-
- /**
- * Get an object from temporary storage; return default if value
- * is null.
- *
- * @param name The object's name.
- * @param def A default value to return.
- * @return An Object with the given name.
- */
- public Object getTemp(String name, Object def)
- {
- Object val;
-
- try
- {
- val = tempStorage.get(name);
- if (val == null)
- {
- val = def;
- }
- }
- catch (Exception e)
- {
- val = def;
- }
- return val;
- }
-
- /**
- * Returns the first name for this user. If this is defined, then
- * the user is considered logged in.
- *
- * @return A String with the user's first name.
- */
- public String getFirstName()
- {
- String tmp = null;
-
- tmp = (String) getPerm(LDAPUserManagerImpl.LDAP_USER_FIRSTNAME_KEY);
- if (tmp != null && tmp.length() == 0)
- {
- tmp = null;
- }
- return tmp;
- }
-
- /**
- * Returns the last name for this user. If this is defined, then
- * the user is considered logged in.
- *
- * @return A String with the user's last name.
- */
- public String getLastName()
- {
- String tmp = null;
-
- tmp = (String) getPerm(LDAPUserManagerImpl.LDAP_USER_LASTNAME_KEY);
- if (tmp != null && tmp.length() == 0)
- {
- tmp = null;
- }
- return tmp;
- }
-
- /**
- * Remove an object from temporary storage and return the object.
- *
- * @param name The name of the object to remove.
- * @return An Object.
- */
- public Object removeTemp(String name)
- {
- return tempStorage.remove(name);
- }
-
- /**
- * Set the users Email
- *
- * @param email The new email.
- */
- public void setEmail(String email)
- {
- setPerm(LDAPUserManagerImpl.LDAP_USER_EMAIL_KEY, email);
- }
-
- /**
- * Set the users First Name
- *
- * @param fname The new firstname.
- */
- public void setFirstName(String fname)
- {
- setPerm(LDAPUserManagerImpl.LDAP_USER_FIRSTNAME_KEY, fname);
- }
-
- /**
- * Set the users Last Name
- * Sets the last name for this user.
- *
- * @param lname The new lastname.
- */
- public void setLastName(String lname)
- {
- setPerm(LDAPUserManagerImpl.LDAP_USER_LASTNAME_KEY, lname);
- }
-
- /**
- * Put an object into permanent storage.
- *
- * @param name The object's name.
- * @param value The object.
- */
- public void setPerm(String name, Object value)
- {
- permStorage.put(name, value);
- }
-
- /**
- * This should only be used in the case where we want to save the
- * data to the database.
- *
- * @param stuff A Hashtable.
- */
- public void setPermStorage(Hashtable stuff)
- {
- this.permStorage = stuff;
- }
-
- /**
- * This should only be used in the case where we want to save the
- * data to the database.
- *
- * @return A Hashtable.
- */
- public Hashtable getTempStorage()
- {
- if (this.tempStorage == null)
- {
- this.tempStorage = new Hashtable();
- }
- return this.tempStorage;
- }
-
- /**
- * This should only be used in the case where we want to save the
- * data to the database.
- *
- * @param storage A Hashtable.
- */
- public void setTempStorage(Hashtable storage)
- {
- this.tempStorage = storage;
- }
-
- /**
- * Put an object into temporary storage.
- *
- * @param name The object's name.
- * @param value The object.
- */
- public void setTemp(String name, Object value)
- {
- tempStorage.put(name, value);
}
}
Modified:
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineUserManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineUserManagerImpl.java?rev=1524149&r1=1524148&r2=1524149&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineUserManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/ldap/src/java/org/apache/fulcrum/security/ldap/turbine/LDAPTurbineUserManagerImpl.java
Tue Sep 17 18:04:55 2013
@@ -27,7 +27,7 @@ import org.apache.fulcrum.security.util.
/**
* This implementation uses ldap for retrieving user data.
- *
+ *
* @author <a href="mailto:[email protected]";>Eric Pugh</a>
* @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
* @version $Id:LDAPTurbineUserManagerImpl.java 535465 2007-05-05 06:58:06Z tv
$
@@ -37,15 +37,15 @@ public class LDAPTurbineUserManagerImpl
/**
* Constructs an User object to represent an anonymous user of the
* application.
- *
+ *
* @return An anonymous Turbine User.
* @throws UnknownEntityException
* if the implementation of User interface could not be
* determined, or does not exist.
*/
- public User getAnonymousUser() throws UnknownEntityException
+ public <T extends User> T getAnonymousUser() throws UnknownEntityException
{
- User user;
+ T user;
try
{
user = getUserInstance();
@@ -61,17 +61,16 @@ public class LDAPTurbineUserManagerImpl
/**
* Checks whether a passed user object matches the anonymous user pattern
* according to the configured user manager
- *
+ *
* @param user
* An user object
- *
+ *
* @return True if this is an anonymous user
- *
+ *
*/
public boolean isAnonymousUser(User user)
{
// Either just null, the name is null or the name is the empty string
return (user == null) || StringUtils.isEmpty(user.getName());
}
-
}
Modified: turbine/fulcrum/trunk/security/ldap/src/test/TurbineLDAPRoleConfig.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/ldap/src/test/TurbineLDAPRoleConfig.xml?rev=1524149&r1=1524148&r2=1524149&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/ldap/src/test/TurbineLDAPRoleConfig.xml
(original)
+++ turbine/fulcrum/trunk/security/ldap/src/test/TurbineLDAPRoleConfig.xml Tue
Sep 17 18:04:55 2013
@@ -51,6 +51,6 @@
<role
name="org.apache.fulcrum.security.model.ACLFactory"
shorthand="aclFactory"
-
default-class="org.apache.fulcrum.security.model.dynamic.DynamicACLFactory"/>
+
default-class="org.apache.fulcrum.security.model.turbine.TurbineACLFactory"/>
</role-list>
