[jboss-svn-commits] JBL Code SVN: r11221 - in labs/jbosslabs/trunk/portal-extensions: forge-portal-attr/src/java/org/jboss/forge/portal and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2007-04-23 08:02:29 -0400 (Mon, 23 Apr 2007)
New Revision: 11221

Modified:
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
   labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/InjectLoginLinks.java
Log:
login info on Home

Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2007-04-23 10:42:08 UTC (rev 11220)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2007-04-23 12:02:29 UTC (rev 11221)
@@ -111,7 +111,8 @@
 
    <filter-mapping>
       <filter-name>injectLoginLinkFilter</filter-name>
-      <url-pattern>/*</url-pattern>
+      <!-- <url-pattern>/*</url-pattern> -->
+      <servlet-name>PortalServletWithPathMapping</servlet-name>
    </filter-mapping>
 
    <filter>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/InjectLoginLinks.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/InjectLoginLinks.java	2007-04-23 10:42:08 UTC (rev 11220)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/InjectLoginLinks.java	2007-04-23 12:02:29 UTC (rev 11221)
@@ -98,24 +98,25 @@
 			Principal principal) {
 		int loginIndx = content.indexOf(LOGIN_TAG);
 		int loginEnd = loginIndx + LOGIN_TAG.length();
-
+		
 		if (loginIndx != -1) {
 
 			StringBuffer newUri = new StringBuffer();
 			newUri.append("<a href='");
 
-			if (uri.equals("/")) {
+			if (principal != null) {
+				// user is logged in
+				newUri = new StringBuffer("<span class='wlcmBox'><b>").append(
+						principal.getName()).append(
+						"</b> | <a href='/logout'>Logout</a> </span>");
+			} 
+			else if (uri.equals("/")) {
 				newUri.append(uri).append(AUTH_LINK).append("'>Login</a>");
 			} else if (newUri.indexOf(AUTH_LINK) == -1
 					&& newUri.indexOf(AUTH_LINK2) == -1 && principal == null) {
 				
 				newUri.append("/").append(AUTH_LINK).append(uri).append(
 						"'>Login</a>");
-			} else if (principal != null) {
-				// user is logged in
-				newUri = new StringBuffer("<span class='wlcmBox'><b>").append(
-						principal.getName()).append(
-						"</b> | <a href='/logout'>Logout</a> </span>");
 			} else {
 				// this is login page. just show login link
 				newUri.append(uri).append("'>Login</a>");