[jboss-svn-commits] JBL Code SVN: r18101 - in labs/jbosslabs/labs-3.0-build: views/admin/src/main/java/org/jboss/labs/admin and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jan 25 05:46:39 EST 2008
Author: wrzep
Date: 2008-01-25 05:46:39 -0500 (Fri, 25 Jan 2008)
New Revision: 18101
Added:
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/ProjectManager.java
Modified:
labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/injection/LabsGuiceModule.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/faces-config.xml
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/hibernate.cfg.xml
labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/home.xhtml
labs/jbosslabs/labs-3.0-build/views/foo-view/src/main/java/org/jboss/labs/MyServlet.java
labs/jbosslabs/labs-3.0-build/views/project-test-view/src/main/java/org/jboss/labs/view/ProjectTestServlet.java
Log:
JBLAB-904
Modified: labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/injection/LabsGuiceModule.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/injection/LabsGuiceModule.java 2008-01-25 09:44:36 UTC (rev 18100)
+++ labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/injection/LabsGuiceModule.java 2008-01-25 10:46:39 UTC (rev 18101)
@@ -1,20 +1,20 @@
package org.jboss.labs.injection;
+import com.google.inject.Binder;
+import com.google.inject.Module;
+import com.google.inject.TypeLiteral;
import org.jboss.labs.auth.AuthenticationService;
import org.jboss.labs.auth.RoleBinderService;
+import org.jboss.labs.core.service.ProjectService;
import org.jboss.labs.foo.FooService;
-import org.jboss.labs.injection.JNDIProvider;
-import com.google.inject.Binder;
-import com.google.inject.Module;
-import com.google.inject.TypeLiteral;
-
public class LabsGuiceModule implements Module {
public void configure(Binder binder) {
binder.bind(FooService.class).toProvider(new JNDIProvider<FooService>("FooServiceImpl/local"));
binder.bind(new TypeLiteral<RoleBinderService<?>>(){}).toProvider( new JNDIProvider<RoleBinderService<?>>("RoleBinderImpl/local"));
binder.bind(AuthenticationService.class).toProvider(new JNDIProvider<AuthenticationService>("AuthenticationServiceImpl/local"));
- }
+ binder.bind(ProjectService.class).toProvider(new JNDIProvider<ProjectService>("ProjectService/local"));
+ }
}
Added: 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 (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/Notifier.java 2008-01-25 10:46:39 UTC (rev 18101)
@@ -0,0 +1,31 @@
+package org.jboss.labs.admin;
+
+import org.jboss.seam.ScopeType;
+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("notifier")
+public class Notifier {
+
+ @In(scope= ScopeType.BUSINESS_PROCESS) ProjectRequest projectRequest;
+
+ @Logger private Log log;
+
+ public void newRequest() {
+
+ log.info("New project request: " + projectRequest.getName());
+ }
+
+ public void projectApproved() {
+
+ log.info("Project approved: " + projectRequest.getName());
+ }
+
+ public void projectRejected() {
+
+ log.info("Project rejected: " + projectRequest.getName());
+ }
+}
\ No newline at end of file
Added: 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 (rev 0)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ProjectManager.java 2008-01-25 10:46:39 UTC (rev 18101)
@@ -0,0 +1,24 @@
+package org.jboss.labs.admin;
+
+import org.jboss.seam.ScopeType;
+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("projectManager")
+public class ProjectManager {
+
+ @In(scope= ScopeType.BUSINESS_PROCESS) private ProjectRequest projectRequest;
+
+
+
+ @Logger private Log log;
+
+ public void createProject() {
+
+ log.info("New project request: " + projectRequest.getName());
+
+ }
+}
\ 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-01-25 09:44:36 UTC (rev 18100)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/RequestProject.java 2008-01-25 10:46:39 UTC (rev 18101)
@@ -1,16 +1,12 @@
package org.jboss.labs.admin;
-import org.jboss.seam.annotations.Name;
+import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
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 org.jboss.seam.ScopeType;
-import javax.faces.application.FacesMessage;
-
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
*/
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-01-25 09:44:36 UTC (rev 18100)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/java/org/jboss/labs/admin/ReviewProjectRequest.java 2008-01-25 10:46:39 UTC (rev 18101)
@@ -1,10 +1,14 @@
package org.jboss.labs.admin;
+import org.jboss.labs.foo.FooService;
import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Logger;
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;
/**
* @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
@@ -15,8 +19,17 @@
@Out(required = false, scope= ScopeType.CONVERSATION) private long tId;
@Out(required = false, scope= ScopeType.CONVERSATION) private ProjectRequest prjRequest;
+ //@In("#{projectService}") private ProjectService projectService;
+
+ @In("#{fooService}") private FooService fooService;
+
+ @Logger
+ private Log log;
+
public String select(Long taskId, ProjectRequest prjRequest) {
-
+
+ log.info("ProjectService: " + " fooService: " + fooService);
+
this.tId = taskId;
this.prjRequest = prjRequest;
@@ -32,8 +45,4 @@
public String reject() {
return Pages.HOME_PAGE;
}
-
- public String cancel() {
- return Pages.HOME_PAGE;
- }
}
\ No newline at end of file
Modified: labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/WEB-INF/faces-config.xml 2008-01-25 09:44:36 UTC (rev 18100)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/WEB-INF/faces-config.xml 2008-01-25 10:46:39 UTC (rev 18101)
@@ -8,6 +8,7 @@
<locale-config>
<default-locale>en</default-locale>
</locale-config>
+ <variable-resolver>org.jboss.labs.injection.faces.LabsInjectionResolver</variable-resolver>
<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
</application>
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-25 09:44:36 UTC (rev 18100)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/createProject.jpdl.xml 2008-01-25 10:46:39 UTC (rev 18101)
@@ -5,15 +5,22 @@
xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd">
<start-state name="start">
- <transition to="decide"/>
+ <transition to="decide">
+ <action expression="#{notifier.newRequest}" />
+ </transition>
</start-state>
<task-node name="decide" end-tasks="true">
<task name="approve" description="Review project request: #{projectRequest.name}">
<assignment pooled-actors="reviewer"/>
</task>
- <transition name="approve" to="done"/>
- <transition name="reject" to="done"/>
+ <transition name="approve" to="done">
+ <action expression="#{projectManager.createProject}"/>
+ <action expression="#{notifier.projectApproved}"/>
+ </transition>
+ <transition name="reject" to="done">
+ <action expression="#{notifier.projectRejected}"/>
+ </transition>
</task-node>
<end-state name="done"/>
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-01-25 09:44:36 UTC (rev 18100)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/hibernate.cfg.xml 2008-01-25 10:46:39 UTC (rev 18101)
@@ -7,7 +7,7 @@
<hibernate-configuration>
<session-factory>
- <property name="show_sql">true</property>
+ <property name="show_sql">false</property>
<property name="connection.datasource">java:/LabsDS</property>
<property name="transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
<property name="transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</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-01-25 09:44:36 UTC (rev 18100)
+++ labs/jbosslabs/labs-3.0-build/views/admin/src/main/webapp/home.xhtml 2008-01-25 10:46:39 UTC (rev 18101)
@@ -16,11 +16,11 @@
<f:facet name="header">Welcome!</f:facet>
<h:form id="mainForm">
<h:commandButton action="/createProject.seam" value="Create Project Request" />
-
- <h:outputText value="Notifications" rendered="#{! empty pooledTaskInstanceList}" />
+ <br/>
<h:dataTable value="#{pooledTaskInstanceList}"
rendered="#{! empty pooledTaskInstanceList}"
- var="task" >
+ var="task">
+ <f:facet name="header">Notifications</f:facet>
<h:column>
<f:facet name="header">Id</f:facet>
#{task.id}
Modified: labs/jbosslabs/labs-3.0-build/views/foo-view/src/main/java/org/jboss/labs/MyServlet.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/foo-view/src/main/java/org/jboss/labs/MyServlet.java 2008-01-25 09:44:36 UTC (rev 18100)
+++ labs/jbosslabs/labs-3.0-build/views/foo-view/src/main/java/org/jboss/labs/MyServlet.java 2008-01-25 10:46:39 UTC (rev 18101)
@@ -1,17 +1,15 @@
package org.jboss.labs;
-import java.io.IOException;
+import com.google.inject.Inject;
+import org.apache.log4j.Logger;
+import org.jboss.labs.foo.FooService;
+import org.jboss.labs.servlet.LabsHttpServlet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
-import org.apache.log4j.Logger;
-import org.jboss.labs.foo.FooService;
-import org.jboss.labs.servlet.LabsHttpServlet;
-
-import com.google.inject.Inject;
-
public class MyServlet extends LabsHttpServlet {
/**
Modified: labs/jbosslabs/labs-3.0-build/views/project-test-view/src/main/java/org/jboss/labs/view/ProjectTestServlet.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/views/project-test-view/src/main/java/org/jboss/labs/view/ProjectTestServlet.java 2008-01-25 09:44:36 UTC (rev 18100)
+++ labs/jbosslabs/labs-3.0-build/views/project-test-view/src/main/java/org/jboss/labs/view/ProjectTestServlet.java 2008-01-25 10:46:39 UTC (rev 18101)
@@ -1,16 +1,15 @@
package org.jboss.labs.view;
-import java.io.IOException;
+import org.jboss.labs.core.service.ProjectService;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
+import java.io.IOException;
-import org.jboss.labs.core.service.ProjectService;
-
public class ProjectTestServlet extends HttpServlet {
/**
More information about the jboss-svn-commits
mailing list