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/13 19:11:14 UTC
svn commit: r495941 - in /cocoon/trunk/blocks:
cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/StandardApplication.java
cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/auth-cauth.xml
Author: cziegeler
Date: Sat Jan 13 10:11:13 2007
New Revision: 495941
URL: http://svn.apache.org/viewvc?view=rev&rev=495941
Log:
Use spring configuration
Modified:
cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/StandardApplication.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/auth-cauth.xml
Modified: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/StandardApplication.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/StandardApplication.java?view=diff&rev=495941&r1=495940&r2=495941
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/StandardApplication.java (original)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/StandardApplication.java Sat Jan 13 10:11:13 2007
@@ -61,11 +61,6 @@
protected ApplicationStore store;
public void setSecurityHandler(SecurityHandler h) {
- System.out.println("************************************************************");
- System.out.println("* *");
- System.out.println("* Set *" + h);
- System.out.println("* *");
- System.out.println("************************************************************");
this.handler = h;
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/auth-cauth.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/auth-cauth.xml?view=diff&rev=495941&r1=495940&r2=495941
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/auth-cauth.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/auth-cauth.xml Sat Jan 13 10:11:13 2007
@@ -36,12 +36,14 @@
<bean name="org.apache.cocoon.auth.SecurityHandler/portal"
class="org.apache.cocoon.auth.impl.PipelineSecurityHandler"
scope="singleton">
+ <property name="sourceResolver" ref="org.apache.excalibur.source.SourceResolver"/>
<property name="authenticationResource" value="cocoon:raw:/sunrise-authuser"/>
</bean>
<bean name="org.apache.cocoon.auth.Application/portal"
class="org.apache.cocoon.auth.portal.StandardPortalApplication"
scope="singleton">
+ <property name="portalService" ref="org.apache.cocoon.portal.PortalService"/>
<property name="securityHandler" ref="org.apache.cocoon.auth.SecurityHandler/portal"/>
</bean>