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 2003/08/15 11:49:47 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/ac2 DefaultAccessController.java UserAuthenticator.java
andreas 2003/08/15 02:49:47
Modified: src/java/org/apache/lenya/cms/ac2
DefaultAccessController.java UserAuthenticator.java
Log:
improved logging messages
Revision Changes Path
1.13 +6 -8 cocoon-lenya/src/java/org/apache/lenya/cms/ac2/DefaultAccessController.java
Index: DefaultAccessController.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac2/DefaultAccessController.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultAccessController.java 13 Aug 2003 13:13:36 -0000 1.12
+++ DefaultAccessController.java 15 Aug 2003 09:49:47 -0000 1.13
@@ -139,10 +139,8 @@
authorized
&& authorizers[i].authorize(request);
- if (getLogger().isDebugEnabled()) {
- getLogger().debug(
- "Authorizer [" + authorizers[i] + "] returned [" + authorized + "]");
- }
+ getLogger().info(
+ "Authorizer [" + authorizers[i] + "] returned [" + authorized + "]");
i++;
}
@@ -191,7 +189,7 @@
configuration.getChild(ACCREDITABLE_MANAGER_ELEMENT);
String accreditableManagerType =
accreditableManagerConfiguration.getAttribute(TYPE_ATTRIBUTE);
- getLogger().debug("AccreditableManager type: [" + accreditableManagerType + "]");
+ getLogger().info("AccreditableManager type: [" + accreditableManagerType + "]");
accreditableManagerSelector =
(ServiceSelector) manager.lookup(AccreditableManager.ROLE + "Selector");
@@ -214,7 +212,7 @@
String type = authorizerConfigurations[i].getAttribute(TYPE_ATTRIBUTE);
Authorizer authorizer = (Authorizer) authorizerSelector.select(type);
authorizers.put(type, authorizer);
- getLogger().debug("Adding authorizer [" + type + "]");
+ getLogger().info("Adding authorizer [" + type + "]");
}
}
@@ -248,7 +246,7 @@
String policyManagerType = policyManagerConfiguration.getAttribute(TYPE_ATTRIBUTE);
policyManagerSelector = (ServiceSelector) manager.lookup(PolicyManager.ROLE + "Selector");
policyManager = (PolicyManager) policyManagerSelector.select(policyManagerType);
- getLogger().debug("Policy manager type: [" + policyManagerType + "]");
+ getLogger().info("Policy manager type: [" + policyManagerType + "]");
}
/**
1.5 +8 -6 cocoon-lenya/src/java/org/apache/lenya/cms/ac2/UserAuthenticator.java
Index: UserAuthenticator.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/ac2/UserAuthenticator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UserAuthenticator.java 7 Aug 2003 14:53:43 -0000 1.4
+++ UserAuthenticator.java 15 Aug 2003 09:49:47 -0000 1.5
@@ -74,7 +74,9 @@
String username = request.getParameter("username");
String password = request.getParameter("password");
- getLogger().debug("Authenticating username [" + username + "] with password [" + password + "]");
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Authenticating username [" + username + "] with password [" + password + "]");
+ }
if (username == null || password == null) {
throw new AccessControlException("Username or password is null!");
@@ -105,12 +107,12 @@
User user = accreditableManager.getUserManager().getUser(username);
if (getLogger().isDebugEnabled()) {
- getLogger().debug("Authenticating user: " + user);
+ getLogger().debug("Authenticating user: [" + user + "]");
}
boolean authenticated = false;
if (user != null && user.authenticate(password)) {
- getLogger().debug("User [" + user + "] authenticated.");
+ getLogger().info("User [" + user + "] authenticated.");
if (!identity.contains(user)) {
identity.addIdentifiable(user);
}
@@ -118,9 +120,9 @@
}
else {
if (user == null) {
- getLogger().warn(".authenticate(): No such user: " + username);
+ getLogger().warn("No such user: [" + username + "]");
}
- getLogger().warn(".authenticate(): User [" + username + "] not authenticated.");
+ getLogger().warn("User [" + username + "] not authenticated.");
}
return authenticated;
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org