cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r414859 - in /cocoon/branches/BRANCH_2_1_X: ./ legal/ lib/ lib/optional/ src/blocks/auth/java/org/apache/cocoon/auth/impl/ src/blocks/auth/java/org/apache/cocoon/auth/portal/ src/blocks/portal/conf/ src/blocks/portal/java/org/apache/cocoon/...
Date Fri, 16 Jun 2006 16:52:18 GMT
Author: cziegeler
Date: Fri Jun 16 09:52:17 2006
New Revision: 414859

URL: http://svn.apache.org/viewvc?rev=414859&view=rev
Log:
Contribution of CoWarp 0.4 to Cocoon 2.1.x

Added:
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/auth/
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/auth/portal/
      - copied from r414856, cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/portal/
Removed:
    cocoon/branches/BRANCH_2_1_X/legal/cowarp-0.4.jar.license.txt
    cocoon/branches/BRANCH_2_1_X/lib/optional/cowarp-0.4.jar
    cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/impl/ServletSessionListener.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/portal/
Modified:
    cocoon/branches/BRANCH_2_1_X/gump.xml
    cocoon/branches/BRANCH_2_1_X/lib/jars.xml
    cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/impl/StandardApplicationManager.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/authportal.samplesxconf
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/auth/portal/PortalApplication.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/auth/portal/StandardPortalApplication.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/auth/portal/UserInfoProviderImpl.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/security/DBSecurityHandler.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/security/PortalUser.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/basket/sitemap.xmap
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap.xmap
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/tools/sitemap.xmap

Modified: cocoon/branches/BRANCH_2_1_X/gump.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/gump.xml?rev=414859&r1=414858&r2=414859&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/gump.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/gump.xml Fri Jun 16 09:52:17 2006
@@ -326,6 +326,26 @@
     <nag from="Gump &lt;general@gump.apache.org&gt;" to="dev@cocoon.apache.org"/>
   </project>
 
+  <project name="cocoon-block-auth" status="unstable" dir="src/blocks/auth">
+    <package>org.apache.cocoon</package>
+
+    <description>Components for the authentication framework</description>
+
+    <ant target="gump-block">
+      <property name="block-name" value="auth"/>
+      <property name="version" value="@@DATE@@"/>
+    </ant>
+
+    <depend project="cocoon" inherit="all"/>
+
+    <work nested="tools/anttasks"/>
+    <home nested="build/cocoon-@@DATE@@"/>
+
+    <jar name="blocks/auth-block.jar"/>
+
+    <nag from="Gump &lt;general@gump.apache.org&gt;" to="dev@cocoon.apache.org"/>
+  </project>
+
   <project name="cocoon-block-portal-fw" status="deprecated" dir="src/blocks/portal-fw">
     <package>org.apache.cocoon</package>
 
@@ -1034,6 +1054,7 @@
 
     <depend project="cocoon" inherit="all"/>
     <depend project="cocoon-block-session-fw"/>
+    <depend project="cocoon-block-auth"/>
     <depend project="cocoon-block-authentication-fw"/>
     <depend project="cocoon-block-forms"/>
     <depend project="cocoon-block-cron"/>
@@ -1044,7 +1065,6 @@
     <depend project="commons-collections"/>
     <depend project="portals-pluto" inherit="runtime"/>
     <depend project="portals-bridges-common"/>
-    <depend project="cowarp"/>
     <depend project="ws-axis"/>
     <depend project="wsdl4j"/>
     <depend project="wsrp4j"/>
@@ -1057,7 +1077,6 @@
     <library name="pluto"/>
     <library name="portlet-api"/>
     <library name="portals-bridges-common"/>
-    <library name="cowarp"/>
     <library name="axis"/>
     <library name="axis-saaj"/>
     <library name="axis-jaxrpc"/>
@@ -1868,12 +1887,6 @@
     <url href="http://incubator.apache.org/jackrabbit"/>
     <package>org.apache.jackrabbit</package>
     <jar name="lib/optional/jackrabbit-20050422T153417.jar"/>
