[jboss-svn-commits] JBL Code SVN: r18758 - in labs/jbosslabs/labs-3.0-build: services/project-service/src/main/java/org/jboss/labs/core/service/impl and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Mar 7 10:39:17 EST 2008
Author: wrzep
Date: 2008-03-07 10:39:17 -0500 (Fri, 07 Mar 2008)
New Revision: 18758
Added:
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/Request.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowRequests.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/requests.xhtml
Removed:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowNotifications.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/notifications.xhtml
Modified:
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/JoinRequest.java
labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/ProjectRequest.java
labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java
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/action/project/AcceptProject.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/RequestProject.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/AcceptJoin.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/JoinState.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/auth/Authenticator.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/home.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinTicket.xhtml
Log:
JBLAB-934
Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/JoinRequest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/JoinRequest.java 2008-03-07 12:16:10 UTC (rev 18757)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/JoinRequest.java 2008-03-07 15:39:17 UTC (rev 18758)
@@ -23,69 +23,23 @@
package org.jboss.labs.core.model.admin;
-import org.hibernate.validator.Email;
-
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import java.io.Serializable;
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
*/
@Entity
-public class JoinRequest implements Serializable {
+public class JoinRequest extends Request {
+
+ private static final long serialVersionUID = 1196778060516603947L;
- private static final long serialVersionUID = -7477176000123883280L;
-
- @Id @GeneratedValue private int id;
- private String projectId;
- private String username;
- private boolean finished;
-
public JoinRequest() {}
public JoinRequest(String projectId, String username) {
- this.projectId = projectId;
- this.username = username;
- this.finished = false;
+ super(projectId, username);
}
- /* getters and setters */
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getProjectId() {
- return projectId;
- }
-
- public void setProjectId(String projectId) {
- this.projectId = projectId;
- }
-
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public boolean isFinished() {
- return finished;
- }
-
- public void setFinished(boolean finished) {
- this.finished = finished;
- }
-
@Override
public String toString() {
return "JoinRequest(" + username + ", " + projectId + ", " + finished + ")";
Modified: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/ProjectRequest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/ProjectRequest.java 2008-03-07 12:16:10 UTC (rev 18757)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/ProjectRequest.java 2008-03-07 15:39:17 UTC (rev 18758)
@@ -26,24 +26,15 @@
import org.hibernate.validator.Email;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Transient;
-import java.io.Serializable;
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
*/
@Entity
-public class ProjectRequest implements Serializable {
-
- private static final long serialVersionUID = -7477176000123883280L;
+public class ProjectRequest extends Request {
- @Id @GeneratedValue private int id;
protected String name = "New Project";
- protected String leadUsername;
- protected String projectId = "newproject";
@Email protected String email;
protected String jiraKey = "NEWPROJECT";
protected boolean repository = true;
@@ -51,45 +42,19 @@
protected boolean devForum = true;
protected boolean userForum = true;
protected boolean announceForum = true;
+
+ private static final long serialVersionUID = 3910013618117772511L;
- private String escape(String string, String w) {
+ public ProjectRequest() {
+ this.projectId = "newproject";
+ }
- StringBuilder sb = new StringBuilder();
-
- for (int i = 0; i < string.length(); i++) {
- char c = string.charAt(i);
- if (Character.isLetterOrDigit(c)) {
- sb.append(c);
- } else {
- if (Character.isWhitespace(c)) {
- sb.append(w);
- }
- }
- }
-
- return sb.toString();
+ public ProjectRequest(String projectId, String username) {
+ super(projectId, username);
}
/* getters and setters */
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getProjectId() {
- return projectId;
- }
-
- public void setProjectId(String projectId) {
- if (projectId != null) {
- this.projectId = projectId.toLowerCase();
- }
- }
-
public String getName() {
return name;
}
@@ -154,11 +119,21 @@
this.announceForum = announceForum;
}
- public String getLeadUsername() {
- return leadUsername;
- }
+ /* private String escape(String string, String w) {
- public void setLeadUsername(String leadUsername) {
- this.leadUsername = leadUsername;
- }
+ StringBuilder sb = new StringBuilder();
+
+ for (int i = 0; i < string.length(); i++) {
+ char c = string.charAt(i);
+ if (Character.isLetterOrDigit(c)) {
+ sb.append(c);
+ } else {
+ if (Character.isWhitespace(c)) {
+ sb.append(w);
+ }
+ }
+ }
+
+ return sb.toString();
+ }*/
}
\ No newline at end of file
Added: labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/Request.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/Request.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/Request.java 2008-03-07 15:39:17 UTC (rev 18758)
@@ -0,0 +1,104 @@
+/*
+* JBoss Labs. http://labs.jboss.com/jbosslabs
+*
+* Copyright © 2008 Red Hat Middleware, LLC. All rights reserved.
+*
+* This copyrighted material is made available to anyone wishing to use,
+* modify, copy, or redistribute it subject to the terms and conditions
+* of the GNU Lesser General Public License, v. 2.1.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT A WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License, v.2.1 along with this distribution; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+* 02110-1301, USA.
+*
+* Red Hat Author(s): Bob McWhirter, Przemyslaw Dej, Ryszard Kozmik,
+* Tomasz Szymanski, Adam Warski, Pawel Wrzeszcz
+*/
+
+package org.jboss.labs.core.model.admin;
+
+import org.hibernate.validator.Email;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import java.io.Serializable;
+
+/**
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ */
+
+ at MappedSuperclass
+public class Request implements Serializable {
+
+ private static final long serialVersionUID = 2639173025158823340L;
+
+ @Id @GeneratedValue private int id;
+
+ protected String projectId;
+ protected String username;
+ protected boolean finished;
+ protected long taskId;
+
+ public Request() {}
+
+ public Request(String projectId, String username) {
+ this.projectId = projectId;
+ this.username = username;
+ this.finished = false;
+ }
+
+ /* getters and setters */
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public String getProjectId() {
+ return projectId;
+ }
+
+ public void setProjectId(String projectId) {
+ this.projectId = projectId;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public boolean isFinished() {
+ return finished;
+ }
+
+ public void setFinished(boolean finished) {
+ this.finished = finished;
+ }
+
+ public long getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(long taskId) {
+ this.taskId = taskId;
+ }
+
+ @Override
+ public String toString() {
+ return "Request(" + username + ", " + projectId + ", " + finished + ", " + taskId + ")";
+ }
+}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java 2008-03-07 12:16:10 UTC (rev 18757)
+++ labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java 2008-03-07 15:39:17 UTC (rev 18758)
@@ -22,8 +22,6 @@
import javax.interceptor.Interceptors;
import java.util.*;
-import com.google.inject.Inject;
-
@Stateful(name="ProjectService")
@WebService(endpointInterface="org.jboss.labs.core.service.ProjectWebService")
@Interceptors({LabsInjectionInterceptor.class})
@@ -50,7 +48,7 @@
p.setProjectId(projectId);
p.setName(projectRequest.getName());
- String lu = projectRequest.getLeadUsername();
+ String lu = projectRequest.getUsername();
Username leadUsername = null;
leadUsername = getUsername(lu, true);
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-03-07 12:16:10 UTC (rev 18757)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java 2008-03-07 15:39:17 UTC (rev 18758)
@@ -37,7 +37,7 @@
public static final String HOME_PAGE = "/home.seam";
public static final String ERROR_PAGE = "/error.seam";
- public static final String NOTIFICATIONS_PAGE = "/notifications.seam";
+ public static final String REQUESTS_PAGE = "/requests.seam";
public static final String CREATE_PROJECT_PAGE = PROJECT_PREFIX + "/createProject.seam";
public static final String TICKET_PAGE = PROJECT_PREFIX + "/ticket.seam";
Deleted: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowNotifications.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowNotifications.java 2008-03-07 12:16:10 UTC (rev 18757)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowNotifications.java 2008-03-07 15:39:17 UTC (rev 18758)
@@ -1,22 +0,0 @@
-package org.jboss.labs.admin.action;
-
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Begin;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.core.Conversation;
-import org.jboss.labs.admin.Pages;
-
-/**
- * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
- */
- at Name("showNotifications")
-public class ShowNotifications {
-
- @In private Conversation conversation;
-
- @Begin
- public String showNotifications() {
- conversation.setDescription("Notifications");
- return Pages.NOTIFICATIONS_PAGE;
- }
-}
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowRequests.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowRequests.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/ShowRequests.java 2008-03-07 15:39:17 UTC (rev 18758)
@@ -0,0 +1,22 @@
+package org.jboss.labs.admin.action;
+
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.core.Conversation;
+import org.jboss.labs.admin.Pages;
+
+/**
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ */
+ at Name("showRequests")
+public class ShowRequests {
+
+ @In private Conversation conversation;
+
+ @Begin
+ public String showRequests() {
+ conversation.setDescription("Requests");
+ return Pages.REQUESTS_PAGE;
+ }
+}
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java 2008-03-07 12:16:10 UTC (rev 18757)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java 2008-03-07 15:39:17 UTC (rev 18758)
@@ -81,7 +81,7 @@
facesMessages.add("Project '" + projectRequest.getName() + "' created successfully");
- return Pages.NOTIFICATIONS_PAGE;
+ return Pages.REQUESTS_PAGE;
}
// Hardcoded inside:
@@ -97,6 +97,6 @@
facesMessages.add("Request has been rejected.");
- return Pages.NOTIFICATIONS_PAGE;
+ return Pages.REQUESTS_PAGE;
}
}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/RequestProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/RequestProject.java 2008-03-07 12:16:10 UTC (rev 18757)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/RequestProject.java 2008-03-07 15:39:17 UTC (rev 18758)
@@ -55,7 +55,7 @@
@CreateProcess(definition = "createProject")
public String request() {
- req.setLeadUsername(actor.getId());
+ req.setUsername(actor.getId());
entityManager.persist(req);
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/AcceptJoin.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/AcceptJoin.java 2008-03-07 12:16:10 UTC (rev 18757)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/AcceptJoin.java 2008-03-07 15:39:17 UTC (rev 18758)
@@ -24,11 +24,8 @@
package org.jboss.labs.admin.action.user;
import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.End;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Logger;
-import org.jboss.seam.annotations.bpm.EndTask;
-import org.jboss.seam.annotations.bpm.StartTask;
import org.jboss.seam.core.Conversation;
import org.jboss.seam.bpm.BusinessProcess;
import org.jboss.seam.faces.FacesMessages;
@@ -91,7 +88,7 @@
facesMessages.add("User '" + joinRequest.getUsername() +
"' is now project '" + joinRequest.getProjectId() + "' contributor." );
- return Pages.NOTIFICATIONS_PAGE;
+ return Pages.REQUESTS_PAGE;
}
private void cleanRequest(JoinRequest joinRequest) {
@@ -114,6 +111,6 @@
facesMessages.add("Request rejected.");
- return Pages.NOTIFICATIONS_PAGE;
+ return Pages.REQUESTS_PAGE;
}
}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/JoinState.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/JoinState.java 2008-03-07 12:16:10 UTC (rev 18757)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/JoinState.java 2008-03-07 15:39:17 UTC (rev 18758)
@@ -25,12 +25,7 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Create;
-import org.jboss.seam.ScopeType;
import org.jboss.labs.core.model.Project;
-import org.jboss.labs.core.model.Username;
-import org.jboss.labs.core.model.auth.User;
import javax.persistence.EntityManager;
import java.io.Serializable;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/auth/Authenticator.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/auth/Authenticator.java 2008-03-07 12:16:10 UTC (rev 18757)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/auth/Authenticator.java 2008-03-07 15:39:17 UTC (rev 18758)
@@ -32,7 +32,6 @@
import org.jboss.labs.exception.auth.NoSuchUserException;
import org.jboss.labs.injection.seam.Guice;
import org.jboss.seam.ScopeType;
-import org.jboss.seam.security.Identity;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Logger;
import org.jboss.seam.annotations.Name;
@@ -44,7 +43,6 @@
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import java.io.IOException;
-import java.security.Principal;
import java.util.Set;
import java.util.Collection;
@@ -59,6 +57,8 @@
@In private FacesContext facesContext;
+ @In("#{userPrincipal.name}") private String login;
+
@Inject private UserService userService;
@Inject private ProjectService projectService;
@@ -69,9 +69,6 @@
public void autoLogin() throws NoSuchUserException {
- final Principal p = facesContext.getExternalContext().getUserPrincipal();
- final String login = p.getName();
-
//if ((actor.getId() == null) || (!actor.getId().equals(login))) {
actor.setId(login);
//}
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/home.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/home.xhtml 2008-03-07 12:16:10 UTC (rev 18757)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/home.xhtml 2008-03-07 15:39:17 UTC (rev 18758)
@@ -13,7 +13,7 @@
<h:form id="mainForm">
<ul>
<li>
- <s:link value="Notifications" action="#{showNotifications.showNotifications()}" />
+ <s:link value="Requests" action="#{showRequests.showRequests()}" />
</li>
<li>
<s:link value="Projects" action="#{showProjects.showProjects()}"/>
Deleted: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/notifications.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/notifications.xhtml 2008-03-07 12:16:10 UTC (rev 18757)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/notifications.xhtml 2008-03-07 15:39:17 UTC (rev 18758)
@@ -1,34 +0,0 @@
-<!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">
- <h2>Notifications</h2>
- <h:form id="mainForm">
- <h:dataTable value="#{pooledTaskInstanceList}"
- rendered="#{! empty pooledTaskInstanceList}"
- var="task">
- <f:facet name="header">Notifications</f:facet>
- <h:column>
- <f:facet name="header">Id</f:facet>
- #{task.id}
- </h:column>
- <h:column>
- <f:facet name="header">Description</f:facet>
- <h:commandLink value="#{task.description}"
- action="#{reviewProjectRequest.select(task.id, task.variables['projectRequestId'])}"
- rendered="#{not empty (task.variables['projectRequestId'])}"/>
- <h:commandLink value="#{task.description}"
- action="#{reviewJoinRequest.select(task.id, task.variables['joinRequestId'])}"
- rendered="#{not empty (task.variables['joinRequestId'])}"/>
- </h:column>
- </h:dataTable>
- </h:form>
-</ui:define>
-</ui:composition>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml 2008-03-07 12:16:10 UTC (rev 18757)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml 2008-03-07 15:39:17 UTC (rev 18758)
@@ -65,7 +65,7 @@
<f:param name="taskId" value="#{tId}" />
</s:link>
<span/>
- <s:link value="Cancel" action="/notifications.seam">
+ <s:link value="Cancel" action="/requests.seam">
<s:conversationPropagation type="end"/>
</s:link>
</h:form>
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/requests.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/requests.xhtml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/requests.xhtml 2008-03-07 15:39:17 UTC (rev 18758)
@@ -0,0 +1,53 @@
+<!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">
+ <h2>Requests</h2>
+ <h:form id="mainForm">
+ <h:dataTable value="#{pooledTaskInstanceList}"
+ rendered="#{! empty pooledTaskInstanceList}"
+ var="task">
+ <f:facet name="header">Incoming Requests</f:facet>
+ <h:column>
+ <f:facet name="header">Id</f:facet>
+ #{task.id}
+ </h:column>
+ <h:column>
+ <f:facet name="header">Description</f:facet>
+ <h:commandLink value="#{task.description}"
+ action="#{reviewProjectRequest.select(task.id, task.variables['projectRequestId'])}"
+ rendered="#{not empty (task.variables['projectRequestId'])}"/>
+ <h:commandLink value="#{task.description}"
+ action="#{reviewJoinRequest.select(task.id, task.variables['joinRequestId'])}"
+ rendered="#{not empty (task.variables['joinRequestId'])}"/>
+ </h:column>
+ </h:dataTable>
+
+ <h:dataTable value="#{myTaskInstanceList}"
+ rendered="#{! empty myTaskInstanceList}"
+ var="task">
+ <f:facet name="header">My Pending Requests</f:facet>
+ <h:column>
+ <f:facet name="header">Id</f:facet>
+ #{task.id}
+ </h:column>
+ <h:column>
+ <f:facet name="header">Description</f:facet>
+ <h:commandLink value="#{task.description}"
+ action="#{reviewProjectRequest.select(task.id, task.variables['projectRequestId'])}"
+ rendered="#{not empty (task.variables['projectRequestId'])}"/>
+ <h:commandLink value="#{task.description}"
+ action="#{reviewJoinRequest.select(task.id, task.variables['joinRequestId'])}"
+ rendered="#{not empty (task.variables['joinRequestId'])}"/>
+ </h:column>
+ </h:dataTable>
+ </h:form>
+</ui:define>
+</ui:composition>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinTicket.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinTicket.xhtml 2008-03-07 12:16:10 UTC (rev 18757)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinTicket.xhtml 2008-03-07 15:39:17 UTC (rev 18758)
@@ -21,7 +21,7 @@
<f:param name="taskId" value="#{tId}" />
</h:commandLink>
<span/>
- <h:commandLink value="Cancel" action="/notifications.seam" >
+ <h:commandLink value="Cancel" action="/requests.seam" >
<s:conversationPropagation type="end"/>
</h:commandLink>
</h:form>
More information about the jboss-svn-commits
mailing list