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 2007/01/12 18:47:27 UTC
svn commit: r495656 - in
/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample: pom.xml
src/main/java/org/apache/cocoon/portal/security/DBSecurityHandler.java
src/main/resources/COB-INF/config/avalon/auth-cauth.xconf
Author: cziegeler
Date: Fri Jan 12 09:47:23 2007
New Revision: 495656
URL: http://svn.apache.org/viewvc?view=rev&rev=495656
Log:
Disable OJB based authentication
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/pom.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/security/DBSecurityHandler.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/auth-cauth.xconf
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/pom.xml?view=diff&rev=495656&r1=495655&r2=495656
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/pom.xml Fri Jan 12 09:47:23 2007
@@ -60,21 +60,6 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-ojb-sample</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-databases-hsqldb-server</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-databases-hsqldb-client</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-portal-auth-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/security/DBSecurityHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/security/DBSecurityHandler.java?view=diff&rev=495656&r1=495655&r2=495656
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/security/DBSecurityHandler.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/security/DBSecurityHandler.java Fri Jan 12 09:47:23 2007
@@ -16,21 +16,13 @@
*/
package org.apache.cocoon.portal.security;
-import java.util.Collection;
import java.util.Map;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.auth.AbstractSecurityHandler;
-import org.apache.cocoon.auth.ApplicationManager;
import org.apache.cocoon.auth.SecurityHandler;
-import org.apache.cocoon.ojb.samples.bean.User;
-import org.apache.ojb.broker.PersistenceBroker;
-import org.apache.ojb.broker.PersistenceBrokerFactory;
-import org.apache.ojb.broker.query.Criteria;
-import org.apache.ojb.broker.query.Query;
-import org.apache.ojb.broker.query.QueryByCriteria;
/**
+ * FIXME - We commented everything out to avoid a dependency to OJB for
* @version $Id$
*/
public class DBSecurityHandler
@@ -40,6 +32,7 @@
* @see SecurityHandler#login(Map)
*/
public org.apache.cocoon.auth.User login(Map loginContext) throws Exception {
+ /*
PersistenceBroker broker = PersistenceBrokerFactory.defaultPersistenceBroker();
try {
@@ -66,7 +59,7 @@
}
} finally {
broker.close();
- }
+ }*/
return null;
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/auth-cauth.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/auth-cauth.xconf?view=diff&rev=495656&r1=495655&r2=495656
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/auth-cauth.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/auth-cauth.xconf Fri Jan 12 09:47:23 2007
@@ -24,15 +24,17 @@
<!-- Include CAuth components. -->
<include src="resource://org/apache/cocoon/auth/roles.xconf"/>
- <!-- This security handler uses OJB and the hsqldb for the authentication: -->
+ <!-- This security handler uses OJB and the hsqldb for the authentication:
<component role="org.apache.cocoon.auth.SecurityHandler/portal"
class="org.apache.cocoon.portal.security.DBSecurityHandler"/>
- <!-- If you want to use a pipeline for the authentication use this configuration:
- <component role="org.apache.cocoon.auth.SecurityHandler/portal"
- class="org.apache.cocoon.auth.impl.PipelineSecurityHandler">
- <authentication-resource>cocoon:raw:/sunrise-authuser</authentication-resource>
- </component>
-->
+ <!-- If you want to use a pipeline for the authentication use this configuration: -->
+
+ <component role="org.apache.cocoon.auth.SecurityHandler/portal"
+ class="org.apache.cocoon.auth.impl.PipelineSecurityHandler">
+ <authentication-resource>cocoon:raw:/sunrise-authuser</authentication-resource>
+ </component>
+
<component role="org.apache.cocoon.auth.Application/portal"
class="org.apache.cocoon.auth.portal.StandardPortalApplication"
security-handler="portal"/>