[jboss-svn-commits] JBL Code SVN: r18676 - in labs/jbosslabs/labs-3.0-build/views/admin/src/main: java/org/jboss/labs/admin/action/user and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Mar 4 10:46:01 EST 2008
Author: wrzep
Date: 2008-03-04 10:46:00 -0500 (Tue, 04 Mar 2008)
New Revision: 18676
Removed:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/UserManager.java
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/ShowProjects.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/webapp/jbpm/createProject.jpdl.xml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/jbpm/joinProject.jpdl.xml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinProject.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinTicket.xhtml
Log:
JBLAB-904 join project enhancements
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-04 14:42:44 UTC (rev 18675)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java 2008-03-04 15:46:00 UTC (rev 18676)
@@ -23,24 +23,19 @@
package org.jboss.labs.admin.action.project;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.End;
+import com.google.inject.Inject;
+import org.jboss.labs.admin.Pages;
+import org.jboss.labs.core.model.admin.ProjectRequest;
+import org.jboss.labs.core.service.ProjectService;
+import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.exception.LabsRollbackException;
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.TaskInstance;
+import org.jboss.seam.annotations.Name;
import org.jboss.seam.bpm.BusinessProcess;
+import org.jboss.seam.core.Conversation;
import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.log.Log;
-import org.jboss.labs.admin.Pages;
-import org.jboss.labs.injection.seam.Guice;
-import org.jboss.labs.core.service.ProjectService;
-import org.jboss.labs.core.model.admin.ProjectRequest;
-import org.jboss.labs.exception.admin.CreateProjectException;
-import org.jboss.labs.exception.LabsRollbackException;
-import com.google.inject.Inject;
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
@@ -72,6 +67,10 @@
log.warn(e);
facesMessages.add("Create project: operation failed. Reason: " + e.getMessage());
return null;
+ } catch (Exception e) {
+ log.warn(e);
+ facesMessages.add("Create project: operation failed.");
+ return null;
}
businessProcess.resumeTask(tId);
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowProjects.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowProjects.java 2008-03-04 14:42:44 UTC (rev 18675)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ShowProjects.java 2008-03-04 15:46:00 UTC (rev 18676)
@@ -3,6 +3,7 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Begin;
import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.web.RequestParameter;
import org.jboss.seam.core.Conversation;
import org.jboss.labs.admin.Pages;
@@ -16,6 +17,7 @@
@Begin
public String showProjects() {
+
conversation.setDescription("Projects");
return Pages.PROJECTS_PAGE;
}
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-04 14:42:44 UTC (rev 18675)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/AcceptJoin.java 2008-03-04 15:46:00 UTC (rev 18676)
@@ -26,35 +26,65 @@
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;
+import org.jboss.seam.log.Log;
import org.jboss.labs.admin.Pages;
+import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.core.service.ProjectService;
+import org.jboss.labs.core.model.admin.JoinRequest;
+import org.jboss.labs.exception.LabsRollbackException;
+import com.google.inject.Inject;
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
*/
@Name("acceptJoin")
+ at Guice
public class AcceptJoin {
@In private long tId;
- @In Conversation conversation;
- @In BusinessProcess businessProcess;
+ @Inject private ProjectService projectService;
+ @In private Conversation conversation;
+ @In private BusinessProcess businessProcess;
+
+ @In private FacesMessages facesMessages;
+
+ @Logger private Log log;
+
// Hardcoded inside:
// @StartTask @EndTask(transition = "approve")
// @End
- public String accept() {
+ public String accept(JoinRequest joinRequest) {
+ try {
+ projectService.addUserToProject(joinRequest);
+ } catch (LabsRollbackException e) {
+ log.warn(e);
+ facesMessages.add("Add user: operation failed. Reason: " + e.getMessage());
+ return null;
+ } catch (Exception e) {
+ log.warn(e);
+ facesMessages.add("Add user: operation failed.");
+ return null;
+ }
+
businessProcess.resumeTask(tId);
businessProcess.startTask();
businessProcess.endTask("approve");
conversation.end();
+ facesMessages.add("User '" + joinRequest.getUsername() +
+ "' is now project '" + joinRequest.getProjectId() + "' contributor." );
+
return Pages.NOTIFICATIONS_PAGE;
}
@@ -69,6 +99,8 @@
conversation.end();
+ facesMessages.add("Request rejected.");
+
return Pages.NOTIFICATIONS_PAGE;
}
}
\ No newline at end of file
Deleted: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/UserManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/UserManager.java 2008-03-04 14:42:44 UTC (rev 18675)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/user/UserManager.java 2008-03-04 15:46:00 UTC (rev 18676)
@@ -1,60 +0,0 @@
-/*
-* 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.admin.action.user;
-
-import com.google.inject.Inject;
-import org.jboss.labs.core.model.admin.JoinRequest;
-import org.jboss.labs.core.service.ProjectService;
-import org.jboss.labs.injection.seam.Guice;
-import org.jboss.labs.exception.admin.ProjectNotFoundException;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Logger;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.log.Log;
-
-
- at Name("userManager")
- at Guice
-public class UserManager {
-
- @In(create = true) private JoinRequest joinRequest;
-
- @Logger Log log;
-
- @Inject private ProjectService projectService;
-
- public boolean addUserToProject() {
-
- try {
- projectService.addUserToProject(joinRequest);
- } catch (ProjectNotFoundException e) {
- log.warn(e);
- return false;
- } catch (Exception e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- }
-
- return true;
- }
-}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/jbpm/createProject.jpdl.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/jbpm/createProject.jpdl.xml 2008-03-04 14:42:44 UTC (rev 18675)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/jbpm/createProject.jpdl.xml 2008-03-04 15:46:00 UTC (rev 18676)
@@ -11,7 +11,7 @@
</start-state>
<task-node name="decide">
- <task name="approve" description="Review project request: #{projectRequest.name}">
+ <task name="approve" description="Request to create new project: '#{projectRequest.name}'">
<assignment pooled-actors="reviewer"/>
</task>
<transition name="approve" to="done">
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/jbpm/joinProject.jpdl.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/jbpm/joinProject.jpdl.xml 2008-03-04 14:42:44 UTC (rev 18675)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/jbpm/joinProject.jpdl.xml 2008-03-04 15:46:00 UTC (rev 18676)
@@ -11,26 +11,18 @@
</start-state>
<task-node name="decide">
- <task name="approve" description="Join project request from #{joinRequest.username}">
+ <task name="approve" description="User '#{joinRequest.username}' wants to join project '#{joinRequest.projectId}'">
<assignment pooled-actors="reviewer"/>
</task>
- <transition name="approve" to="add">
+ <transition name="approve" to="done">
<action expression="#{joinNotifier.approved}"/>
+ <action expression="#{joinNotifier.userAdded}"/>
</transition>
<transition name="reject" to="done">
<action expression="#{joinNotifier.rejected}"/>
</transition>
- </task-node>
+ </task-node>
- <decision name="add" expression="#{userManager.addUserToProject}">
- <transition name="true" to="done">
- <action expression="#{joinNotifier.userAdded}"/>
- </transition>
- <transition name="false" to="done">
- <action expression="#{joinNotifier.addFailed}"/>
- </transition>
- </decision>
-
<end-state name="done"/>
</process-definition>
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinProject.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinProject.xhtml 2008-03-04 14:42:44 UTC (rev 18675)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinProject.xhtml 2008-03-04 15:46:00 UTC (rev 18676)
@@ -11,14 +11,12 @@
<ui:define name="body">
- <rich:panel>
- <f:facet name="header">Join Project</f:facet>
- <h:form id="mainForm" >
- Do you want to apply to join project #{project.name}?
- <h:commandButton value="Yes" action="#{joinProject.createRequest}"/>
- <h:commandButton value="No" action="/project/project.seam"/>
- </h:form>
- </rich:panel>
+ <h2>Join Project</h2>
+ <h:form id="mainForm" >
+ Do you want to apply to join project '#{project.name}'?
+ <h:commandButton value="Yes" action="#{joinProject.createRequest}"/>
+ <h:commandButton value="No" action="/project/project.seam"/>
+ </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-04 14:42:44 UTC (rev 18675)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinTicket.xhtml 2008-03-04 15:46:00 UTC (rev 18676)
@@ -10,25 +10,21 @@
<ui:define name="body">
- <h:messages globalOnly="true" styleClass="message"/>
+ <h2>Review join project request</h2>
+ User '#{jRequest.username}' wants to join project '#{jRequest.projectId}'.
+ <h:form id="mainForm">
+ <h:commandLink value="Accept" action="#{acceptJoin.accept(jRequest)}" >
+ <f:param name="taskId" value="#{tId}" />
+ </h:commandLink>
+ <span/>
+ <h:commandLink value="Reject" action="#{acceptJoin.reject}" >
+ <f:param name="taskId" value="#{tId}" />
+ </h:commandLink>
+ <span/>
+ <h:commandLink value="Cancel" action="/notifications.seam" >
+ <s:conversationPropagation type="end"/>
+ </h:commandLink>
+ </h:form>
- <rich:panel>
- <f:facet name="header">Review join project request</f:facet>
- User #{jRequest.username} wants to join project #{jRequest.projectId}.
- <h:form id="mainForm">
- <h:commandLink value="Accept" action="#{acceptJoin.accept}" >
- <f:param name="taskId" value="#{tId}" />
- </h:commandLink>
- <span/>
- <h:commandLink value="Reject" action="#{acceptJoin.reject}" >
- <f:param name="taskId" value="#{tId}" />
- </h:commandLink>
- <span/>
- <h:commandLink value="Cancel" action="/notifications.seam" >
- <s:conversationPropagation type="end"/>
- </h:commandLink>
- </h:form>
- </rich:panel>
-
</ui:define>
</ui:composition>
More information about the jboss-svn-commits
mailing list