cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r440078 - in /cocoon/trunk/blocks: cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/impl/ cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/ cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/mo...
Date Mon, 04 Sep 2006 13:55:54 GMT
Author: cziegeler
Date: Mon Sep  4 06:55:53 2006
New Revision: 440078

URL: http://svn.apache.org/viewvc?view=rev&rev=440078
Log:
Fix recursive login bug
Layout updates

Modified:
    cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/impl/StandardApplicationManager.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/modern/css/page.css

Modified: cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/impl/StandardApplicationManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/impl/StandardApplicationManager.java?view=diff&rev=440078&r1=440077&r2=440078
==============================================================================
--- cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/impl/StandardApplicationManager.java
(original)
+++ cocoon/trunk/blocks/cocoon-auth/cocoon-auth-impl/src/main/java/org/apache/cocoon/auth/impl/StandardApplicationManager.java
Mon Sep  4 06:55:53 2006
@@ -213,9 +213,6 @@
                 // set the application in the object model
                 objectModel.put(ApplicationManager.APPLICATION, app);
 
-                // notify the application
-                app.userDidLogin(user, loginContext);
-
                 // set the application data in the session
                 Object data = ObjectUtils.NULL;
                 if ( app.getApplicationStore() != null ) {
@@ -223,7 +220,11 @@
                 }
                 session.setAttribute(APPLICATION_KEY_PREFIX + appName, data);
                 objectModel.put(ApplicationManager.APPLICATION_DATA, data);
-                // notify application
+
+                // notify the application about successful login
+                app.userDidLogin(user, loginContext);
+
+                // notify the application about accessing
                 app.userIsAccessing(user);
             }
         }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=440078&r1=440077&r2=440078
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/sitemap.xmap
Mon Sep  4 06:55:53 2006
@@ -75,21 +75,6 @@
   <!-- =========================== Pipelines ================================= -->
 
   <map:pipelines>
-    <map:pipeline>
-      <!-- Do an auto login as anonymous -->
-      <map:act type="cauth-is-logged-in">
-        <map:parameter name="application" value="portal"/>
-        <map:parameter name="negate-result" value="true"/>
-
-        <map:act type="cauth-login">
-          <map:parameter name="application" value="portal"/>
-
-          <map:parameter name="name" value="anonymous"/>
-          <map:parameter name="password" value="anonymous"/>
-        </map:act>
-      </map:act>
-    </map:pipeline>
-
     <!-- The internal pipelines for loading and saving -->
     <map:pipeline internal-only="true">
       <map:match pattern="sunrise-authuser">
@@ -125,6 +110,21 @@
         <map:serialize type="xml"/>
       </map:match>
 -->
+    </map:pipeline>
+
+    <map:pipeline>
+      <!-- Do an auto login as anonymous -->
+      <map:act type="cauth-is-logged-in">
+        <map:parameter name="application" value="portal"/>
+        <map:parameter name="negate-result" value="true"/>
+
+        <map:act type="cauth-login">
+          <map:parameter name="application" value="portal"/>
+
+          <map:parameter name="name" value="anonymous"/>
+          <map:parameter name="password" value="anonymous"/>
+        </map:act>
+      </map:act>
     </map:pipeline>
 
     <!-- The pipelines for the skin resources, like images, css etc. 

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/modern/css/page.css
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/modern/css/page.css?view=diff&rev=440078&r1=440077&r2=440078
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/modern/css/page.css
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/skins/modern/css/page.css
Mon Sep  4 06:55:53 2006
@@ -21,7 +21,7 @@
 	margin: 0; 
 	font-family: Verdana, Helvetica, sans-serif;
 	font-size: 10pt;
-   line-height: 12pt;
+    line-height: 12pt;
 	color: black;
 	border-left: 5px solid white;
 	border-right: 5px solid white;
@@ -39,13 +39,13 @@
 /* portal styling */
 
 .cocoon-portal-header {
-   width: 100%;
-	height: 42px;
-	background-color: #0076a3;
+    width: 100%;
+	height: 90px;
+	background-color: #294563;
 }
 
 #cocoon-portal-header-logo {
-	display: none;
+	text-align: center;
 }
 
 #cocoon-portal-header-logout {



Mime
View raw message