[jboss-svn-commits] JBL Code SVN: r9379 - in labs/jbosslabs/trunk/portal-extensions: forge-portal-attr/src/java/org/jboss/forge/portal and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Feb 6 16:54:21 EST 2007
Author: szimano
Date: 2007-02-06 16:54:21 -0500 (Tue, 06 Feb 2007)
New Revision: 9379
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/ShowLoginPageServlet.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml
labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
login fixed http://jira.jboss.com/jira/browse/JBLAB-836
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-06 20:35:29 UTC (rev 9378)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2007-02-06 21:54:21 UTC (rev 9379)
@@ -31,6 +31,114 @@
<distributable/>
-->
+ <!-- LABS FILTERS -->
+ <servlet>
+ <servlet-name>loginServlet</servlet-name>
+ <servlet-class>org.jboss.forge.portal.LoginServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>loginServlet</servlet-name>
+ <url-pattern>/loginAction</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <servlet-name>wrongLoginServlet</servlet-name>
+ <servlet-class>org.jboss.forge.portal.WrongLoginServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>wrongLoginServlet</servlet-name>
+ <url-pattern>/loginFailed</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <servlet-name>ShowLoginPage</servlet-name>
+ <servlet-class>org.jboss.forge.portal.ShowLoginPageServlet</servlet-class>
+ <init-param>
+ <param-name>LOGIN_PAGE</param-name>
+ <param-value>portal/default/login</param-value>
+ <description>Login page that will get forwarded (dispatched) to</description>
+ </init-param>
+ <init-param>
+ <param-name>LOGOUT_PAGE</param-name>
+ <param-value>/portal</param-value>
+ <description>Logout page that will get forwarded to</description>
+ </init-param>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ShowLoginPage</servlet-name>
+ <url-pattern>/showLogin</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>ShowLoginPage</servlet-name>
+ <url-pattern>/logout</url-pattern>
+ </servlet-mapping>
+
+ <filter>
+ <filter-name>titleAndTimestampFilter</filter-name>
+ <filter-class>org.jboss.forge.portal.TitleChangeFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>titleAndTimestampFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <filter>
+ <filter-name>autologinFilter</filter-name>
+ <filter-class>org.jboss.forge.portal.AutologinFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>autologinFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <filter>
+ <filter-name>moveMeta</filter-name>
+ <filter-class>org.jboss.forge.portal.MetaMoveFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>moveMeta</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <!-- BlockPages filter -->
+ <!-- TAKEN FROM SOHIL'S WEB.XML
+ <filter>
+ <filter-name>BlockPagesFilter</filter-name>
+ <filter-class>org.jboss.forge.portal.BlockPagesFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>BlockPagesFilter</filter-name>
+ <servlet-name>PortalServlet</servlet-name>
+ </filter-mapping>
+ -->
+
+ <!-- SSL Processor -->
+ <filter>
+ <filter-name>SSLProcessor</filter-name>
+ <filter-class>org.jboss.forge.portal.SSLProcessor</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>SSLProcessor</filter-name>
+ <servlet-name>PortalServletWithPathMapping</servlet-name>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>SSLProcessor</filter-name>
+ <servlet-name>PortalServletWithDefaultServletMapping</servlet-name>
+ </filter-mapping>
+
+ <!-- END OF LABS FILTERS -->
+
+
<!-- The portal servlet is the main entrance point -->
<servlet>
<servlet-name>PortalServletWithPathMapping</servlet-name>
@@ -209,11 +317,22 @@
<auth-method>FORM</auth-method>
<realm-name>JBoss Portal</realm-name>
<form-login-config>
- <form-login-page>/login.jsp</form-login-page>
- <form-error-page>/error.jsp</form-error-page>
+ <form-login-page>/showLogin</form-login-page>
+ <!-- <form-error-page>/portal/auth/portal/default/login/LoginWindow?action=1&loginFailed=loginFailed</form-error-page>-->
+ <form-error-page>/portal/loginFailed</form-error-page>
</form-login-config>
</login-config>
+ <!-- TAKEN FROM SOHIL'S WEB.XML
+ <login-config>
+ <auth-method>JBOSS-FEDERATED-SSO</auth-method>
+ <realm-name>JBoss Portal</realm-name>
+ <form-login-config>
+ <form-login-page>/index.html?ctrl:id=page.default.login</form-login-page>
+ <form-error-page>/index.html?ctrl:id=window.default.LoginWindow&ctrl:type=action&action=loginFailed</form-error-page>
+ </form-login-config>
+ </login-config>-->
+
<security-role>
<role-name>Authenticated</role-name>
</security-role>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/ShowLoginPageServlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/ShowLoginPageServlet.java 2007-02-06 20:35:29 UTC (rev 9378)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/ShowLoginPageServlet.java 2007-02-06 21:54:21 UTC (rev 9379)
@@ -23,14 +23,28 @@
private static final Logger log = Logger
.getLogger(ShowLoginPageServlet.class);
+ private static final String LOGOUT_PAGE = "LOGOUT_PAGE";
+
+ private static final String LOGIN_PAGE = "LOGIN_PAGE";
+
+ @Override
+ public void init() throws ServletException {
+ if (getInitParameter(LOGIN_PAGE) == null || getInitParameter(LOGOUT_PAGE) == null) {
+ throw new ServletException("LOGIN_PAGE and LOGOUT_PAGE not set in portal's web.xml");
+ }
+
+ super.init();
+ }
+
protected void doGet(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
if (request.getRequestURI().endsWith("/logout")) {
AutologinFilter.clearCookies(request, response);
- response
- .sendRedirect("/portal/auth/portal/default/login/LoginWindow?action=1&logout=true");
+ request.getSession().invalidate();
+
+ response.sendRedirect(getInitParameter(LOGOUT_PAGE));
return;
} else {
@@ -55,7 +69,7 @@
return;
} else {
- request.getRequestDispatcher("login")
+ request.getRequestDispatcher(getInitParameter(LOGIN_PAGE))
.forward(request, response);
return;
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml 2007-02-06 20:35:29 UTC (rev 9378)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml 2007-02-06 21:54:21 UTC (rev 9379)
@@ -20,7 +20,7 @@
<ant:arg value="-out" />
<ant:arg value="target/tagme-servlet/www" />
<ant:arg value="org.jboss.labs.tagme.gwt.TagMe" />
- </ant:java>-->
+ </ant:java>
<ant:exec executable="java" >
<ant:arg value="-cp" />
@@ -29,7 +29,7 @@
<ant:arg value="-out" />
<ant:arg value="target/tagme-servlet/www" />
<ant:arg value="org.jboss.labs.tagme.gwt.TagMe" />
- </ant:exec>
+ </ant:exec>-->
</goal>
<goal name="build">
Modified: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2007-02-06 20:35:29 UTC (rev 9378)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2007-02-06 21:54:21 UTC (rev 9379)
@@ -129,12 +129,11 @@
</window>
</page>
</deployment>
-
<deployment>
<parent-ref/>
<if-exists>keep</if-exists>
- <context>
- <context-name>dashboard</context-name>
+ <portal>
+ <portal-name>template</portal-name>
<properties>
<!--
| Set the layout for the default portal, see also portal-layouts.xml.
@@ -165,6 +164,90 @@
<value>maximizedRegion</value>
</property>
<!--
+ | The default page name, if the property is not explicited then the default page name is "default"
+ -->
+ <property>
+ <name>portal.defaultObjectName</name>
+ <value>default</value>
+ </property>
+ </properties>
+ <supported-modes>
+ <mode>view</mode>
+ <mode>edit</mode>
+ <mode>help</mode>
+ </supported-modes>
+ <supported-window-states>
+ <window-state>normal</window-state>
+ <window-state>minimized</window-state>
+ <window-state>maximized</window-state>
+ </supported-window-states>
+ <page>
+ <page-name>default</page-name>
+ <properties>
+ <property>
+ <name>order</name>
+ <value>1</value>
+ </property>
+ </properties>
+ <window>
+ <window-name>JSPPortletWindow</window-name>
+ <instance-ref>JSPPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>CMSWindow</window-name>
+ <content>
+ <content-type>cms</content-type>
+ <content-uri>/default/index.html</content-uri>
+ </content>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>UserPortletWindow</window-name>
+ <instance-ref>UserPortletInstance</instance-ref>
+ <region>left</region>
+ <height>1</height>
+ </window>
+ </page>
+ </portal>
+ </deployment>
+ <deployment>
+ <parent-ref/>
+ <if-exists>keep</if-exists>
+ <context>
+ <context-name>dashboard</context-name>
+ <properties>
+ <!--
+ | Set the layout for the default portal, see also portal-layouts.xml.
+ -->
+ <property>
+ <name>layout.id</name>
+ <value>JBossForge</value>
+ </property>
+ <!--
+ | Set the theme for the default portal, see also portal-themes.xml.
+ -->
+ <property>
+ <name>theme.id</name>
+ <value>jboss-forge</value>
+ </property>
+ <!--
+ | Set the default render set name (used by the render tag in layouts), see also portal-renderSet.xml
+ -->
+ <property>
+ <name>theme.renderSetId</name>
+ <value>emptyRenderer</value>
+ </property>
+ <!--
+ | Set the default strategy name (used by the strategy interceptor), see also portal-strategies.xml
+ -->
+ <property>
+ <name>layout.strategyId</name>
+ <value>maximizedRegion</value>
+ </property>
+ <!--
| Set the dashboard property
-->
<property>
More information about the jboss-svn-commits
mailing list