[jboss-svn-commits] JBL Code SVN: r5927 - in labs/jbosslabs/branches/prod/jbosslabs/portal-extensions: configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF forge-kosmos forge-login-portlet/src/java/org/jbosslabs/security/portlet forge-login-portlet/src/web/WEB-INF forge-status
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 16 17:45:10 EDT 2006
Author: szimano
Date: 2006-08-16 17:45:09 -0400 (Wed, 16 Aug 2006)
New Revision: 5927
Modified:
labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/forge-kosmos/maven.xml
labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java
labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/forge-login-portlet/src/web/WEB-INF/web.xml
labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/forge-status/maven.xml
Log:
svn merge -r 5915:5926 https://svn.labs.jboss.com/labs/jbosslabs/branches/qa/jbosslabs/portal-extensions .
new login window
Modified: labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2006-08-16 21:42:18 UTC (rev 5926)
+++ labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2006-08-16 21:45:09 UTC (rev 5927)
@@ -217,7 +217,7 @@
<realm-name>JBoss Portal</realm-name>
<form-login-config>
<form-login-page>/login</form-login-page>
- <form-error-page>/error.jsp</form-error-page>
+ <form-error-page>/index.html?ctrl:cmd=render&ctrl:window=default.login.LoginWindow&action=loginFailed</form-error-page>
</form-login-config>
</login-config>
Modified: labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/forge-kosmos/maven.xml
===================================================================
--- labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/forge-kosmos/maven.xml 2006-08-16 21:42:18 UTC (rev 5926)
+++ labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/forge-kosmos/maven.xml 2006-08-16 21:45:09 UTC (rev 5927)
@@ -46,20 +46,20 @@
<!-- Deploying new packages -->
- <ant:copy todir="../${forge.sar.dir}/target" overwrite="true">
+<!-- <ant:copy todir="../${forge.sar.dir}/target" overwrite="true">
<ant:fileset dir="target">
<ant:filename name="kosmos*/**" />
</ant:fileset>
- </ant:copy>
+ </ant:copy>-->
<!-- Deleting log4j jars to avoid classloader issues -->
- <ant:delete file="../${forge.sar.dir}/target/kosmos-server.war/WEB-INF/lib/log4j-1.2.8.jar" />
+<!-- <ant:delete file="../${forge.sar.dir}/target/kosmos-server.war/WEB-INF/lib/log4j-1.2.8.jar" />
<ant:delete file="../${forge.sar.dir}/target/kosmos-portlet.war/WEB-INF/lib/log4j-1.2.8.jar" />
<ant:copy todir="${local.deploy.dir}"
file="${maven.repo.local}/com.lowagie/jars/itext-1.4.jar"
- overwrite="true" />
+ overwrite="true" />-->
</goal>
</project>
Modified: labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java
===================================================================
--- labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java 2006-08-16 21:42:18 UTC (rev 5926)
+++ labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java 2006-08-16 21:45:09 UTC (rev 5927)
@@ -9,6 +9,8 @@
package org.jbosslabs.security.portlet;
+import org.jboss.forge.common.ForgeHelper;
+import org.jboss.logging.Logger;
import org.jboss.portlet.JBossPortlet;
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.portlet.JBossRenderResponse;
@@ -17,6 +19,7 @@
import java.io.IOException;
+import java.util.Map;
import javax.portlet.*;
@@ -25,16 +28,20 @@
public class Login extends JBossPortlet
{
+ private static final Logger log = Logger.getLogger(Login.class);
+ private static final String LOGIN_JSP = "login/login.jsp";
+
public void init()
{
}
- public void processAction(final JBossActionRequest req, final JBossActionResponse resp)
- throws PortletException, PortletSecurityException, IOException
- {
+ @Override
+ public void processAction(JBossActionRequest req, JBossActionResponse resp) throws PortletException, PortletSecurityException, IOException {
+
try
{
+
String action = req.getParameter(Constants.param1);
if(action!=null)
{
@@ -44,6 +51,7 @@
String logout = req.getParameter(Constants.LOGOUT);
if (logout != null && logout.equals(Constants.LOGOUT_TRUE)) {
+ req.getPortletSession().invalidate();
resp.signOut();
return;
}
@@ -58,13 +66,17 @@
public void doView(JBossRenderRequest request, JBossRenderResponse response)
throws IOException, PortletException
{
+
try
{
+ String portalName = ForgeHelper.getPortalName(request);
+
response.setContentType("text/html");
PortletRequestDispatcher rd = null;
rd = this.getPortletContext().
- getRequestDispatcher("/WEB-INF/login.jsp");
+ //getRequestDispatcher("/WEB-INF/login.jsp");
+ getRequestDispatcher(ForgeHelper.createRepoAccessPath(portalName, LOGIN_JSP));
//render
rd.include(request,response);
Modified: labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/forge-login-portlet/src/web/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/forge-login-portlet/src/web/WEB-INF/web.xml 2006-08-16 21:42:18 UTC (rev 5926)
+++ labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/forge-login-portlet/src/web/WEB-INF/web.xml 2006-08-16 21:45:09 UTC (rev 5927)
@@ -12,4 +12,15 @@
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
+
+ <filter>
+ <filter-name>filesFromRepoFilter</filter-name>
+ <filter-class>org.jboss.forge.common.FilesFromRepoFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>filesFromRepoFilter</filter-name>
+ <url-pattern>/repo-access/*</url-pattern>
+ <dispatcher>INCLUDE</dispatcher>
+ </filter-mapping>
</web-app>
\ No newline at end of file
Modified: labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/forge-status/maven.xml
===================================================================
--- labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/forge-status/maven.xml 2006-08-16 21:42:18 UTC (rev 5926)
+++ labs/jbosslabs/branches/prod/jbosslabs/portal-extensions/forge-status/maven.xml 2006-08-16 21:45:09 UTC (rev 5927)
@@ -21,8 +21,8 @@
</goal>
<goal name="deploy">
- <attainGoal name="prj-war-deploy" />
- <ant:copy tofile="${local.deploy.dir}/forge-status.ejb3" file="target/forge-status-1.0.jar" />
+<!-- <attainGoal name="prj-war-deploy" />
+ <ant:copy tofile="${local.deploy.dir}/forge-status.ejb3" file="target/forge-status-1.0.jar" />-->
</goal>
<goal name="clean">
More information about the jboss-svn-commits
mailing list