[jboss-svn-commits] JBL Code SVN: r18048 - in labs/jbosslabs/labs-3.0-build/views/admin: src/main/java/org/jboss/labs/admin and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jan 23 06:18:33 EST 2008
Author: wrzep
Date: 2008-01-23 06:18:32 -0500 (Wed, 23 Jan 2008)
New Revision: 18048
Added:
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/Pages.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/RequestProject.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/confirmation.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/jbpm.cfg.xml
Modified:
labs/jbosslabs/labs-3.0-build/views/admin/pom.xml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ProjectRequest.java
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/home.xhtml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/menu.xhtml
Log:
JBLAB-904 finally forced jbpm to work
Modified: labs/jbosslabs/labs-3.0-build/views/admin/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/pom.xml 2008-01-23 06:15:21 UTC (rev 18047)
+++ labs/jbosslabs/labs-3.0-build/views/admin/pom.xml 2008-01-23 11:18:32 UTC (rev 18048)
@@ -50,6 +50,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-debug</artifactId>
+ <version>2.0.1-SNAPSHOT</version>
+ </dependency>
<!-- RichFaces -->
<dependency>
<groupId>org.richfaces.framework</groupId>
@@ -83,6 +88,32 @@
</exclusions>
</dependency>
+ <!-- Hibernate Validator -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>3.0.0.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.3.0.ga</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- jbpm -->
<dependency>
<groupId>org.jbpm</groupId>
@@ -96,6 +127,12 @@
<version>1.1.11</version>
</dependency>
<dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_03</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
Added: 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 (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/LoginAction.java 2008-01-23 11:18:32 UTC (rev 18048)
@@ -0,0 +1,26 @@
+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/Pages.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java 2008-01-23 11:18:32 UTC (rev 18048)
@@ -0,0 +1,10 @@
+package org.jboss.labs.admin;
+
+/**
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ */
+public class Pages {
+
+
+ public static final String CONFIRMATION_PAGE = "/confirmation.seam";
+}
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ProjectRequest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ProjectRequest.java 2008-01-23 06:15:21 UTC (rev 18047)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ProjectRequest.java 2008-01-23 11:18:32 UTC (rev 18048)
@@ -68,7 +68,7 @@
public String getEmail() {
return email;
- }
+ }
public void setEmail(String email) {
this.email = email;
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/RequestProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/RequestProject.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/RequestProject.java 2008-01-23 11:18:32 UTC (rev 18048)
@@ -0,0 +1,33 @@
+package org.jboss.labs.admin;
+
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.bpm.CreateProcess;
+import org.jboss.seam.annotations.bpm.StartTask;
+import org.jboss.seam.annotations.bpm.EndTask;
+import org.jboss.seam.faces.FacesMessages;
+
+import javax.faces.application.FacesMessage;
+
+/**
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ */
+ at Name("requestProject")
+public class RequestProject {
+
+ @In private ProjectRequest projectRequest;
+ @In private FacesMessages facesMessages;
+
+ @CreateProcess(definition = "createProject")
+ public String request() {
+
+ facesMessages.add("You request has been sent to BMW.");
+
+ return Pages.CONFIRMATION_PAGE;
+ }
+
+ @StartTask @EndTask(transition = "approve")
+ public String approve() {
+ return null;
+ }
+}
\ No newline at end of file
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/confirmation.xhtml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/confirmation.xhtml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/confirmation.xhtml 2008-01-23 11:18:32 UTC (rev 18048)
@@ -0,0 +1,16 @@
+<!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"/>
+
+</ui:define>
+</ui:composition>
Modified: 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-01-23 06:15:21 UTC (rev 18047)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/createProject.jpdl.xml 2008-01-23 11:18:32 UTC (rev 18048)
@@ -7,12 +7,15 @@
<start-state name="start">
<transition to="decide"/>
</start-state>
-
- <decision name="decide" expression="#{projectApproval.approved}">
- <transition name="approval" to="done"/>
- <transition name="rejected" to="done"/>
- </decision>
+ <task-node name="decide" end-tasks="true">
+ <task name="approve" description="Review project request">
+ <assignment pooled-actors="reviewer"/>
+ </task>
+ <transition name="approve" to="done"/>
+ <transition name="reject" to="done"/>
+ </task-node>
+
<end-state name="done"/>
</process-definition>
\ No newline at end of file
Modified: 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-01-23 06:15:21 UTC (rev 18047)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/createProject.xhtml 2008-01-23 11:18:32 UTC (rev 18048)
@@ -10,24 +10,23 @@
template="layout/template.xhtml">
<ui:define name="body">
-
- <h:messages globalOnly="true" styleClass="message"/>
<rich:panel>
<f:facet name="header">Create Project Request</f:facet>
<h:form id="mainForm" >
- <table>
+ <h:messages styleClass="message" id="messages"/>
+ <table>
<tr>
<th>Email:</th>
- <td><h:inputText value="#{projectRequest.email}"/>
+ <td><h:inputText value="#{projectRequest.email}" required="true" id="email" requiredMessage="Email is required"/>
</td>
</tr>
<tr>
<th>Project Name:</th>
<td>
<a4j:region>
- <h:inputText value="#{projectRequest.name}" >
- <a4j:support event="onkeyup" reRender="projectId, jiraKey" />
+ <h:inputText value="#{projectRequest.name}" id="projectName" required="true" requiredMessage="Project Name is required.">
+ <a4j:support event="onkeyup" reRender="projectId, jiraKey, messages"/>
</h:inputText>
</a4j:region>
</td>
@@ -35,12 +34,12 @@
<tr>
<th>Project ID:</th>
<td>
- <h:inputText value="#{projectRequest.projectId}" id="projectId"/>
+ <h:inputText value="#{projectRequest.projectId}" id="projectId" required="true" requiredMessage="Project ID is required."/>
</td>
</tr>
<tr>
<th>JIRA key:</th>
- <td><h:inputText value="#{projectRequest.jiraKey}" id="jiraKey" /></td>
+ <td><h:inputText value="#{projectRequest.jiraKey}" id="jiraKey" required="true" requiredMessage="JIRA key is required."/></td>
</tr>
<tr>
<th>Code repository?</th>
@@ -59,6 +58,7 @@
</td>
</tr>
</table>
+ <h:commandButton value="Submit" action="#{requestProject.request}" />
</h:form>
</rich:panel>
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-01-23 06:15:21 UTC (rev 18047)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/home.xhtml 2008-01-23 11:18:32 UTC (rev 18048)
@@ -16,6 +16,12 @@
<f:facet name="header">Welcome!</f:facet>
<h:form id="mainForm">
<h:commandButton action="/createProject.seam" value="Create Project Request" />
+
+ <h:dataTable value="#{pooledTaskInstanceList}" var="task">
+ <h:column>
+ #{task}
+ </h:column>
+ </h:dataTable>
</h:form>
</rich:panel>
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/jbpm.cfg.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/jbpm.cfg.xml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/jbpm.cfg.xml 2008-01-23 11:18:32 UTC (rev 18048)
@@ -0,0 +1,18 @@
+<jbpm-configuration>
+
+ <jbpm-context>
+ <service name="persistence">
+ <factory>
+ <bean class="org.jbpm.persistence.db.DbPersistenceServiceFactory">
+ <field name="isTransactionEnabled"><false/></field>
+ </bean>
+ </factory>
+ </service>
+ <service name="tx" factory="org.jbpm.tx.TxServiceFactory" />
+ <service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" />
+ <service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" />
+ <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
+ <service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" />
+ </jbpm-context>
+
+</jbpm-configuration>
\ No newline at end of file
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 06:15:21 UTC (rev 18047)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/layout/menu.xhtml 2008-01-23 11:18:32 UTC (rev 18048)
@@ -12,7 +12,7 @@
<!-- @newMenuItem@ -->
<rich:toolBarGroup location="right">
<h:outputText value="Welcome, #{identity.username}!" rendered="#{identity.loggedIn}"/>
- <s:link view="/login.xhtml" value="Login" rendered="#{not 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}"/>
</rich:toolBarGroup>
</rich:toolBar>
More information about the jboss-svn-commits
mailing list