You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/11/21 14:04:10 UTC
svn commit: r597063 -
/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java
Author: andreas
Date: Wed Nov 21 05:04:09 2007
New Revision: 597063
URL: http://svn.apache.org/viewvc?rev=597063&view=rev
Log:
[minor change] Removed nop constructor, code formatting
Modified:
lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java
Modified: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java?rev=597063&r1=597062&r2=597063&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java (original)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java Wed Nov 21 05:04:09 2007
@@ -56,57 +56,31 @@
public class AccessControl extends AccessControlUsecase {
protected static final String AC_AREA = "acArea";
-
protected static final String ADD = "add";
-
protected static final String DELETE = "delete";
-
protected static final String UP = "up";
-
protected static final String DOWN = "down";
-
protected static final String USER = "user";
-
protected static final String GROUP = "group";
-
protected static final String IPRANGE = "ipRange";
-
protected static final String WORLD = "world";
-
protected static final String ROLE = "role";
-
protected static final String SUB_USER = "subuser";
-
protected static final String SUB_GROUP = "subgroup";
-
protected static final String SUB_IPRANGE = "subipRange";
private static String[] types = { USER, GROUP, IPRANGE, SUB_USER, SUB_GROUP, SUB_IPRANGE, WORLD };
-
private static String[] operations = { ADD, DELETE, DOWN, UP };
protected static final String SSL = "ssl";
-
protected static final String ANCESTOR_SSL = "ancestorSsl";
-
protected static final String DOCUMENT = "document";
-
protected static final String SUB_CREDENTIALS = "subCredentials";
-
protected static final String PARENT_CREDENTIALS = "parentCredentials";
-
private static final String METHOD = "method";
-
private String COMPLETE_AREA = "private.completeArea";
/**
- * Ctor.
- */
- public AccessControl() {
- super();
- }
-
- /**
* @see org.apache.lenya.cms.usecase.AbstractUsecase#initParameters()
*/
protected void initParameters() {
@@ -208,8 +182,8 @@
if (operations[j].equals(ADD)) {
ModifiablePolicy policy = getPolicy();
if (containsCredential(policy, item, role)) {
- addErrorMessage("credential-already-contained",
- new String[] { ((Item) item).getId(), role.getId() });
+ addErrorMessage("credential-already-contained", new String[] {
+ ((Item) item).getId(), role.getId() });
}
}
}
@@ -340,7 +314,7 @@
String method) throws ProcessingException {
try {
ModifiablePolicy policy = getPolicy();
-
+
if (operation.equals(ADD)) {
policy.addRole(accreditable, role, method);
} else if (operation.equals(DELETE)) {
@@ -358,12 +332,12 @@
}
protected ModifiablePolicy getPolicy() throws AccessControlException {
- return (ModifiablePolicy) getPolicyManager().buildSubtreePolicy(
- getAccreditableManager(), getPolicyURL());
+ return (ModifiablePolicy) getPolicyManager().buildSubtreePolicy(getAccreditableManager(),
+ getPolicyURL());
}
- protected boolean containsCredential(ModifiablePolicy policy, Accreditable accreditable, Role role)
- throws AccessControlException {
+ protected boolean containsCredential(ModifiablePolicy policy, Accreditable accreditable,
+ Role role) throws AccessControlException {
Credential[] credentials = policy.getCredentials();
boolean contains = false;
int i = 0;
@@ -435,7 +409,7 @@
* Returns the policies for a certain URL.
*
* @param inherit If true, all ancestor policies are returned. Otherwise,
- * only the URL policies are returned.
+ * only the URL policies are returned.
* @return An array of DefaultPolicy objects.
* @throws ProcessingException when something went wrong.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org