[jboss-svn-commits] JBL Code SVN: r18064 - in labs/jbosslabs/labs-3.0-build/views/admin/src/main: webapp and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jan 23 12:19:35 EST 2008
Author: wrzep
Date: 2008-01-23 12:19:35 -0500 (Wed, 23 Jan 2008)
New Revision: 18064
Added:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Authenticator.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Logout.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/error.xhtml
Removed:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/LoginAction.java
Modified:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/WEB-INF/components.xml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/WEB-INF/pages.xml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/WEB-INF/web.xml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/menu.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/template.xhtml
Log:
JBLAB-904 seam/jbpm login and logout now integrated with sso
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Authenticator.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Authenticator.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Authenticator.java 2008-01-23 17:19:35 UTC (rev 18064)
@@ -0,0 +1,23 @@
+package org.jboss.labs.admin;
+
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.bpm.Actor;
+
+
+ at Name("authenticator")
+public class Authenticator
+{
+ @In(create = true) private Actor actor;
+
+ public void autoLogin() {
+
+ if (actor.getId() == null) {
+
+ // TODO call AuthService to check if the current user can accept projects
+
+ actor.setId("reviewer");
+ actor.getGroupActorIds().add("reviewer");
+ }
+ }
+}
Deleted: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/LoginAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/LoginAction.java 2008-01-23 17:10:21 UTC (rev 18063)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/LoginAction.java 2008-01-23 17:19:35 UTC (rev 18064)
@@ -1,26 +0,0 @@
-package org.jboss.labs.admin;
-
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Factory;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.bpm.Actor;
-import org.jboss.seam.ScopeType;
-
-/**
- * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
- */
- at Name("login")
- at Scope(ScopeType.SESSION)
-public class LoginAction {
-
- @In(create = true) private Actor actor;
-
- public String login() {
-
- actor.setId("reviewer");
- actor.getGroupActorIds().add("reviewer");
-
- return null;
- }
-}
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Logout.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Logout.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Logout.java 2008-01-23 17:19:35 UTC (rev 18064)
@@ -0,0 +1,41 @@
+package org.jboss.labs.admin;
+
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Logger;
+import org.jboss.seam.bpm.Actor;
+import org.jboss.seam.faces.Renderer;
+import org.jboss.seam.log.Log;
+
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+import java.io.IOException;
+
+/**
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ */
+ at Name("logout")
+public class Logout {
+
+ @In private Actor actor;
+
+ @In private FacesContext facesContext;
+
+ @Logger private Log log;
+
+
+ public String logout() {
+ System.out.println("logout");
+ actor.setId(null);
+ actor.getGroupActorIds().clear();
+
+ ExternalContext externalContext = facesContext.getExternalContext();
+ try {
+ externalContext.redirect("josso_logout/");
+ } catch (IOException e) {
+ log.error(e);
+ }
+
+ return Pages.ERROR_PAGE;
+ }
+}
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java 2008-01-23 17:10:21 UTC (rev 18063)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java 2008-01-23 17:19:35 UTC (rev 18064)
@@ -7,4 +7,6 @@
public static final String CONFIRMATION_PAGE = "/confirmation.seam";
+ public static final String HOME_PAGE = "/home.seam";
+ public static final String ERROR_PAGE = "/error.seam";
}
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/WEB-INF/components.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/WEB-INF/components.xml 2008-01-23 17:10:21 UTC (rev 18063)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/WEB-INF/components.xml 2008-01-23 17:19:35 UTC (rev 18064)
@@ -21,7 +21,7 @@
<core:manager concurrent-request-timeout="500"
conversation-timeout="120000"
conversation-id-parameter="cid"/>
-
+
<event type="org.jboss.seam.security.notLoggedIn">
<action execute="#{redirect.captureCurrentView}"/>
</event>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/WEB-INF/pages.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/WEB-INF/pages.xml 2008-01-23 17:10:21 UTC (rev 18063)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/WEB-INF/pages.xml 2008-01-23 17:19:35 UTC (rev 18064)
@@ -2,10 +2,8 @@
<pages xmlns="http://jboss.com/products/seam/pages"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"
+ no-conversation-view-id="/home.xhtml">
- no-conversation-view-id="/home.xhtml"
- login-view-id="/login.xhtml">
-
<page view-id="*">
<navigation>
<rule if-outcome="home">
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/WEB-INF/web.xml 2008-01-23 17:10:21 UTC (rev 18063)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/WEB-INF/web.xml 2008-01-23 17:19:35 UTC (rev 18064)
@@ -74,7 +74,7 @@
</web-resource-collection>
<auth-constraint/>
</security-constraint>
-
+
<!-- Login -->
<login-config>
<auth-method>FORM</auth-method>
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/error.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/error.xhtml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/error.xhtml 2008-01-23 17:19:35 UTC (rev 18064)
@@ -0,0 +1,20 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich"
+ template="layout/template.xhtml">
+
+<ui:define name="body">
+
+ <rich:panel>
+ Error.
+
+ <h:messages styleClass="message"/>
+ </rich:panel>
+
+</ui:define>
+</ui:composition>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/menu.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/menu.xhtml 2008-01-23 17:10:21 UTC (rev 18063)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/menu.xhtml 2008-01-23 17:19:35 UTC (rev 18064)
@@ -11,8 +11,7 @@
</rich:toolBarGroup>
<!-- @newMenuItem@ -->
<rich:toolBarGroup location="right">
- <h:outputText value="Welcome, #{identity.username}!" rendered="#{identity.loggedIn}"/>
- <s:link action="#{login.login}" value="Login" rendered="#{not identity.loggedIn}"/>
- <s:link view="/home.xhtml" action="#{identity.logout}" value="Logout" rendered="#{identity.loggedIn}"/>
+ <h:outputText value="Welcome, #{actor.id}!" />
+ <s:link action="#{logout.logout()}" value="Logout"/>
</rich:toolBarGroup>
</rich:toolBar>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/template.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/template.xhtml 2008-01-23 17:10:21 UTC (rev 18063)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/template.xhtml 2008-01-23 17:19:35 UTC (rev 18064)
@@ -5,13 +5,16 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:s="http://jboss.com/products/seam/taglib">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Admin</title>
- <link href="stylesheet/theme.css" rel="stylesheet" type="text/css" />
+<head>
+ <ui:insert name="head">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Admin</title>
+ <link href="stylesheet/theme.css" rel="stylesheet" type="text/css" />
+ </ui:insert>
</head>
<body>
+ <!-- <h:outputText value="#{authenticator.autoLogin()}" rendered="#{empty actor.id}"/> -->
<ui:include src="menu.xhtml">
<ui:param name="projectName" value="admin"/>
More information about the jboss-svn-commits
mailing list