[jboss-svn-commits] JBL Code SVN: r18411 - in labs/jbosslabs/labs-3.0-build: services/project-service/src/main/java/org/jboss/labs/core/service/impl and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Feb 8 07:06:42 EST 2008
Author: wrzep
Date: 2008-02-08 07:06:42 -0500 (Fri, 08 Feb 2008)
New Revision: 18411
Added:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/AcceptProject.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/CreateProject.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ProjectRequestWrapper.java
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/META-INF/
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/META-INF/persistence.xml
Removed:
labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/AdminProjectRequest.java
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/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java
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/Notifier.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/ProjectManager.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/java/org/jboss/labs/admin/ReviewProjectRequest.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/hibernate.cfg.xml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/home.xhtml
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/ticket.xhtml
Log:
JBLAB-904 fixed jbpm db connection issue
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-02-08 11:50:05 UTC (rev 18410)
+++ labs/jbosslabs/labs-3.0-build/core/core-model/src/main/java/org/jboss/labs/core/model/admin/ProjectRequest.java 2008-02-08 12:06:42 UTC (rev 18411)
@@ -1,13 +1,22 @@
package org.jboss.labs.core.model.admin;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
import java.io.Serializable;
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
*/
+ at Entity
public class ProjectRequest implements Serializable {
+
+ private static final long serialVersionUID = -7477176000123883280L;
+ @Id
+ @GeneratedValue
+ private int id;
protected String name;
protected String leadUsername;
protected String projectId;
@@ -19,14 +28,33 @@
protected boolean userForum = true;
protected boolean announceForum = true;
+
+ private String escape(String string, String w) {
+
+ 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();
+ }
+
/* getters and setters */
- public String getName() {
- return name;
+ public int getId() {
+ return id;
}
- public void setName(String name) {
- this.name = name;
+ public void setId(int id) {
+ this.id = id;
}
public String getProjectId() {
@@ -34,9 +62,31 @@
}
public void setProjectId(String projectId) {
- this.projectId = projectId;
+ if (projectId != null) {
+ this.projectId = projectId.toLowerCase();
+ }
}
-
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+
+ if (name != null) {
+ if (projectId == null) {
+
+ String projectId = escape(name.toLowerCase(), "-");
+ setProjectId(projectId);
+ }
+ if (jiraKey == null) {
+ String jiraKey = escape(name.toUpperCase().replace("JBOSS", "JB"), "");
+ setJiraKey(jiraKey);
+ }
+ }
+ }
+
public String getEmail() {
return email;
}
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-02-08 11:50:05 UTC (rev 18410)
+++ labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceBean.java 2008-02-08 12:06:42 UTC (rev 18411)
@@ -1,7 +1,6 @@
package org.jboss.labs.core.service.impl;
import org.jboss.labs.core.model.Project;
-import org.jboss.labs.core.model.Username;
import org.jboss.labs.core.model.admin.ProjectRequest;
import org.jboss.labs.core.service.ProjectService;
import org.jboss.labs.exception.admin.CreateProjectException;
@@ -12,7 +11,6 @@
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
-import java.util.Arrays;
import java.util.List;
@Stateless(name="ProjectService")
@@ -36,23 +34,26 @@
Project p = new Project();
p.setProjectId(projectId);
- p.setName(projectRequest.getName());
+ // p.setName(projectRequest.getName());
+ /* String lu = projectRequest.getLeadUsername();
Username leadUsername = null;
try {
leadUsername = (Username) em.createQuery("SELECT u FROM Username u WHERE u.username = :username")
- .setParameter("username", projectRequest.getLeadUsername())
+ .setParameter("username", lu)
.getResultList();
+
+ System.out.println("leadUsername: " + leadUsername);
} catch (NoResultException e) {
// do nothing
- }
+ }*/
- if (leadUsername == null) {
+ /* if (leadUsername == null) {
leadUsername = new Username(projectRequest.getLeadUsername());
em.persist(leadUsername);
}
- p.setProjectLeads(Arrays.asList(leadUsername));
+ p.setProjectLeads(Arrays.asList(leadUsername));*/
/* if (repository) {
Repository r = new Repository(RepositoryType.SVN);
Modified: labs/jbosslabs/labs-3.0-build/views/admin/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/pom.xml 2008-02-08 11:50:05 UTC (rev 18410)
+++ labs/jbosslabs/labs-3.0-build/views/admin/pom.xml 2008-02-08 12:06:42 UTC (rev 18411)
@@ -94,11 +94,11 @@
<artifactId>hibernate-validator</artifactId>
<version>3.0.0.GA</version>
<exclusions>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
<exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
</exclusion>
@@ -154,5 +154,12 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
+ <!-- Intellij IDEA -->
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_07</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/AcceptProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/AcceptProject.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/AcceptProject.java 2008-02-08 12:06:42 UTC (rev 18411)
@@ -0,0 +1,23 @@
+package org.jboss.labs.admin;
+
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.bpm.EndTask;
+import org.jboss.seam.annotations.bpm.StartTask;
+
+/**
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ */
+
+ at Name("acceptProject")
+public class AcceptProject {
+
+ @StartTask @EndTask(transition = "approve")
+ public String accept() {
+ return Pages.HOME_PAGE;
+ }
+
+ @StartTask @EndTask(transition = "reject")
+ public String reject() {
+ return Pages.HOME_PAGE;
+ }
+}
\ No newline at end of file
Deleted: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/AdminProjectRequest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/AdminProjectRequest.java 2008-02-08 11:50:05 UTC (rev 18410)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/AdminProjectRequest.java 2008-02-08 12:06:42 UTC (rev 18411)
@@ -1,78 +0,0 @@
-package org.jboss.labs.admin;
-
-import org.hibernate.validator.Email;
-import org.jboss.labs.core.model.admin.ProjectRequest;
-import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.intercept.BypassInterceptors;
-
-import java.io.Serializable;
-
-/**
- * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
- */
- at Name("projectRequest")
- at BypassInterceptors
- at Scope(ScopeType.BUSINESS_PROCESS) //TODO id only
-public class AdminProjectRequest extends ProjectRequest implements Serializable {
-
- private String escape(String string, String w) {
-
- 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();
- }
-
- /* getters and setters */
-
- public String getProjectId() {
- return projectId;
- }
-
- public void setProjectId(String projectId) {
- if (projectId != null) {
- this.projectId = projectId.toLowerCase();
- }
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
-
- if (name != null) {
- if (projectId == null) {
-
- String projectId = escape(name.toLowerCase(), "-");
- setProjectId(projectId);
- }
- if (jiraKey == null) {
- String jiraKey = escape(name.toUpperCase().replace("JBOSS", "JB"), "");
- setJiraKey(jiraKey);
- }
- }
- }
-
- @Email
- 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/CreateProject.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/CreateProject.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/CreateProject.java 2008-02-08 12:06:42 UTC (rev 18411)
@@ -0,0 +1,22 @@
+package org.jboss.labs.admin;
+
+import org.jboss.labs.core.model.admin.ProjectRequest;
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Out;
+
+
+ at Name("createProject")
+public class CreateProject {
+
+ @Out(scope= ScopeType.CONVERSATION) private ProjectRequest projectRequest;
+
+ @Begin
+ public String create() {
+
+ projectRequest = new ProjectRequest();
+
+ return Pages.CREATE_PROJECT_PAGE;
+ }
+}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Notifier.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Notifier.java 2008-02-08 11:50:05 UTC (rev 18410)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Notifier.java 2008-02-08 12:06:42 UTC (rev 18411)
@@ -1,6 +1,6 @@
package org.jboss.labs.admin;
-import org.jboss.seam.ScopeType;
+import org.jboss.labs.core.model.admin.ProjectRequest;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Logger;
import org.jboss.seam.annotations.Name;
@@ -10,8 +10,7 @@
@Name("notifier")
public class Notifier {
- @In(scope= ScopeType.BUSINESS_PROCESS)
- AdminProjectRequest projectRequest;
+ @In(create = true) private ProjectRequest projectRequest;
@Logger private Log log;
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-08 11:50:05 UTC (rev 18410)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Pages.java 2008-02-08 12:06:42 UTC (rev 18411)
@@ -8,6 +8,7 @@
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";
}
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ProjectManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ProjectManager.java 2008-02-08 11:50:05 UTC (rev 18410)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ProjectManager.java 2008-02-08 12:06:42 UTC (rev 18411)
@@ -2,9 +2,9 @@
import com.google.inject.Inject;
import org.jboss.labs.core.model.Project;
+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.seam.ScopeType;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Logger;
import org.jboss.seam.annotations.Name;
@@ -17,7 +17,7 @@
@Guice
public class ProjectManager {
- @In(scope= ScopeType.BUSINESS_PROCESS, required = false) private AdminProjectRequest projectRequest;
+ @In(required = false) private ProjectRequest projectRequest;
@Inject private ProjectService projectService;
@@ -29,6 +29,7 @@
projectService.createProject(projectRequest);
} catch (Exception e) {
log.warn(e);
+ e.printStackTrace();
return false;
}
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ProjectRequestWrapper.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ProjectRequestWrapper.java (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ProjectRequestWrapper.java 2008-02-08 12:06:42 UTC (rev 18411)
@@ -0,0 +1,33 @@
+package org.jboss.labs.admin;
+
+import org.jboss.labs.core.model.admin.ProjectRequest;
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Unwrap;
+
+import javax.persistence.EntityManager;
+import java.io.Serializable;
+
+/**
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ */
+ at Name("projectRequest")
+public class ProjectRequestWrapper implements Serializable {
+
+ private static final long serialVersionUID = -3179237574473130507L;
+
+ @In(required = false, scope = ScopeType.BUSINESS_PROCESS) private Integer projectRequestId;
+
+ @In(create = true) private EntityManager entityManager;
+
+ @Unwrap
+ public ProjectRequest getProjectRequest() {
+
+ if (projectRequestId != null) {
+ return entityManager.find(ProjectRequest.class, projectRequestId);
+ }
+
+ return null;
+ }
+}
\ No newline at end of file
Modified: 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 2008-02-08 11:50:05 UTC (rev 18410)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/RequestProject.java 2008-02-08 12:06:42 UTC (rev 18411)
@@ -1,6 +1,8 @@
package org.jboss.labs.admin;
+import org.jboss.labs.core.model.admin.ProjectRequest;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.End;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
@@ -8,22 +10,34 @@
import org.jboss.seam.bpm.Actor;
import org.jboss.seam.faces.FacesMessages;
+import javax.persistence.EntityManager;
+
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
*/
@Name("requestProject")
public class RequestProject {
- @In @Out(scope= ScopeType.BUSINESS_PROCESS) private AdminProjectRequest projectRequest;
- @In
- Actor actor;
+ @In private ProjectRequest projectRequest;
+ @Out(scope= ScopeType.BUSINESS_PROCESS) private Integer projectRequestId;
+
+ @In private Actor actor;
@In private FacesMessages facesMessages;
+ @In(create = true) private EntityManager entityManager;
+
+ @End
@CreateProcess(definition = "createProject")
public String request() {
projectRequest.setLeadUsername(actor.getId());
+ entityManager.persist(projectRequest);
+
+ projectRequestId = projectRequest.getId();
+
+ System.out.println("Project Request Id: " + projectRequestId);
+
facesMessages.add("You request has been sent to BMW.");
return Pages.CONFIRMATION_PAGE;
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ReviewProjectRequest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ReviewProjectRequest.java 2008-02-08 11:50:05 UTC (rev 18410)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ReviewProjectRequest.java 2008-02-08 12:06:42 UTC (rev 18411)
@@ -1,40 +1,34 @@
package org.jboss.labs.admin;
-import com.google.inject.Inject;
-import org.jboss.labs.core.service.ProjectService;
-import org.jboss.labs.injection.seam.Guice;
+import org.jboss.labs.core.model.admin.ProjectRequest;
import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Logger;
+import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
-import org.jboss.seam.annotations.bpm.EndTask;
-import org.jboss.seam.annotations.bpm.StartTask;
-import org.jboss.seam.log.Log;
+import javax.persistence.EntityManager;
+
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
*/
@Name("reviewProjectRequest")
- at Guice
public class ReviewProjectRequest {
@Out(required = false, scope= ScopeType.CONVERSATION) private long tId;
- @Out(required = false, scope= ScopeType.CONVERSATION) private AdminProjectRequest prjRequest;
+ @Out(required = false, scope= ScopeType.CONVERSATION) private ProjectRequest prjRequest;
- @Inject private ProjectService projectService;
+ @In private EntityManager entityManager;
- @Logger private Log log;
+ public String select(Long taskId, Integer projectRequestId) {
- public String select(Long taskId, AdminProjectRequest prjRequest) {
-
this.tId = taskId;
- this.prjRequest = prjRequest;
+ prjRequest = entityManager.find(ProjectRequest.class, projectRequestId);
return Pages.TICKET_PAGE;
}
- @StartTask @EndTask(transition = "approve")
+ /* @StartTask @EndTask(transition = "approve")
public String accept() {
return Pages.HOME_PAGE;
}
@@ -42,5 +36,5 @@
@StartTask @EndTask(transition = "reject")
public String reject() {
return Pages.HOME_PAGE;
- }
+ }*/
}
\ No newline at end of file
Added: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/META-INF/persistence.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/META-INF/persistence.xml (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/META-INF/persistence.xml 2008-02-08 12:06:42 UTC (rev 18411)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence>
+ <persistence-unit name="admin" transaction-type="JTA">
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <jta-data-source>java:/LabsDS</jta-data-source>
+ <properties>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect" />
+ <property name="hibernate.hbm2ddl.auto" value="update" />
+ <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
+ <property name="hibernate.transaction.manager_lookup_class"
+ value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
+ </properties>
+ <class>org.jboss.labs.core.model.admin.ProjectRequest</class>
+ </persistence-unit>
+</persistence>
+
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-08 11:50:05 UTC (rev 18410)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/WEB-INF/components.xml 2008-02-08 12:06:42 UTC (rev 18411)
@@ -6,6 +6,7 @@
xmlns:bpm="http://jboss.com/products/seam/bpm"
xmlns:security="http://jboss.com/products/seam/security"
xmlns:mail="http://jboss.com/products/seam/mail"
+ xmlns:transaction="http://jboss.com/products/seam/transaction"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
@@ -14,7 +15,8 @@
http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd
http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd
http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd
+ http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd">
<core:init debug="@debug@" jndi-pattern="@jndiPattern@"/>
@@ -22,6 +24,18 @@
conversation-timeout="120000"
conversation-id-parameter="cid"/>
+ <!-- <transaction:entity-transaction entity-manager="#{entityManager}"/>-->
+
+ <persistence:entity-manager-factory name="admin"/>
+
+ <persistence:managed-persistence-context name="entityManager"
+ auto-create="true" entity-manager-factory="#{admin}"/>
+
+ <!--<persistence:entity-manager-factory persistence-unit-name="admin" name="entityManagerFactory"/>
+
+ <persistence:managed-persistence-context name="entityManager" auto-create="true"
+ entity-manager-factory="#{entityManagerFactory}"/>-->
+
<event type="org.jboss.seam.security.notLoggedIn">
<action execute="#{redirect.captureCurrentView}"/>
</event>
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/hibernate.cfg.xml 2008-02-08 11:50:05 UTC (rev 18410)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/hibernate.cfg.xml 2008-02-08 12:06:42 UTC (rev 18411)
@@ -8,7 +8,7 @@
<session-factory>
<property name="show_sql">false</property>
- <property name="connection.datasource">java:/DefaultDS</property>
+ <property name="connection.datasource">java:/JBossDS</property>
<property name="transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
<property name="transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
<property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
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-02-08 11:50:05 UTC (rev 18410)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/home.xhtml 2008-02-08 12:06:42 UTC (rev 18411)
@@ -15,7 +15,7 @@
<rich:panel>
<f:facet name="header">Welcome!</f:facet>
<h:form id="mainForm">
- <h:commandButton action="/createProject.seam" value="Create Project Request" />
+ <h:commandButton action="#{createProject.create}" value="Create Project Request" />
<br/>
<h:dataTable value="#{pooledTaskInstanceList}"
rendered="#{! empty pooledTaskInstanceList}"
@@ -28,10 +28,10 @@
<h:column>
<f:facet name="header">Description</f:facet>
<h:commandLink value="#{task.description}"
- action="#{reviewProjectRequest.select(task.id, task.variables['projectRequest'])}" />
+ action="#{reviewProjectRequest.select(task.id, task.variables['projectRequestId'])}" />
</h:column>
</h:dataTable>
- <ui:remove>
+
<h:dataTable value="#{projectManager.projects}"
rendered="#{! empty projectManager.projects}"
var="project">
@@ -48,7 +48,7 @@
</h:outputLink>
</h:column>
</h:dataTable>
- </ui:remove>
+
</h:form>
</rich:panel>
Modified: 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 2008-02-08 11:50:05 UTC (rev 18410)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/jbpm.cfg.xml 2008-02-08 12:06:42 UTC (rev 18411)
@@ -10,7 +10,7 @@
</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="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>
Modified: 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-08 11:50:05 UTC (rev 18410)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/ticket.xhtml 2008-02-08 12:06:42 UTC (rev 18411)
@@ -49,11 +49,11 @@
</td>
</tr>
</table>
- <h:commandLink value="Accept" action="#{reviewProjectRequest.accept}" >
+ <h:commandLink value="Accept" action="#{acceptProject.accept}" >
<f:param name="taskId" value="#{tId}" />
</h:commandLink>
<span/>
- <h:commandLink value="Reject" action="#{reviewProjectRequest.reject}" >
+ <h:commandLink value="Reject" action="#{acceptProject.reject}" >
<f:param name="taskId" value="#{tId}" />
</h:commandLink>
<span/>
More information about the jboss-svn-commits
mailing list