[jboss-svn-commits] JBL Code SVN: r6066 - in labs/jbosslabs/trunk/portal-extensions: configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF forge-common/src/java/org/jboss/forge/common forge-login forge-login/src/java/org/jboss/labs/login forge-login-portlet/src/java/org/jbosslabs/security/portlet
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Sep 1 17:31:01 EDT 2006
Author: szimano
Date: 2006-09-01 17:30:57 -0400 (Fri, 01 Sep 2006)
New Revision: 6066
Modified:
labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/PermissionTools.java
labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java
labs/jbosslabs/trunk/portal-extensions/forge-login/maven.xml
labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java
Log:
login and some other stuff repaired for Portal 2.4 (RefactorEdition)
Modified: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2006-09-01 16:18:54 UTC (rev 6065)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/all/deploy/jboss-portal.sar/portal-server.war/WEB-INF/web.xml 2006-09-01 21:30:57 UTC (rev 6066)
@@ -223,8 +223,8 @@
<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>/index.html?ctrl:cmd=render&ctrl:window=default.login.LoginWindow&action=loginFailed</form-error-page>
+ <form-login-page>/login</form-login-page>
+ <form-error-page>/portal/auth/portal/default/login/LoginWindow?action=1&action=loginFailed</form-error-page>
</form-login-config>
</login-config>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/PermissionTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/PermissionTools.java 2006-09-01 16:18:54 UTC (rev 6065)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/PermissionTools.java 2006-09-01 21:30:57 UTC (rev 6066)
@@ -1,5 +1,6 @@
package org.jboss.forge.common;
+import org.jboss.portal.core.modules.ModuleConstants;
import org.jboss.portal.identity.*;
import org.jboss.shotoku.tools.Tools;
import org.jboss.logging.Logger;
@@ -8,6 +9,7 @@
import javax.naming.NamingException;
import java.util.List;
import java.util.ArrayList;
+import java.util.Set;
/**
* @author Adam Warski (adamw at aster.pl)
@@ -22,7 +24,8 @@
try {
InitialContext initialContext = new InitialContext();
rm = (RoleModule) initialContext
- .lookup("portal:service=Module,type=Role");
+ //.lookup("portal:service=Module,type=Role");
+ .lookup(ModuleConstants.ROLEMODULE_JNDINAME);
} catch (NamingException e) {
log.error("Exception while getting the role module", e);
}
@@ -59,4 +62,12 @@
return ret;
}
+
+ public static void setRoles(User user, Set roles) {
+ try {
+ getRm().setRoles(user, roles);
+ } catch (IdentityException e) {
+ log.error(e);
+ }
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-login/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-login/maven.xml 2006-09-01 16:18:54 UTC (rev 6065)
+++ labs/jbosslabs/trunk/portal-extensions/forge-login/maven.xml 2006-09-01 21:30:57 UTC (rev 6066)
@@ -14,15 +14,15 @@
</goal>
<goal name="build">
- <!--<attainGoal name="jar" />-->
+ <attainGoal name="jar" />
</goal>
<goal name="deploy">
- <!--<ant:copy todir="${local.deploy.dir}" flatten="true">
+ <ant:copy todir="${local.deploy.dir}" flatten="true">
<ant:fileset dir=".">
<ant:filename name="target/*.jar" />
</ant:fileset>
- </ant:copy>-->
+ </ant:copy>
</goal>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java 2006-09-01 16:18:54 UTC (rev 6065)
+++ labs/jbosslabs/trunk/portal-extensions/forge-login/src/java/org/jboss/labs/login/LabsLoginModule.java 2006-09-01 21:30:57 UTC (rev 6066)
@@ -238,7 +238,7 @@
Role role = roleModule.findRoleByName(defaultRole);
if (role != null) {
roleSet.add(role);
- PermissionTools.setRoles(user, roleSet);
+ roleModule.setRoles(user, roleSet);
} else {
log
.error("The role you specified as default role does not exist, check your portlet configuration");
Modified: labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java 2006-09-01 16:18:54 UTC (rev 6065)
+++ labs/jbosslabs/trunk/portal-extensions/forge-login-portlet/src/java/org/jbosslabs/security/portlet/Login.java 2006-09-01 21:30:57 UTC (rev 6066)
@@ -11,22 +11,21 @@
import org.jboss.forge.common.ForgeHelper;
import org.jboss.logging.Logger;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
import org.jboss.portlet.JBossPortlet;
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.portlet.JBossRenderResponse;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
import java.io.IOException;
-import java.util.Map;
import javax.portlet.*;
import org.jbosslabs.security.Constants;
-public class Login extends JBossPortlet
+public class Login extends JBossPortlet
{
private static final Logger log = Logger.getLogger(Login.class);
@@ -36,8 +35,7 @@
{
}
- @Override
- public void processAction(JBossActionRequest req, JBossActionResponse resp) throws PortletException, PortletSecurityException, IOException {
+ public void processAction(JBossActionRequest req, JBossActionResponse resp) throws PortletException, IOException {
try
{
@@ -66,6 +64,8 @@
public void doView(JBossRenderRequest request, JBossRenderResponse response)
throws IOException, PortletException
{
+
+ log.info(response.createActionURL().toString());
try
{
More information about the jboss-svn-commits
mailing list