[jboss-svn-commits] JBL Code SVN: r9600 - 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-02-19 10:08:09 -0500 (Mon, 19 Feb 2007)
New Revision: 9600

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:
inject login with new mapper

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-02-19 14:49:15 UTC (rev 9599)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2007-02-19 15:08:09 UTC (rev 9600)
@@ -107,10 +107,10 @@
       <filter-class>org.jboss.forge.portal.InjectLoginLinks</filter-class>
    </filter>
    
-   <!--<filter-mapping>
+   <filter-mapping>
       <filter-name>injectLoginLinkFilter</filter-name>
       <url-pattern>/*</url-pattern>
-   </filter-mapping>-->
+   </filter-mapping>
 
    <filter>
 	<filter-name>autologinFilter</filter-name>

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-02-19 14:49:15 UTC (rev 9599)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/InjectLoginLinks.java	2007-02-19 15:08:09 UTC (rev 9600)
@@ -53,8 +53,6 @@
 
 	private static final String AUTH_LINK2 = "auth";
 
-	private static final String PORTAL = "/portal";
-
 	public void destroy() {
 
 	}
@@ -95,15 +93,14 @@
 		if (loginIndx != -1) {
 
 			StringBuffer newUri = new StringBuffer();
-			newUri.append("<a href='").append(uri);
+			newUri.append("<a href='");
 
 			if (uri.equals("/")) {
-				newUri.append(AUTH_LINK).append("'>Login</a>");
+				newUri.append(uri).append(AUTH_LINK).append("'>Login</a>");
 			} else if (newUri.indexOf(AUTH_LINK) == -1
 					&& newUri.indexOf(AUTH_LINK2) == -1 && principal == null) {
-				// add AUTH_LINK
-				int p = newUri.indexOf(PORTAL);
-				newUri.insert(p, "/").insert(p + 1, AUTH_LINK).append(
+				
+				newUri.append("/").append(AUTH_LINK).append(uri).append(
 						"'>Login</a>");
 			} else if (principal != null) {
 				// user is logged in
@@ -112,7 +109,7 @@
 						"</b> | <a href='/logout'>Logout</a> </span>");
 			} else {
 				// this is login page. just show login link
-				newUri.append("'>Login</a>");
+				newUri.append(uri).append("'>Login</a>");
 			}
 
 			StringBuffer newContent = new StringBuffer();