You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/08/21 12:39:43 UTC
svn commit: r234176 - in /cocoon/branches/BRANCH_2_1_X/src/blocks/portal:
conf/cocoon-portal-cowarp.xconf
java/org/apache/cocoon/portal/security/DBSecurityHandler.java
Author: cziegeler
Date: Sun Aug 21 03:39:27 2005
New Revision: 234176
URL: http://svn.apache.org/viewcvs?rev=234176&view=rev
Log:
Fix config and remove system.out
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/cocoon-portal-cowarp.xconf
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/security/DBSecurityHandler.java
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/cocoon-portal-cowarp.xconf
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/cocoon-portal-cowarp.xconf?rev=234176&r1=234175&r2=234176&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/cocoon-portal-cowarp.xconf (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/cocoon-portal-cowarp.xconf Sun Aug 21 03:39:27 2005
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!--+
- |
+ | This is the authentication configuration for CoWarp.
| SVN $Id$
+-->
<xconf xpath="/cocoon" unless="component[@role='org.osoco.cowarp.ApplicationManager']">
@@ -24,7 +24,6 @@
<!-- This security handler uses OJB and the hsqldb for the authentication: -->
<component role="org.osoco.cowarp.SecurityHandler/portal"
class="org.apache.cocoon.portal.security.DBSecurityHandler"/>
- </component>
<!-- If you want to use a pipeline for the authentication use this configuration:
<component role="org.osoco.cowarp.SecurityHandler/portal"
class="org.osoco.cowarp.impl.PipelineSecurityHandler">
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/security/DBSecurityHandler.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/security/DBSecurityHandler.java?rev=234176&r1=234175&r2=234176&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/security/DBSecurityHandler.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/security/DBSecurityHandler.java Sun Aug 21 03:39:27 2005
@@ -29,7 +29,7 @@
import org.osoco.cowarp.ApplicationManager;
/**
- * @version $Id:$
+ * @version $Id$
*/
public class DBSecurityHandler
extends AbstractSecurityHandler {
@@ -57,7 +57,9 @@
pUser.setLastname(u.getLastname());
pUser.setPassword(u.getPassword());
pUser.setRole(u.getRole());
- System.out.println("Loggedin as: " + u.getFirstname() + " " + u.getLastname() + " (" + u.getUsername() + " " + u.getRole() +")");
+ if ( this.getLogger().isInfoEnabled() ) {
+ this.getLogger().info("Loggedin as: " + u.getFirstname() + " " + u.getLastname() + " (" + u.getUsername() + " " + u.getRole() +")");
+ }
return pUser;
}
} finally {