-  </project>
-
-  <project name="cowarp">
-    <url href="http://osoco.sourceforge.net/cowarp/"/>
-    <package>org.osoco.cowarp</package>
-    <jar name="lib/optional/cowarp-0.4.jar"/>
   </project>
 
   <project name="wsrp4j">

Modified: cocoon/branches/BRANCH_2_1_X/lib/jars.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/lib/jars.xml?rev=414859&r1=414858&r2=414859&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/lib/jars.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/lib/jars.xml Fri Jun 16 09:52:17 2006
@@ -1128,16 +1128,6 @@
     <lib>optional/portals-bridges-common-1.0.jar</lib>
     <homepage>http://portals.apache.org/bridges/</homepage>
   </file>
-  <file id="cowarp">
-    <title>CoWarp</title>
-    <description>
-      A web application framework for Cocoon providing an authentication mechanism
-      with special support for the portal.
-    </description>
-    <used-by>Portal</used-by>
-    <lib>optional/cowarp-0.4.jar</lib>
-    <homepage>http://osoco.sourceforge.net/cowarp/</homepage>
-  </file>
 
   <file>
     <title>Jakarta BCEL</title>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/impl/StandardApplicationManager.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/impl/StandardApplicationManager.java?rev=414859&r1=414858&r2=414859&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/impl/StandardApplicationManager.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/auth/java/org/apache/cocoon/auth/impl/StandardApplicationManager.java
Fri Jun 16 09:52:17 2006
@@ -297,37 +297,4 @@
             }
         }
     }
