[jboss-svn-commits] JBL Code SVN: r18532 - in labs/jbosslabs/labs-3.0-build/views/admin/src/main: java/org/jboss/labs/admin/action/project and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Feb 20 12:20:53 EST 2008
Author: wrzep
Date: 2008-02-20 12:20:53 -0500 (Wed, 20 Feb 2008)
New Revision: 18532
Added:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/jbpm/
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/project/
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/project.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/
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
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/signCAfirst.xhtml
Removed:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/createProject.jpdl.xml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/createProject.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/joinProject.jpdl.xml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/joinProject.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/joinTicket.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/signCAfirst.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/ticket.xhtml
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/Pages.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ProjectManager.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/layout/template.xhtml
Log:
JBLAB-904 refactoring
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-02-20 16:59:06 UTC (rev 18531)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Mailer.java 2008-02-20 17:20:53 UTC (rev 18532)
@@ -38,7 +38,7 @@
public void sendJiraRequest() {
try {
- renderer.render("/email/jiraRequest.xhtml");
+ renderer.render(Pages.EMAIL_JIRA_REQUEST);
log.info("Email sent to #{emailIT}.");
}
catch (Exception 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-02-20 16:59:06 UTC (rev 18531)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java 2008-02-20 17:20:53 UTC (rev 18532)
@@ -28,14 +28,21 @@
*/
public class Pages {
+ private static final String PROJECT_PREFIX = "/project";
+ private static final String USER_PREFIX = "/user";
+ private static final String EMAIL_PREFIX = "email";
public static final String CONFIRMATION_PAGE = "/confirmation.seam";
public static final String HOME_PAGE = "/home.seam";
- public static final String CREATE_PROJECT_PAGE = "/createProject.seam";
public static final String ERROR_PAGE = "/error.seam";
- public static final String TICKET_PAGE = "/ticket.seam";
- public static final String PROJECT_PAGE = "/project.seam";
- public static final String JOIN_PROJECT_PAGE = "/joinProject.seam";
- public static final String SIGN_CA_FIRST_PAGE = "/signCAfirst.seam";
- public static final String JOIN_TICKET_PAGE = "/joinTicket.seam";
+
+ public static final String CREATE_PROJECT_PAGE = PROJECT_PREFIX + "/createProject.seam";
+ public static final String TICKET_PAGE = PROJECT_PREFIX + "/ticket.seam";
+ public static final String PROJECT_PAGE = PROJECT_PREFIX + "/project.seam";
+
+ public static final String JOIN_PROJECT_PAGE = USER_PREFIX + "/joinProject.seam";
+ 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";
}
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ProjectManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ProjectManager.java 2008-02-20 16:59:06 UTC (rev 18531)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/action/project/ProjectManager.java 2008-02-20 17:20:53 UTC (rev 18532)
@@ -46,7 +46,7 @@
@Logger private Log log;
- public boolean addUserToProject() {
+ public boolean createProject() {
try {
projectService.createProject(projectRequest);
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-02-20 16:59:06 UTC (rev 18531)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/WEB-INF/components.xml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -53,8 +53,8 @@
<bpm:jbpm>
<bpm:process-definitions>
- <value>createProject.jpdl.xml</value>
- <value>joinProject.jpdl.xml</value>
+ <value>jbpm/createProject.jpdl.xml</value>
+ <value>jbpm/joinProject.jpdl.xml</value>
</bpm:process-definitions>
</bpm:jbpm>
Deleted: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/createProject.jpdl.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/createProject.jpdl.xml 2008-02-20 16:59:06 UTC (rev 18531)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/createProject.jpdl.xml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -1,39 +0,0 @@
-<process-definition
- name="createProject"
- xmlns="urn:jbpm.org:jpdl-3.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd">
-
- <start-state name="start">
- <transition to="decide">
- <action expression="#{notifier.newRequest}" />
- </transition>
- </start-state>
-
- <task-node name="decide">
- <task name="approve" description="Review project request: #{projectRequest.name}">
- <assignment pooled-actors="reviewer"/>
- </task>
- <transition name="approve" to="create">
- <action expression="#{notifier.projectApproved}"/>
- </transition>
- <transition name="reject" to="done">
- <action expression="#{notifier.projectRejected}"/>
- </transition>
- </task-node>
-
- <decision name="create" expression="#{projectManager.createProject}">
- <transition name="true" to="done">
- <condition expression="#{projectRequest.jira}">
- <action expression="#{mailer.sendJiraRequest}"/>
- </condition>
- <action expression="#{notifier.projectCreated}"/>
- </transition>
- <transition name="false" to="done">
- <action expression="#{notifier.createProjectFailed}"/>
- </transition>
- </decision>
-
- <end-state name="done"/>
-
-</process-definition>
\ No newline at end of file
Deleted: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/createProject.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/createProject.xhtml 2008-02-20 16:59:06 UTC (rev 18531)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/createProject.xhtml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -1,69 +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"
- xmlns:a4j="http://richfaces.org/a4j"
- template="layout/template.xhtml">
-
-<ui:define name="body">
-
- <rich:panel>
- <f:facet name="header">Create Project Request</f:facet>
- <h:form id="mainForm" >
- <h:messages styleClass="message" id="messages"/>
- <s:validateAll>
- <table>
- <tr>
- <th>Email (TODO: get email from UserService):</th>
- <td>
- <h:inputText value="#{req.email}" required="true" id="email" requiredMessage="Email is required">
- <f:validator validatorId="emailValidator"/>
- </h:inputText>
- </td>
- </tr>
- <tr>
- <th>Project Name:</th>
- <td>
- <h:inputText value="#{req.name}" id="projectName" required="true" requiredMessage="Project Name is required."/>
- </td>
- </tr>
- <tr>
- <th>Project ID:</th>
- <td>
- <h:inputText value="#{req.projectId}" id="projectId" required="true" requiredMessage="Project ID is required.">
- <f:validator validatorId="uniqueProjectIdValidator"/>
- </h:inputText>
- </td>
- </tr>
- <tr>
- <th>JIRA key:</th>
- <td><h:inputText value="#{req.jiraKey}" id="jiraKey" required="true" requiredMessage="JIRA key is required."/></td>
- </tr>
- <tr>
- <th>Code repository?</th>
- <td><h:selectBooleanCheckbox value="#{req.repository}"/></td>
- </tr>
- <tr>
- <th>JIRA?</th>
- <td><h:selectBooleanCheckbox value="#{req.jira}"/></td>
- </tr>
- <tr>
- <th>Forums and Mailing Lists?</th>
- <td>
- dev <h:selectBooleanCheckbox value="#{req.devForum}"/><br/>
- user <h:selectBooleanCheckbox value="#{req.userForum}"/><br/>
- announce <h:selectBooleanCheckbox value="#{req.announceForum}"/>
- </td>
- </tr>
- </table>
- </s:validateAll>
- <h:commandButton value="Submit" action="#{requestProject.request}" />
- </h:form>
- </rich:panel>
-
-</ui:define>
-</ui:composition>
Added: 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 (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/jbpm/createProject.jpdl.xml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -0,0 +1,39 @@
+<process-definition
+ name="createProject"
+ xmlns="urn:jbpm.org:jpdl-3.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd">
+
+ <start-state name="start">
+ <transition to="decide">
+ <action expression="#{notifier.newRequest}" />
+ </transition>
+ </start-state>
+
+ <task-node name="decide">
+ <task name="approve" description="Review project request: #{projectRequest.name}">
+ <assignment pooled-actors="reviewer"/>
+ </task>
+ <transition name="approve" to="create">
+ <action expression="#{notifier.projectApproved}"/>
+ </transition>
+ <transition name="reject" to="done">
+ <action expression="#{notifier.projectRejected}"/>
+ </transition>
+ </task-node>
+
+ <decision name="create" expression="#{projectManager.createProject}">
+ <transition name="true" to="done">
+ <condition expression="#{projectRequest.jira}">
+ <action expression="#{mailer.sendJiraRequest}"/>
+ </condition>
+ <action expression="#{notifier.projectCreated}"/>
+ </transition>
+ <transition name="false" to="done">
+ <action expression="#{notifier.createProjectFailed}"/>
+ </transition>
+ </decision>
+
+ <end-state name="done"/>
+
+</process-definition>
\ No newline at end of file
Added: 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 (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/jbpm/joinProject.jpdl.xml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -0,0 +1,36 @@
+<process-definition
+ name="joinProject"
+ xmlns="urn:jbpm.org:jpdl-3.2"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd">
+
+ <start-state name="start">
+ <transition to="decide">
+ <action expression="#{joinNotifier.newRequest}" />
+ </transition>
+ </start-state>
+
+ <task-node name="decide">
+ <task name="approve" description="Join project request from #{joinRequest.username}">
+ <assignment pooled-actors="reviewer"/>
+ </task>
+ <transition name="approve" to="add">
+ <action expression="#{joinNotifier.approved}"/>
+ </transition>
+ <transition name="reject" to="done">
+ <action expression="#{joinNotifier.rejected}"/>
+ </transition>
+ </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
Deleted: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/joinProject.jpdl.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/joinProject.jpdl.xml 2008-02-20 16:59:06 UTC (rev 18531)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/joinProject.jpdl.xml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -1,36 +0,0 @@
-<process-definition
- name="joinProject"
- xmlns="urn:jbpm.org:jpdl-3.2"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd">
-
- <start-state name="start">
- <transition to="decide">
- <action expression="#{joinNotifier.newRequest}" />
- </transition>
- </start-state>
-
- <task-node name="decide">
- <task name="approve" description="Join project request from #{joinRequest.username}">
- <assignment pooled-actors="reviewer"/>
- </task>
- <transition name="approve" to="add">
- <action expression="#{joinNotifier.approved}"/>
- </transition>
- <transition name="reject" to="done">
- <action expression="#{joinNotifier.rejected}"/>
- </transition>
- </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
Deleted: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/joinProject.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/joinProject.xhtml 2008-02-20 16:59:06 UTC (rev 18531)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/joinProject.xhtml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -1,24 +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"
- xmlns:a4j="http://richfaces.org/a4j"
- template="layout/template.xhtml">
-
-<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.seam"/>
- </h:form>
- </rich:panel>
-
-</ui:define>
-</ui:composition>
Deleted: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/joinTicket.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/joinTicket.xhtml 2008-02-20 16:59:06 UTC (rev 18531)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/joinTicket.xhtml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -1,32 +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">
-
- <h:messages globalOnly="true" styleClass="message"/>
-
- <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="/home.seam" />
- </h:form>
- </rich:panel>
-
-</ui:define>
-</ui:composition>
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-02-20 16:59:06 UTC (rev 18531)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/template.xhtml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -9,7 +9,7 @@
<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" />
+ <link href="/admin/stylesheet/theme.css" rel="stylesheet" type="text/css" />
</ui:insert>
</head>
Added: 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 (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/createProject.xhtml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -0,0 +1,69 @@
+<!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"
+ xmlns:a4j="http://richfaces.org/a4j"
+ template="../layout/template.xhtml">
+
+<ui:define name="body">
+
+ <rich:panel>
+ <f:facet name="header">Create Project Request</f:facet>
+ <h:form id="mainForm" >
+ <h:messages styleClass="message" id="messages"/>
+ <s:validateAll>
+ <table>
+ <tr>
+ <th>Email (TODO: get email from UserService):</th>
+ <td>
+ <h:inputText value="#{req.email}" required="true" id="email" requiredMessage="Email is required">
+ <f:validator validatorId="emailValidator"/>
+ </h:inputText>
+ </td>
+ </tr>
+ <tr>
+ <th>Project Name:</th>
+ <td>
+ <h:inputText value="#{req.name}" id="projectName" required="true" requiredMessage="Project Name is required."/>
+ </td>
+ </tr>
+ <tr>
+ <th>Project ID:</th>
+ <td>
+ <h:inputText value="#{req.projectId}" id="projectId" required="true" requiredMessage="Project ID is required.">
+ <f:validator validatorId="uniqueProjectIdValidator"/>
+ </h:inputText>
+ </td>
+ </tr>
+ <tr>
+ <th>JIRA key:</th>
+ <td><h:inputText value="#{req.jiraKey}" id="jiraKey" required="true" requiredMessage="JIRA key is required."/></td>
+ </tr>
+ <tr>
+ <th>Code repository?</th>
+ <td><h:selectBooleanCheckbox value="#{req.repository}"/></td>
+ </tr>
+ <tr>
+ <th>JIRA?</th>
+ <td><h:selectBooleanCheckbox value="#{req.jira}"/></td>
+ </tr>
+ <tr>
+ <th>Forums and Mailing Lists?</th>
+ <td>
+ dev <h:selectBooleanCheckbox value="#{req.devForum}"/><br/>
+ user <h:selectBooleanCheckbox value="#{req.userForum}"/><br/>
+ announce <h:selectBooleanCheckbox value="#{req.announceForum}"/>
+ </td>
+ </tr>
+ </table>
+ </s:validateAll>
+ <h:commandButton value="Submit" action="#{requestProject.request}" />
+ </h:form>
+ </rich:panel>
+
+</ui:define>
+</ui:composition>
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/project.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/project.xhtml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/project.xhtml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -0,0 +1,57 @@
+<!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">
+
+ <h:messages globalOnly="true" styleClass="message"/>
+
+ <rich:panel>
+ <f:facet name="header">Project Details</f:facet>
+ <h:form id="mainForm">
+ <table>
+ <tr>
+ <th>Project Name:</th>
+ <td>#{project.name}</td>
+ </tr>
+ <tr>
+ <th>#{(empty project.issueTracker) ? '' : project.issueTracker.type} Issue Tracker:</th>
+ <td>#{project.issueTracker.url}</td>
+ </tr>
+ <tr>
+ <th>#{(empty project.commiterRepository) ? '' : project.repositoryType} Repository:</th>
+ <td>
+ #{project.anonymusRepository}<br/>
+ #{project.commiterRepository}
+ </td>
+ </tr>
+ <tr>
+ <th>Leads:</th>
+ <td>
+ <ui:repeat var="lead" value="#{project.projectLeads}">
+ #{lead.username}
+ </ui:repeat>
+ </td>
+ </tr>
+ <tr>
+ <th>Contributors:</th>
+ <td>
+ <ui:repeat var="contributor" value="#{project.contributors}">
+ #{contributor.username}
+ </ui:repeat>
+ <h:commandLink action="#{joinProject.join}" value="Join!"
+ rendered="#{project.canJoin(user.name)}"/>
+ </td>
+ </tr>
+ </table>
+ </h:form>
+ </rich:panel>
+
+</ui:define>
+</ui:composition>
Added: 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 (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project/ticket.xhtml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -0,0 +1,65 @@
+<!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">
+
+ <h:messages globalOnly="true" styleClass="message"/>
+
+ <rich:panel>
+ <f:facet name="header">Review project request</f:facet>
+ <h:form id="mainForm">
+ <table>
+ <tr>
+ <th>Project Lead (email):</th>
+ <td>#{prjRequest.email}</td>
+ </tr>
+ <tr>
+ <th>Project Name:</th>
+ <td>#{prjRequest.name}</td>
+ </tr>
+ <tr>
+ <th>Project ID:</th>
+ <td>#{prjRequest.projectId}</td>
+ </tr>
+ <tr>
+ <th>JIRA key:</th>
+ <td>#{prjRequest.jiraKey}</td>
+ </tr>
+ <tr>
+ <th>Code repository?</th>
+ <td>#{prjRequest.repository ? 'yes' : 'no'}</td>
+ </tr>
+ <tr>
+ <th>JIRA?</th>
+ <td>#{prjRequest.jira ? 'yes' : 'no'}</td>
+ </tr>
+ <tr>
+ <th>Forums and Mailing Lists?</th>
+ <td>
+ dev #{prjRequest.devForum ? 'yes' : 'no'}<br/>
+ user #{prjRequest.userForum ? 'yes' : 'no'}<br/>
+ announce #{prjRequest.announceForum ? 'yes' : 'no'}
+ </td>
+ </tr>
+ </table>
+ <h:commandLink value="Accept" action="#{acceptProject.accept}" >
+ <f:param name="taskId" value="#{tId}" />
+ </h:commandLink>
+ <span/>
+ <h:commandLink value="Reject" action="#{acceptProject.reject}" >
+ <f:param name="taskId" value="#{tId}" />
+ </h:commandLink>
+ <span/>
+ <h:commandLink value="Cancel" action="/home.seam" />
+ </h:form>
+ </rich:panel>
+
+</ui:define>
+</ui:composition>
Deleted: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project.xhtml 2008-02-20 16:59:06 UTC (rev 18531)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/project.xhtml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -1,57 +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">
-
- <h:messages globalOnly="true" styleClass="message"/>
-
- <rich:panel>
- <f:facet name="header">Project Details</f:facet>
- <h:form id="mainForm">
- <table>
- <tr>
- <th>Project Name:</th>
- <td>#{project.name}</td>
- </tr>
- <tr>
- <th>#{(empty project.issueTracker) ? '' : project.issueTracker.type} Issue Tracker:</th>
- <td>#{project.issueTracker.url}</td>
- </tr>
- <tr>
- <th>#{(empty project.commiterRepository) ? '' : project.repositoryType} Repository:</th>
- <td>
- #{project.anonymusRepository}<br/>
- #{project.commiterRepository}
- </td>
- </tr>
- <tr>
- <th>Leads:</th>
- <td>
- <ui:repeat var="lead" value="#{project.projectLeads}">
- #{lead.username}
- </ui:repeat>
- </td>
- </tr>
- <tr>
- <th>Contributors:</th>
- <td>
- <ui:repeat var="contributor" value="#{project.contributors}">
- #{contributor.username}
- </ui:repeat>
- <h:commandLink action="#{joinProject.join}" value="Join!"
- rendered="#{project.canJoin(user.name)}"/>
- </td>
- </tr>
- </table>
- </h:form>
- </rich:panel>
-
-</ui:define>
-</ui:composition>
Deleted: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/signCAfirst.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/signCAfirst.xhtml 2008-02-20 16:59:06 UTC (rev 18531)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/signCAfirst.xhtml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -1,27 +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">
-
- <rich:panel>
- <f:facet name="header">Sign CAs</f:facet>
- This project requires...
- <br/>
- Please sign required CAs first.
- <h:dataTable value="#{cas}" var="ca">
- <h:column>
- #{ca.name}
- </h:column>
-
- </h:dataTable>
- </rich:panel>
-
-</ui:define>
-</ui:composition>
Deleted: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/ticket.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/ticket.xhtml 2008-02-20 16:59:06 UTC (rev 18531)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/ticket.xhtml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -1,65 +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">
-
- <h:messages globalOnly="true" styleClass="message"/>
-
- <rich:panel>
- <f:facet name="header">Review project request</f:facet>
- <h:form id="mainForm">
- <table>
- <tr>
- <th>Project Lead (email):</th>
- <td>#{prjRequest.email}</td>
- </tr>
- <tr>
- <th>Project Name:</th>
- <td>#{prjRequest.name}</td>
- </tr>
- <tr>
- <th>Project ID:</th>
- <td>#{prjRequest.projectId}</td>
- </tr>
- <tr>
- <th>JIRA key:</th>
- <td>#{prjRequest.jiraKey}</td>
- </tr>
- <tr>
- <th>Code repository?</th>
- <td>#{prjRequest.repository ? 'yes' : 'no'}</td>
- </tr>
- <tr>
- <th>JIRA?</th>
- <td>#{prjRequest.jira ? 'yes' : 'no'}</td>
- </tr>
- <tr>
- <th>Forums and Mailing Lists?</th>
- <td>
- dev #{prjRequest.devForum ? 'yes' : 'no'}<br/>
- user #{prjRequest.userForum ? 'yes' : 'no'}<br/>
- announce #{prjRequest.announceForum ? 'yes' : 'no'}
- </td>
- </tr>
- </table>
- <h:commandLink value="Accept" action="#{acceptProject.accept}" >
- <f:param name="taskId" value="#{tId}" />
- </h:commandLink>
- <span/>
- <h:commandLink value="Reject" action="#{acceptProject.reject}" >
- <f:param name="taskId" value="#{tId}" />
- </h:commandLink>
- <span/>
- <h:commandLink value="Cancel" action="/home.seam" />
- </h:form>
- </rich:panel>
-
-</ui:define>
-</ui:composition>
Added: 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 (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinProject.xhtml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -0,0 +1,24 @@
+<!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"
+ xmlns:a4j="http://richfaces.org/a4j"
+ template="../layout/template.xhtml">
+
+<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>
+
+</ui:define>
+</ui:composition>
Added: 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 (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/joinTicket.xhtml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -0,0 +1,32 @@
+<!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">
+
+ <h:messages globalOnly="true" styleClass="message"/>
+
+ <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="/home.seam" />
+ </h:form>
+ </rich:panel>
+
+</ui:define>
+</ui:composition>
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/signCAfirst.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/signCAfirst.xhtml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/user/signCAfirst.xhtml 2008-02-20 17:20:53 UTC (rev 18532)
@@ -0,0 +1,27 @@
+<!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>
+ <f:facet name="header">Sign CAs</f:facet>
+ This project requires...
+ <br/>
+ Please sign required CAs first.
+ <h:dataTable value="#{cas}" var="ca">
+ <h:column>
+ #{ca.name}
+ </h:column>
+
+ </h:dataTable>
+ </rich:panel>
+
+</ui:define>
+</ui:composition>
More information about the jboss-svn-commits
mailing list