[jboss-svn-commits] JBL Code SVN: r19412 - in labs/jbosslabs/labs-3.0-build: services/project-service/src/main/java/org/jboss/labs/core/service/impl and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Apr 4 07:33:42 EDT 2008
Author: wrzep
Date: 2008-04-04 07:33:42 -0400 (Fri, 04 Apr 2008)
New Revision: 19412
Added:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/projectRequestAccepted.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/projectRequestRejected.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/core/core-model/src/main/java/org/jboss/labs/core/model/admin/Request.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/Mailer.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/webapp/project/createProject.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml
Log:
JBLAB-939 allow admin to add a comment while accepting/rejecting a ticket
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-04-04 09:59:13 UTC (rev 19411)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/JoinRequest.java 2008-04-04 11:33:42 UTC (rev 19412)
@@ -23,9 +23,9 @@
package org.jboss.labs.core.model.admin;
+import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import javax.persistence.Transient;
-import javax.persistence.DiscriminatorValue;
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
@@ -62,4 +62,8 @@
public String toString() {
return "JoinRequest(" + username + ", " + projectId + ", " + finished + ")";
}
+
+ public String toUserRequestString() {
+ return "Request to join project '" + projectId + "'.";
+ }
}
\ No newline at end of file
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-04-04 09:59:13 UTC (rev 19411)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/ProjectRequest.java 2008-04-04 11:33:42 UTC (rev 19412)
@@ -175,8 +175,12 @@
return "ProjectRequest(" + username + ", " + projectId + ")";
}
- /* private String escape(String string, String w) {
+ public String toUserRequestString() {
+ return getDescription();
+ }
+ /* private String escape(String string, String w) {
+
StringBuilder sb = new StringBuilder();
for (int i = 0; i < string.length(); i++) {
Modified: 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 2008-04-04 09:59:13 UTC (rev 19411)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/Request.java 2008-04-04 11:33:42 UTC (rev 19412)
@@ -48,6 +48,7 @@
protected long taskId;
protected Date created;
protected String comment;
+ protected String adminComment;
public Request() {}
@@ -116,6 +117,14 @@
this.comment = comment;
}
+ public String getAdminComment() {
+ return adminComment;
+ }
+
+ public void setAdminComment(String adminComment) {
+ this.adminComment = adminComment;
+ }
+
@Transient
public abstract String getDescription();
@@ -129,4 +138,6 @@
public String toString() {
return "Request(" + username + ", " + projectId + ", " + finished + ", " + taskId + ")";
}
+
+ public abstract String toUserRequestString();
}
\ 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-04-04 09:59:13 UTC (rev 19411)
+++ labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java 2008-04-04 11:33:42 UTC (rev 19412)
@@ -73,8 +73,6 @@
// TODO forums
- System.out.println("befre persist");
-
em.persist(p);
try {
@@ -86,8 +84,6 @@
throw new LabsRollbackException(e);
}
-
- System.out.println("ProjectServiceBean.createProject end");
}
public boolean canJoin(String username, Project project) {
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Mailer.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Mailer.java 2008-04-04 09:59:13 UTC (rev 19411)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Mailer.java 2008-04-04 11:33:42 UTC (rev 19412)
@@ -23,6 +23,7 @@
package org.jboss.labs.admin;
+import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Logger;
import org.jboss.seam.annotations.Name;
@@ -31,15 +32,29 @@
@Name("mailer")
+ at AutoCreate
public class Mailer {
@In(create=true) private Renderer renderer;
@Logger private Log log;
public void sendJiraRequest() {
+ send(Pages.EMAIL_JIRA_REQUEST);
+ }
+
+ public void sendProjectAccepted() {
+ send(Pages.EMAIL_PROJECT_ACCEPTED);
+ }
+
+ public void sendProjectRejected() {
+ send(Pages.EMAIL_PROJECT_REJECTED);
+ }
+
+
+ public void send(String emailPage) {
try {
- renderer.render(Pages.EMAIL_JIRA_REQUEST);
- log.info("Email sent to #{emailIT}.");
+ renderer.render(emailPage);
+ log.info("Email sent.");
}
catch (Exception e) {
log.warn(e);
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-04-04 09:59:13 UTC (rev 19411)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java 2008-04-04 11:33:42 UTC (rev 19412)
@@ -52,10 +52,12 @@
public static final String SIGN_CA_FIRST_PAGE = USER_PREFIX+ "/signCAfirst.seam";
public static final String JOIN_TICKET_PAGE = USER_PREFIX + "/joinTicket.seam";
- public static final String EMAIL_JIRA_REQUEST = EMAIL_PREFIX + "/jiraRequest.xhtml";
-
public static final String LICENSES_PAGE = LICENSE_PREFIX + "/licenses.seam";
public static final String LICENSE_PAGE = LICENSE_PREFIX + "/license.seam";
public static final String ADD_LICENSE_PAGE = LICENSE_PREFIX + "/addLicense.seam";
public static final String DELETE_LICENSE_PAGE = LICENSE_PREFIX + "/deleteLicense.seam";
+
+ public static final String EMAIL_JIRA_REQUEST = EMAIL_PREFIX + "/jiraRequest.xhtml";
+ public static final String EMAIL_PROJECT_ACCEPTED = EMAIL_PREFIX + "/projectRequestAccepted.xhtml";
+ public static final String EMAIL_PROJECT_REJECTED = EMAIL_PREFIX + "/projectRequestRejected.xhtml";
}
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-04-04 09:59:13 UTC (rev 19411)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/AcceptProject.java 2008-04-04 11:33:42 UTC (rev 19412)
@@ -24,6 +24,7 @@
package org.jboss.labs.admin.action.project;
import com.google.inject.Inject;
+import org.jboss.labs.admin.Mailer;
import org.jboss.labs.admin.Pages;
import org.jboss.labs.core.model.admin.ProjectRequest;
import org.jboss.labs.core.model.admin.Request;
@@ -61,11 +62,16 @@
@Logger private Log log;
+ @In private Mailer mailer;
+
// Hardcoded inside:
// @StartTask @EndTask(transition = "approve")
// @End
public String accept(ProjectRequest projectRequest) {
+ System.out.println("AcceptProject.accept " + projectRequest.getAdminComment());
+ //entityManager.merge(projectRequest);
+
try {
projectService.createProject(projectRequest);
} catch (LabsRollbackException e) {
@@ -82,6 +88,9 @@
businessProcess.resumeTask(tId);
businessProcess.startTask();
+
+ mailer.sendProjectAccepted();
+
businessProcess.endTask("approve");
conversation.end();
@@ -100,6 +109,9 @@
businessProcess.resumeTask(tId);
businessProcess.startTask();
+
+ mailer.sendProjectRejected();
+
businessProcess.endTask("reject");
conversation.end();
@@ -110,6 +122,7 @@
}
private void cleanRequest(Request request) {
+
request.setFinished(true);
//entityManager.merge(request);
}
Copied: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/projectRequestAccepted.xhtml (from rev 19410, labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/jiraRequest.xhtml)
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/projectRequestAccepted.xhtml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/projectRequestAccepted.xhtml 2008-04-04 11:33:42 UTC (rev 19412)
@@ -0,0 +1,16 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:from name="JBoss.org" address="#{emailFrom}" />
+ <m:replyTo>#{emailReplyTo}</m:replyTo>
+ <m:to name="#{user.name}">#{user.email}</m:to>
+ <m:subject>[jboss.org] Your project request has been accepted</m:subject>
+
+ <m:body>
+ Your request to create project '#{projectRequest.projectId}' has been accepted.
+ <p>Comment from jboss.org admin:<br/>#{projectRequest.adminComment}</p>
+ jboss.org team
+ </m:body>
+
+</m:message>
\ No newline at end of file
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/projectRequestRejected.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/projectRequestRejected.xhtml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/email/projectRequestRejected.xhtml 2008-04-04 11:33:42 UTC (rev 19412)
@@ -0,0 +1,16 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:from name="JBoss.org" address="#{emailFrom}" />
+ <m:replyTo>#{emailReplyTo}</m:replyTo>
+ <m:to name="#{user.name}">#{user.email}</m:to>
+ <m:subject>[jboss.org] Your project request has been rejected</m:subject>
+
+ <m:body>
+ <p>Your request to create project '#{projectRequest.projectId}' has been rejected.</p>
+ <p>Comment from jboss.org admin:<br/>#{projectRequest.adminComment}</p>
+ jboss.org team
+ </m:body>
+
+</m:message>
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/createProject.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/createProject.xhtml 2008-04-04 09:59:13 UTC (rev 19411)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/createProject.xhtml 2008-04-04 11:33:42 UTC (rev 19412)
@@ -52,7 +52,7 @@
<tr>
<th>License</th>
<td>
- <h:selectOneMenu value="#{req.license}" required="true">
+ <h:selectOneMenu value="#{req.license}" required="true" requiredMessage="Please select a license">
<s:selectItems value="#{licenses}" var="l"
label="#{l.toLicenseString()}"
noSelectionLabel="Please Select..."/>
@@ -63,7 +63,7 @@
<tr>
<th>Desired groups</th>
<td>
- <h:selectManyListbox value="#{req.groups}" required="true">
+ <h:selectManyListbox value="#{req.groups}" required="true" requiredMessage="Please select desired groups">
<s:selectItems value="#{groups}" var="g"
label="#{g.name}"/>
<s:convertEntity/>
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-04-04 09:59:13 UTC (rev 19411)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml 2008-04-04 11:33:42 UTC (rev 19412)
@@ -69,7 +69,7 @@
</td>
</tr>
<tr>
- <th>Current project URL (optional)</th>
+ <th>Current project URL</th>
<td>
<h:outputLink value="#{prjRequest.oldProjectUrl}">
#{prjRequest.oldProjectUrl}
@@ -77,19 +77,23 @@
</td>
</tr>
<tr>
- <th>Comment (optional)</th>
+ <th>Comment</th>
<td><h:outputText value="#{prjRequest.comment}"/></td>
</tr>
+ <tr>
+ <th>Your comment</th>
+ <td><h:inputTextarea value="#{prjRequest.adminComment}"/></td>
+ </tr>
</table>
</s:validateAll>
<h:commandLink value="Accept" action="#{acceptProject.accept(prjRequest)}" >
<f:param name="taskId" value="#{tId}" />
</h:commandLink>
<span/>
- <s:link value="Reject" action="#{acceptProject.reject(prjRequest)}">
+ <h:commandLink value="Reject" action="#{acceptProject.reject(prjRequest)}">
<ui:remove><!-- s:link here to skip validation --></ui:remove>
<f:param name="taskId" value="#{tId}" />
- </s:link>
+ </h:commandLink>
<span/>
<s:link value="Cancel" action="/requests.seam">
<s:conversationPropagation type="end"/>
More information about the jboss-svn-commits
mailing list