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

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

Author: szimano
Date: 2007-02-08 19:02:06 -0500 (Thu, 08 Feb 2007)
New Revision: 9403

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/WrongLoginServlet.java
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/maven.xml
Log:
wiki build + loginfailed fwd small fix

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-08 23:48:55 UTC (rev 9402)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml	2007-02-09 00:02:06 UTC (rev 9403)
@@ -45,6 +45,11 @@
    <servlet>
    	<servlet-name>wrongLoginServlet</servlet-name>
    	<servlet-class>org.jboss.forge.portal.WrongLoginServlet</servlet-class>
+   	<init-param>
+			<param-name>LOGIN_FAILED</param-name>
+			<param-value>/portal/portal/default/login/LoginWindow?action=2&amp;loginFailed=loginFailed</param-value>
+			<description>Page with information that the login was failed</description>
+	</init-param>
    </servlet>
    
    <servlet-mapping>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java	2007-02-08 23:48:55 UTC (rev 9402)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/WrongLoginServlet.java	2007-02-09 00:02:06 UTC (rev 9403)
@@ -14,6 +14,18 @@
 	 */
 	private static final long serialVersionUID = 1L;
 
+	private final static String LOGIN_FAILED = "LOGIN_FAILED";
+
+	@Override
+	public void init() throws ServletException {
+		if (getInitParameter(LOGIN_FAILED) == null) {
+			throw new ServletException("LOGIN_FAILED parameter not set for "
+					+ this.getClass().getName());
+		}
+
+		super.init();
+	}
+
 	protected void doGet(HttpServletRequest request,
 			HttpServletResponse response) throws ServletException, IOException {
 		String[] cred;
@@ -29,8 +41,7 @@
 				response.sendRedirect("/portal");
 			}
 		} else {
-			response
-					.sendRedirect("/portal/portal/default/login/LoginWindow?action=2&loginFailed=loginFailed");
+			response.sendRedirect(getInitParameter(LOGIN_FAILED));
 		}
 	}
 

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/maven.xml	2007-02-08 23:48:55 UTC (rev 9402)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/maven.xml	2007-02-09 00:02:06 UTC (rev 9403)
@@ -16,7 +16,7 @@
         </goal>
 	
 	<goal name="deploy">
-		<!--<attainGoal name="wiki:deploy" />-->
+		<attainGoal name="wiki:deploy" />
 	</goal>
 	
 	<goal name="clean">