-
-    /**
-     * Logs the user out of all applications.
-     * This method has not been tested yet.
-     * @param session The corresponding session
-     */
-    public static void logoutFromAllApplications(final HttpSession session) {
-        final Map loginInfos = (Map)session.getAttribute(LOGIN_INFO_KEY);
-        if ( loginInfos != null ) {
-            final StandardApplicationManager appManager =
-                  (StandardApplicationManager)session.getServletContext()
-                                  .getAttribute(StandardApplicationManager.class.getName());
-            final Iterator i = loginInfos.values().iterator();
-            while ( i.hasNext() ) {
-                final LoginInfo info = (LoginInfo)i.next();
-                if ( info.isUsed() ) {
-                    final Iterator appIter = info.getApplications().iterator();
-                    SecurityHandler handler = null;
-                    while ( appIter.hasNext() ) {
-                        final String appName = (String)appIter.next();
-                        try {
-                            final Application app = appManager.getApplication(appName);
-                            app.userWillLogout(info.getUser(), null);
-                            handler = app.getSecurityHandler();
-                        } catch (Exception ignore) {
-                            // we ignore this
-                        }
-                    }
-                    handler.logout(null, info.getUser());
-                }
-            }
-        }
-    }
 }

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/authportal.samplesxconf
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/authportal.samplesxconf?rev=414859&r1=414858&r2=414859&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/authportal.samplesxconf (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/authportal.samplesxconf Fri Jun 16
09:52:17 2006
@@ -20,9 +20,9 @@
 
     <portal name="portal">
       <!-- This is the sample portal: 
-         - we use the cowarp profile manager
+         - we use the cauth profile manager
        -->
-      <profile-manager>org.apache.cocoon.portal.profile.ProfileManager/Cowarp</profile-manager>
+      <profile-manager>org.apache.cocoon.portal.profile.ProfileManager/CAuth</profile-manager>
       <!-- If you want to use the authentication framework, comment out the above line
            and uncomment the following line:
         <profile-manager>org.apache.cocoon.portal.profile.ProfileManager/Auth</profile-manager>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf?rev=414859&r1=414858&r2=414859&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf Fri Jun 16 09:52:17
2006
@@ -124,21 +124,18 @@
     <urlPath>true</urlPath>
     -->
   </component>
-  <component role="org.osoco.cowarp.ApplicationManager"
-             class="org.osoco.cowarp.impl.StandardApplicationManager"/>
-
   
   <!-- This security handler makes use of a pipeline for the authentication: -->
-  <component role="org.osoco.cowarp.SecurityHandler/portal" 
-             class="org.osoco.cowarp.impl.PipelineSecurityHandler">
+  <component role="org.apache.cocoon.auth.SecurityHandler/portal" 
+             class="org.apache.cocoon.auth.impl.PipelineSecurityHandler">
     <authentication-resource>cocoon:raw:/sunrise-authuser</authentication-resource>
   </component>
   <!-- This security handler uses OJB and the hsqldb for the authentication (JDK 1.4 required):
-    <component role="org.osoco.cowarp.SecurityHandler/portal" 
-               class="org.apache.cocoon.portal.security.DBSecurityHandler"/>
+    <component role="org.apache.cocoon.auth.SecurityHandler/portal" 
+               class="org.apache.cocoon.auth.portal.security.DBSecurityHandler"/>
   -->
-  <component role="org.osoco.cowarp.Application/portal" 
-             class="org.osoco.cowarp.portal.StandardPortalApplication" 
+  <component role="org.apache.cocoon.auth.Application/portal" 
+             class="org.apache.cocoon.auth.portal.StandardPortalApplication" 
              security-handler="portal">
     <profiles>
       <copletbasedata-global-load uri="cocoon:raw:/load-global-profile?profile=copletbasedata"/>
@@ -155,8 +152,8 @@
       <layout-user-save uri="cocoon:raw:/save-user-profile?profile=layout"/>
     </profiles>
   </component>
-  <component class="org.apache.cocoon.portal.profile.impl.GroupBasedProfileManager" logger="portal"
role="org.apache.cocoon.portal.profile.ProfileManager/Cowarp">
-    <parameter name="userinfo-provider" value="org.osoco.cowarp.portal.UserInfoProviderImpl"/>
+  <component class="org.apache.cocoon.portal.profile.impl.GroupBasedProfileManager" logger="portal"
role="org.apache.cocoon.portal.profile.ProfileManager/CAuth">
+    <parameter name="userinfo-provider" value="org.apache.cocoon.auth.portal.UserInfoProviderImpl"/>
   </component>
 
   <component class="org.apache.cocoon.components.persistence.CastorSourceConverter"

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/auth/portal/PortalApplication.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/auth/portal/PortalApplication.java?rev=414859&r1=414856&r2=414859&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/auth/portal/PortalApplication.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/auth/portal/PortalApplication.java
Fri Jun 16 09:52:17 2006
@@ -21,7 +21,8 @@
 
 /**
  * The current portal application.
- *
+ * Note: This class belongs to cauth but has to be defined in the portal block for now.
+ *       This will be cleaned up with Cocoon 2.2.
  * @version $Id$
 */
 public interface PortalApplication

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/auth/portal/StandardPortalApplication.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/auth/portal/StandardPortalApplication.java?rev=414859&r1=414856&r2=414859&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/auth/portal/StandardPortalApplication.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/auth/portal/StandardPortalApplication.java
Fri Jun 16 09:52:17 2006
@@ -27,7 +27,8 @@
 
 /**
  * This is a default implementation for a portal application.
- *
+ * Note: This class belongs to cauth but has to be defined in the portal block for now.
+ *       This will be cleaned up with Cocoon 2.2.
  * @version $Id$
 */
 public class StandardPortalApplication

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/auth/portal/UserInfoProviderImpl.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/auth/portal/UserInfoProviderImpl.java?rev=414859&r1=414856&r2=414859&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/auth/portal/UserInfoProviderImpl.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/auth/portal/UserInfoProviderImpl.java
Fri Jun 16 09:52:17 2006
@@ -29,7 +29,8 @@
 /**
  * Get the information about the current user.
  * This implementation uses CAuth.
- *
+ * Note: This class belongs to cauth but has to be defined in the portal block for now.
+ *       This will be cleaned up with Cocoon 2.2.
  * @version $Id$
  */
 public class UserInfoProviderImpl

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/security/DBSecurityHandler.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/security/DBSecurityHandler.java?rev=414859&r1=414858&r2=414859&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
Fri Jun 16 09:52:17 2006
@@ -25,8 +25,8 @@
 import org.apache.ojb.broker.query.Criteria;
 import org.apache.ojb.broker.query.Query;
 import org.apache.ojb.broker.query.QueryByCriteria;
-import org.osoco.cowarp.AbstractSecurityHandler;
-import org.osoco.cowarp.ApplicationManager;
+import org.apache.cocoon.auth.AbstractSecurityHandler;
+import org.apache.cocoon.auth.ApplicationManager;
 
 /**
  * @version $Id$
@@ -35,9 +35,9 @@
     extends AbstractSecurityHandler {
 
     /**
-     * @see org.osoco.cowarp.SecurityHandler#login(Map)
+     * @see org.apache.cocoon.auth.SecurityHandler#login(Map)
      */
-    public org.osoco.cowarp.User login(Map loginContext) throws Exception {
+    public org.apache.cocoon.auth.User login(Map loginContext) throws Exception {
         PersistenceBroker broker = PersistenceBrokerFactory.defaultPersistenceBroker();
 
         try {
@@ -69,9 +69,9 @@
     }
     
     /**
-     * @see org.osoco.cowarp.SecurityHandler#logout(Map, org.osoco.cowarp.User)
+     * @see org.apache.cocoon.auth.SecurityHandler#logout(Map, org.apache.cocoon.auth.User)
      */
-    public void logout(Map context, org.osoco.cowarp.User user) {
+    public void logout(Map context, org.apache.cocoon.auth.User user) {
         // nothing to do
     }
 }

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/security/PortalUser.java
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/security/PortalUser.java?rev=414859&r1=414858&r2=414859&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/security/PortalUser.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/security/PortalUser.java
Fri Jun 16 09:52:17 2006
@@ -17,10 +17,10 @@
 
 import java.util.ArrayList;
 
-import org.osoco.cowarp.StandardUser;
+import org.apache.cocoon.auth.StandardUser;
 
 /**
- * @version $Id:$
+ * @version $Id$
  */
 public class PortalUser extends StandardUser {
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/basket/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/basket/sitemap.xmap?rev=414859&r1=414858&r2=414859&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/basket/sitemap.xmap (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/basket/sitemap.xmap Fri
Jun 16 09:52:17 2006
@@ -217,7 +217,7 @@
           <map:parameter name="handler" value="portal-handler"/>
           <map:parameter name="application" value="portal"/>
          -->
-        <map:act type="cowarp-is-logged-in">
+        <map:act type="cauth-is-logged-in">
           <map:parameter name="application" value="portal"/>
  
           <map:select type="resource-exists">

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap.xmap?rev=414859&r1=414858&r2=414859&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap.xmap (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap.xmap Fri Jun 16 09:52:17
2006
@@ -73,18 +73,18 @@
       <map:action name="portal-urlhelper"
                   src="org.apache.cocoon.portal.acting.URLAction"/>
 
-      <map:action name="cowarp-is-logged-in"
-                  src="org.osoco.cowarp.acting.LoggedInAction"/>
-      <map:action name="cowarp-login"
-                  src="org.osoco.cowarp.acting.LoginAction"/>
-      <map:action name="cowarp-logout"
-                  src="org.osoco.cowarp.acting.LogoutAction"/>
+      <map:action name="cauth-is-logged-in"
+                  src="org.apache.cocoon.auth.acting.LoggedInAction"/>
+      <map:action name="cauth-login"
+                  src="org.apache.cocoon.auth.acting.LoginAction"/>
+      <map:action name="cauth-logout"
+                  src="org.apache.cocoon.auth.acting.LogoutAction"/>
     </map:actions>
   </map:components>
 
   <map:resources>
     <map:resource name="show-portal">
-      <map:act type="cowarp-is-logged-in">
+      <map:act type="cauth-is-logged-in">
         <map:parameter name="application" value="portal"/>
 
         <map:generate type="portal" label="content"/>
@@ -210,11 +210,11 @@
       </map:match>
 
       <!-- Do an auto login as anonymous -->
-      <map:act type="cowarp-is-logged-in">
+      <map:act type="cauth-is-logged-in">
         <map:parameter name="application" value="portal"/>
         <map:parameter name="negate-result" value="true"/>
 
-        <map:act type="cowarp-login">
+        <map:act type="cauth-login">
           <map:parameter name="application" value="portal"/>
 
           <map:parameter name="name" value="anonymous"/>
@@ -229,7 +229,7 @@
 
       <!-- Test pipeline for bookmark -->
       <map:match pattern="bookmark">
-        <map:act type="cowarp-is-logged-in">
+        <map:act type="cauth-is-logged-in">
           <map:parameter name="application" value="portal"/>
 
           <map:act type="portal-bookmark">
@@ -239,7 +239,7 @@
       </map:match>
 
       <map:match pattern="portalxml">
-        <map:act type="cowarp-is-logged-in">
+        <map:act type="cauth-is-logged-in">
           <map:parameter name="application" value="portal"/>
 
             <map:generate type="portal" label="content"/>
@@ -253,13 +253,13 @@
         - if we are anonymous, then logout
         - if we are any other use, redirect to loggedin
         -->
-          <map:act type="cowarp-is-logged-in">
+          <map:act type="cauth-is-logged-in">
             <map:parameter name="application" value="portal"/>
 
             <map:select type="parameter" >
               <map:parameter name="parameter-selector-test" value="{ID}"/>
               <map:when test="anonymous">
-                <map:act type="cowarp-logout">
+                <map:act type="cauth-logout">
                   <map:parameter name="application" value="portal"/>
                 </map:act>
               </map:when>
@@ -270,7 +270,7 @@
           </map:act>
 
         <!-- Start the authentication process -->
-        <map:act type="cowarp-login">
+        <map:act type="cauth-login">
           <map:parameter name="application" value="portal"/>
           <map:parameter name="name" value="{request-param:name}"/>
           <map:parameter name="password" value="{request-param:password}"/>
@@ -289,7 +289,7 @@
       </map:match>
 
       <map:match pattern="loggedin">
-        <map:act type="cowarp-is-logged-in">
+        <map:act type="cauth-is-logged-in">
           <map:parameter name="application" value="portal"/>
 
           <map:generate src="resources/logged-in.xml"/>
@@ -301,12 +301,12 @@
       </map:match>
 
       <map:match pattern="logout">
-        <map:act type="cowarp-is-logged-in">
+        <map:act type="cauth-is-logged-in">
           <map:parameter name="application" value="portal"/>
 <!--
             <map:act type="portal-save-profile"/>
 -->
-          <map:act type="cowarp-logout">
+          <map:act type="cauth-logout">
 		        <map:parameter name="application" value="portal"/>
           </map:act>
         </map:act>
@@ -323,7 +323,7 @@
 	
 	<!-- mount sitemap of the portal tools -->
 	<map:match pattern="tools/**"> 
-		<map:act type="cowarp-is-logged-in">
+		<map:act type="cauth-is-logged-in">
 			<map:parameter name="application" value="portal"/> 
 			
 			<map:mount uri-prefix="tools" check-reload="no" src="tools/sitemap.xmap"/>

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/tools/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/tools/sitemap.xmap?rev=414859&r1=414858&r2=414859&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/tools/sitemap.xmap (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/tools/sitemap.xmap Fri Jun 16 09:52:17
2006
@@ -110,7 +110,7 @@
 
 <!-- mount sub-sitemaps -->
       <map:match pattern="plugins/*/**">
-     	 <map:act type="cowarp-is-logged-in">
+     	 <map:act type="cauth-is-logged-in">
             <map:parameter name="handler" value="portal-handler"/> 
             <map:parameter name="application" value="portal"/> 
 	      	<map:act type="check-access-action">



Mime
View raw message