Author: tv
Date: Thu Aug 16 19:42:18 2012
New Revision: 1374008
URL: http://svn.apache.org/viewvc?rev=1374008&view=rev
Log:
Fix warnings and formatting, cleanup
Added:
turbine/fulcrum/trunk/security/memory/.settings/
turbine/fulcrum/trunk/security/memory/.settings/org.eclipse.jdt.core.prefs
(with props)
turbine/fulcrum/trunk/security/memory/.settings/org.maven.ide.eclipse.prefs
(with props)
Removed:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/password/
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/BaseSecurityService.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/acl/AccessControlException.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/acl/AccessControlList.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/CryptoAuthenticator.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/Group.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/Permission.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/Role.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/impl/SecurityEntityImpl.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicModelManager.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/session/Session.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractManager.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/DataBackendException.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/EntityExistsException.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/FulcrumSecurityException.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/PasswordMismatchException.java
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/UnknownEntityException.java
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/RoleSetTest.java
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/UserSetTest.java
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryRoleManagerTest.java
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/BaseSecurityService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/BaseSecurityService.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/BaseSecurityService.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/BaseSecurityService.java
Thu Aug 16 19:42:18 2012
@@ -19,9 +19,6 @@ package org.apache.fulcrum.security;
*/
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
@@ -41,7 +38,7 @@ import org.apache.avalon.framework.threa
*/
public class BaseSecurityService
extends AbstractLogEnabled
- implements SecurityService, Configurable, Initializable, Serviceable,
ThreadSafe
+ implements SecurityService, Initializable, Serviceable, ThreadSafe
{
private ServiceManager manager = null;
// management of Groups/Role/Permissions
@@ -62,6 +59,7 @@ public class BaseSecurityService
protected PermissionManager permissionManager = null;
/** The instance of ModelManager the SecurityService uses */
protected ModelManager modelManager = null;
+
/**
* Returns the configured UserManager.
*
@@ -74,7 +72,6 @@ public class BaseSecurityService
try
{
userManager = (UserManager) manager.lookup(UserManager.ROLE);
-
}
catch (ServiceException ce)
{
@@ -95,7 +92,6 @@ public class BaseSecurityService
try
{
groupManager = (GroupManager)
manager.lookup(GroupManager.ROLE);
-
}
catch (ServiceException ce)
{
@@ -116,7 +112,6 @@ public class BaseSecurityService
try
{
roleManager = (RoleManager) manager.lookup(RoleManager.ROLE);
-
}
catch (ServiceException ce)
{
@@ -125,6 +120,7 @@ public class BaseSecurityService
}
return roleManager;
}
+
/**
* Returns the configured PermissionManager.
*
@@ -137,7 +133,6 @@ public class BaseSecurityService
try
{
permissionManager = (PermissionManager)
manager.lookup(PermissionManager.ROLE);
-
}
catch (ServiceException ce)
{
@@ -146,6 +141,7 @@ public class BaseSecurityService
}
return permissionManager;
}
+
/**
* Returns the configured ModelManager.
*
@@ -158,7 +154,6 @@ public class BaseSecurityService
try
{
modelManager = (ModelManager)
manager.lookup(ModelManager.ROLE);
-
}
catch (ServiceException ce)
{
@@ -167,49 +162,42 @@ public class BaseSecurityService
}
return modelManager;
}
+
/**
* Configure a new role Manager.
*
- * @param -ermissionManager An PermissionManager object
+ * @param permissionManager An PermissionManager object
*/
// void setPermissionManager(PermissionManager permissionManager);
- /**
- * Avalon Service lifecycle method
- */
- public void configure(Configuration conf) throws ConfigurationException
- {
- }
/**
* Avalon Service lifecycle method
*/
public void service(ServiceManager manager) throws ServiceException
{
this.manager = manager;
-
-
}
+
/**
- * Avalon Service lifecycle method Initializes the SecurityService,
locating the apropriate
+ * Avalon Service lifecycle method Initializes the SecurityService,
locating the appropriate
* UserManager
*
- * @throws Exception A Problem occured while initializing the User
Manager.
+ * @throws Exception A Problem occurred while initializing the User
Manager.
*/
public void initialize() throws Exception
{
-
userClassName = null;
groupClassName = null;
permissionClassName = null;
roleClassName = null;
aclClassName = null;
}
+
/**
* Avalon Service lifecycle method
*/
public void dispose()
{
-
manager.release(userManager);
manager.release(roleManager);
manager.release(groupManager);
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/acl/AccessControlException.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/acl/AccessControlException.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/acl/AccessControlException.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/acl/AccessControlException.java
Thu Aug 16 19:42:18 2012
@@ -43,4 +43,4 @@ public class AccessControlException
{
super(msg);
}
-};
+}
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/acl/AccessControlList.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/acl/AccessControlList.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/acl/AccessControlList.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/acl/AccessControlList.java
Thu Aug 16 19:42:18 2012
@@ -32,7 +32,5 @@ import java.io.Serializable;
public interface AccessControlList
extends Serializable
{
-
-
-
+ // marker interface
}
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/CryptoAuthenticator.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/CryptoAuthenticator.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/CryptoAuthenticator.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/authenticator/CryptoAuthenticator.java
Thu Aug 16 19:42:18 2012
@@ -20,17 +20,18 @@ package org.apache.fulcrum.security.auth
import java.security.NoSuchAlgorithmException;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.fulcrum.crypto.CryptoAlgorithm;
import org.apache.fulcrum.crypto.CryptoService;
import org.apache.fulcrum.security.entity.User;
import org.apache.fulcrum.security.util.DataBackendException;
+import org.apache.fulcrum.security.util.UnknownEntityException;
/**
* This class authenticates using the Fulcrum Crypto service a user and
* their password
@@ -47,13 +48,13 @@ public class CryptoAuthenticator extends
protected CryptoService cryptoService = null;
private String algorithm;
private String cipher;
+
/**
- * Authenticate an username with the specified password. If authentication
+ * Authenticate a user with the specified password. If authentication
* is successful the method returns true. If it fails, it returns false
* If there are any problems, an exception is thrown.
*
- *
- * @param usernameAndDomain an string in the format [domain]/[username].
+ * @param user a User object.
* @param password the user supplied password.
* @exception UnknownEntityException if the user's account does not
* exist in the database.
@@ -62,7 +63,6 @@ public class CryptoAuthenticator extends
*/
public boolean authenticate(User user, String password) throws
DataBackendException
{
-
try
{
CryptoAlgorithm ca = cryptoService.getCryptoAlgorithm(algorithm);
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/Group.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/Group.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/Group.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/Group.java
Thu Aug 16 19:42:18 2012
@@ -31,7 +31,5 @@ package org.apache.fulcrum.security.enti
*/
public interface Group extends SecurityEntity
{
-
-
-
+ // empty
}
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/Permission.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/Permission.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/Permission.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/Permission.java
Thu Aug 16 19:42:18 2012
@@ -32,5 +32,5 @@ package org.apache.fulcrum.security.enti
*/
public interface Permission extends SecurityEntity
{
-
+ // empty
}
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/Role.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/Role.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/Role.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/Role.java
Thu Aug 16 19:42:18 2012
@@ -33,8 +33,5 @@ package org.apache.fulcrum.security.enti
*/
public interface Role extends SecurityEntity
{
-
-
-
-
+ // empty
}
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/impl/SecurityEntityImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/impl/SecurityEntityImpl.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/impl/SecurityEntityImpl.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/entity/impl/SecurityEntityImpl.java
Thu Aug 16 19:42:18 2012
@@ -67,14 +67,12 @@ public class SecurityEntityImpl implemen
*/
public void setName(String name)
{
- if (name != null)
+ if (name == null)
{
- // throw new InvalidParameterException("Must provide a valid name
- // for all SecurityEntities.");
- name = name.toLowerCase();
+ throw new IllegalArgumentException("Must provide a valid name for
all SecurityEntities.");
}
- this.name = name;
- // this.name = name.toLowerCase();
+
+ this.name = name.toLowerCase();
}
public String toString()
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicModelManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicModelManager.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicModelManager.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicModelManager.java
Thu Aug 16 19:42:18 2012
@@ -151,5 +151,5 @@ public interface DynamicModelManager ext
* @param delegate A
* @param delegatee B
*/
- void removeDelegate(User delegator, User delegatee) throws
DataBackendException, UnknownEntityException;;
+ void removeDelegate(User delegator, User delegatee) throws
DataBackendException, UnknownEntityException;
}
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineModelManager.java
Thu Aug 16 19:42:18 2012
@@ -34,18 +34,17 @@ import org.apache.fulcrum.security.util.
*/
public interface TurbineModelManager extends ModelManager
{
-
/**
- * The name of the <a href="#global">global group</a>
- */
+ * The name of the <a href="#global">global group</a>
+ */
String GLOBAL_GROUP_NAME = "global";
/**
- * Provides a reference to the Group object that represents the
- * <a href="#global">global group</a>.
- *
- * @return A Group object that represents the global group.
- */
+ * Provides a reference to the Group object that represents the
+ * <a href="#global">global group</a>.
+ *
+ * @return A Group object that represents the global group.
+ */
Group getGlobalGroup() throws DataBackendException;
/**
@@ -59,6 +58,7 @@ public interface TurbineModelManager ext
*/
void grant(Role role, Permission permission)
throws DataBackendException, UnknownEntityException;
+
/**
* Removes a permission from a role
*
@@ -79,6 +79,7 @@ public interface TurbineModelManager ext
* @throws UnknownEntityException if the account is not present.
*/
void revokeAll(User user) throws DataBackendException,
UnknownEntityException;
+
/**
* Revokes all permissions from a Role.
*
@@ -90,7 +91,6 @@ public interface TurbineModelManager ext
*/
void revokeAll(Role role) throws DataBackendException,
UnknownEntityException;
-
/**
* Grant an User a Role in a Group.
*
@@ -102,6 +102,7 @@ public interface TurbineModelManager ext
*/
void grant(User user, Group group, Role role)
throws DataBackendException, UnknownEntityException;
+
/**
* Revoke a Role in a Group from an User.
*
@@ -113,5 +114,4 @@ public interface TurbineModelManager ext
*/
void revoke(User user, Group group, Role role)
throws DataBackendException, UnknownEntityException;
-
}
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/session/Session.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/session/Session.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/session/Session.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/session/Session.java
Thu Aug 16 19:42:18 2012
@@ -28,4 +28,5 @@ package org.apache.fulcrum.security.sess
*/
public interface Session
{
+ // empty
}
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractManager.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractManager.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractManager.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/spi/AbstractManager.java
Thu Aug 16 19:42:18 2012
@@ -159,13 +159,12 @@ public abstract class AbstractManager
protected void release(Object obj)
{
- if(obj!=null){
+ if(obj!=null)
+ {
manager.release(obj);
- obj = null;
}
}
-
/**
* @return A resolved object
* @throws DataBackendException if the backend failed for some reason.
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/DataBackendException.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/DataBackendException.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/DataBackendException.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/DataBackendException.java
Thu Aug 16 19:42:18 2012
@@ -56,4 +56,4 @@ public class DataBackendException
{
super(msg, nested);
}
-};
+}
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/EntityExistsException.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/EntityExistsException.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/EntityExistsException.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/EntityExistsException.java
Thu Aug 16 19:42:18 2012
@@ -43,4 +43,4 @@ public class EntityExistsException
{
super(msg);
}
-};
+}
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/FulcrumSecurityException.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/FulcrumSecurityException.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/FulcrumSecurityException.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/FulcrumSecurityException.java
Thu Aug 16 19:42:18 2012
@@ -55,4 +55,4 @@ public class FulcrumSecurityException
{
super(msg, nested);
}
-};
+}
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/PasswordMismatchException.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/PasswordMismatchException.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/PasswordMismatchException.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/PasswordMismatchException.java
Thu Aug 16 19:42:18 2012
@@ -42,4 +42,4 @@ public class PasswordMismatchException
{
super(msg);
}
-};
+}
Modified:
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/UnknownEntityException.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/UnknownEntityException.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/UnknownEntityException.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/java/org/apache/fulcrum/security/util/UnknownEntityException.java
Thu Aug 16 19:42:18 2012
@@ -56,4 +56,4 @@ public class UnknownEntityException
{
super(msg, nested);
}
-};
+}
Modified:
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/RoleSetTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/RoleSetTest.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/RoleSetTest.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/RoleSetTest.java
Thu Aug 16 19:42:18 2012
@@ -68,10 +68,8 @@ public class RoleSetTest extends TestCas
role3.setName("Eric");
roleSet.add(role3);
assertTrue(roleSet.contains(role));
- assertTrue(roleSet.contains((Object) role));
assertTrue(roleSet.contains(role2));
assertTrue(roleSet.contains(role3));
- assertTrue(roleSet.contains(role));
}
public void testRoleSetWithSubclass() throws Exception
Modified:
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/UserSetTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/UserSetTest.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/UserSetTest.java
(original)
+++
turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/UserSetTest.java
Thu Aug 16 19:42:18 2012
@@ -62,11 +62,7 @@ public class UserSetTest extends TestCas
user3.setId(new Integer(1));
user3.setName("Eric");
assertTrue(userSet.contains(user));
- assertTrue(userSet.contains((Object) user));
assertTrue(userSet.contains(user2));
assertTrue(userSet.contains(user3));
- assertTrue(userSet.contains(user));
-
}
-
}
Added:
turbine/fulcrum/trunk/security/memory/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/.settings/org.eclipse.jdt.core.prefs?rev=1374008&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/memory/.settings/org.eclipse.jdt.core.prefs
(added)
+++ turbine/fulcrum/trunk/security/memory/.settings/org.eclipse.jdt.core.prefs
Thu Aug 16 19:42:18 2012
@@ -0,0 +1,6 @@
+#Thu Aug 16 20:16:16 CEST 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
Propchange:
turbine/fulcrum/trunk/security/memory/.settings/org.eclipse.jdt.core.prefs
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
turbine/fulcrum/trunk/security/memory/.settings/org.maven.ide.eclipse.prefs
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/.settings/org.maven.ide.eclipse.prefs?rev=1374008&view=auto
==============================================================================
--- turbine/fulcrum/trunk/security/memory/.settings/org.maven.ide.eclipse.prefs
(added)
+++ turbine/fulcrum/trunk/security/memory/.settings/org.maven.ide.eclipse.prefs
Thu Aug 16 19:42:18 2012
@@ -0,0 +1,8 @@
+#Mon Sep 12 21:14:22 CEST 2011
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Propchange:
turbine/fulcrum/trunk/security/memory/.settings/org.maven.ide.eclipse.prefs
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryPermissionManagerImpl.java
Thu Aug 16 19:42:18 2012
@@ -52,6 +52,7 @@ public class MemoryPermissionManagerImpl
{
return new PermissionSet(permissions);
}
+
/**
* Renames an existing Permission.
*
@@ -77,15 +78,13 @@ public class MemoryPermissionManagerImpl
return;
}
}
- catch (Exception e)
+ catch (DataBackendException e)
{
throw new DataBackendException(
"renamePermission(Permission,name)",
e);
}
- finally
- {
- }
+
throw new UnknownEntityException(
"Unknown permission '" + permission + "'");
}
@@ -121,21 +120,18 @@ public class MemoryPermissionManagerImpl
if (permissionExists)
{
permissions.remove(permission);
- }
- else
- {
- throw new UnknownEntityException(
- "Unknown permission '" + permission + "'");
+ return;
}
}
- catch (Exception e)
+ catch (DataBackendException e)
{
throw new DataBackendException("removePermission(Permission)", e);
}
- finally
- {
- }
+
+ throw new UnknownEntityException(
+ "Unknown permission '" + permission + "'");
}
+
/**
* Creates a new permission with specified attributes.
*
@@ -147,11 +143,8 @@ public class MemoryPermissionManagerImpl
protected synchronized Permission persistNewPermission(Permission
permission)
throws DataBackendException
{
-
permission.setId(MemoryHelper.getUniqueId());
permissions.add(permission);
return permission;
-
}
-
}
Modified:
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java
(original)
+++
turbine/fulcrum/trunk/security/memory/src/java/org/apache/fulcrum/security/memory/MemoryRoleManagerImpl.java
Thu Aug 16 19:42:18 2012
@@ -67,13 +67,11 @@ public class MemoryRoleManagerImpl exten
return;
}
}
- catch (Exception e)
+ catch (DataBackendException e)
{
throw new DataBackendException("renameRole(Role,String)", e);
}
- finally
- {
- }
+
throw new UnknownEntityException("Unknown role '" + role + "'");
}
@@ -89,38 +87,37 @@ public class MemoryRoleManagerImpl exten
{
return MemoryHelper.checkExists(roles,roleName);
}
+
/**
- * Retrieves all roles defined in the system.
- *
- * @return the names of all roles defined in the system.
- * @throws DataBackendException if there was an error accessing
the
- * data backend.
- */
+ * Retrieves all roles defined in the system.
+ *
+ * @return the names of all roles defined in the system.
+ * @throws DataBackendException if there was an error accessing the
+ * data backend.
+ */
public RoleSet getAllRoles() throws DataBackendException
{
return new RoleSet(roles);
}
/**
- * Creates a new role with specified attributes.
- *
- * @param role the object describing the role to be created.
- * @return a new Role object that has id set up properly.
- * @throws DataBackendException if there was an error accessing the data
- * backend.
- * @throws EntityExistsException if the role already exists.
- */
+ * Creates a new role with specified attributes.
+ *
+ * @param role the object describing the role to be created.
+ * @return a new Role object that has id set up properly.
+ * @throws DataBackendException if there was an error accessing the data
+ * backend.
+ * @throws EntityExistsException if the role already exists.
+ */
protected synchronized Role persistNewRole(Role role)
throws DataBackendException
{
-
role.setId(MemoryHelper.getUniqueId());
roles.add(role);
// add the role to system-wide cache
getAllRoles().add(role);
// return the object with correct id
return role;
-
}
/**
@@ -145,14 +142,11 @@ public class MemoryRoleManagerImpl exten
return;
}
}
- catch (Exception e)
+ catch (DataBackendException e)
{
throw new DataBackendException("removeRole(Role)", e);
}
- finally
- {
- }
+
throw new UnknownEntityException("Unknown role '" + role + "'");
}
-
}
Modified:
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryRoleManagerTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryRoleManagerTest.java?rev=1374008&r1=1374007&r2=1374008&view=diff
==============================================================================
---
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryRoleManagerTest.java
(original)
+++
turbine/fulcrum/trunk/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryRoleManagerTest.java
Thu Aug 16 19:42:18 2012
@@ -18,7 +18,6 @@ package org.apache.fulcrum.security.memo
* under the License.
*/
-import org.apache.fulcrum.security.RoleManager;
import org.apache.fulcrum.security.SecurityService;
import org.apache.fulcrum.security.model.test.AbstractRoleManagerTest;
/**
@@ -36,7 +35,7 @@ public class MemoryRoleManagerTest exten
this.setRoleFileName("src/test/DynamicMemoryRoleConfig.xml");
this.setConfigurationFileName("src/test/DynamicMemoryComponentConfig.xml");
securityService = (SecurityService)
lookup(SecurityService.ROLE);
- roleManager = (RoleManager) securityService.getRoleManager();
+ roleManager = securityService.getRoleManager();
}
catch (Exception e)
{
