From: Norman R. <nor...@jb...> - 2005-10-03 06:07:08
|
User: nrichards Date: 05/10/03 02:06:55 Modified: examples/dvdstore/src/com/jboss/dvd/seam StoreManagerBean.java Log: add help text, move templates to WEB-INF Revision Changes Path 1.2 +13 -9 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/StoreManagerBean.java (In the diff below, changes in quantity of whitespace are not shown.) Index: StoreManagerBean.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/StoreManagerBean.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- StoreManagerBean.java 2 Oct 2005 05:04:35 -0000 1.1 +++ StoreManagerBean.java 3 Oct 2005 06:06:55 -0000 1.2 @@ -29,30 +29,34 @@ EntityManager em; public int getNumberOrders() { - return (Integer) em.createQuery("select count(o) from Order o").getSingleResult(); + return (Integer) em.createQuery("select count(o) from Order o where o.status != :status") + .setParameter("status", Order.Status.CANCELLED.ordinal()) + .getSingleResult(); } - public int getUnitsSold() { + public double getTotalSales() { try { - return (Integer) em.createQuery("select sum(i.sales) from Inventory i").getSingleResult(); + return (Float) em.createQuery("select sum(o.totalAmount) from Order o where o.status != :status") + .setParameter("status", Order.Status.CANCELLED.ordinal()) + .getSingleResult(); } catch (EntityNotFoundException e) { - return 0; + return 0.0; } } - public int getTotalInventory() { + public int getUnitsSold() { try { - return (Integer) em.createQuery("select sum(i.quantity) from Inventory i").getSingleResult(); + return (Integer) em.createQuery("select sum(i.sales) from Inventory i").getSingleResult(); } catch (EntityNotFoundException e) { return 0; } } - public double getTotalSales() { + public int getTotalInventory() { try { - return (Float) em.createQuery("select sum(o.totalAmount) from Order o").getSingleResult(); + return (Integer) em.createQuery("select sum(i.quantity) from Inventory i").getSingleResult(); } catch (EntityNotFoundException e) { - return 0.0; + return 0; } } |
From: Norman R. <nor...@jb...> - 2005-10-10 17:30:10
|
User: nrichards Date: 05/10/10 13:30:07 Modified: examples/dvdstore/src/com/jboss/dvd/seam LoginAction.java Log: misc updates Revision Changes Path 1.7 +1 -0 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/LoginAction.java (In the diff below, changes in quantity of whitespace are not shown.) Index: LoginAction.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/LoginAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- LoginAction.java 30 Sep 2005 14:28:43 -0000 1.6 +++ LoginAction.java 10 Oct 2005 17:30:07 -0000 1.7 @@ -63,6 +63,7 @@ sessionContext.set("currentUser", found); if (found instanceof Admin) { + sessionContext.set("currentUserIsAdmin", true); return "admin"; } else { return "customer"; |
From: Gavin K. <gav...@jb...> - 2005-12-22 02:24:11
|
User: gavin Date: 05/12/21 21:24:03 Modified: examples/dvdstore/src/com/jboss/dvd/seam LoggedInInterceptor.java Log: fix bug in loggedininterceptors Revision Changes Path 1.4 +8 -1 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/LoggedInInterceptor.java (In the diff below, changes in quantity of whitespace are not shown.) Index: LoggedInInterceptor.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/LoggedInInterceptor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- LoggedInInterceptor.java 14 Dec 2005 01:34:23 -0000 1.3 +++ LoggedInInterceptor.java 22 Dec 2005 02:24:03 -0000 1.4 @@ -2,11 +2,13 @@ import javax.ejb.AroundInvoke; import javax.ejb.InvocationContext; +import javax.faces.event.PhaseId; import org.jboss.logging.Logger; import org.jboss.seam.annotations.Around; import org.jboss.seam.annotations.Within; import org.jboss.seam.contexts.Contexts; +import org.jboss.seam.contexts.Lifecycle; import org.jboss.seam.interceptors.BijectionInterceptor; import org.jboss.seam.interceptors.ConversationInterceptor; import org.jboss.seam.interceptors.RemoveInterceptor; @@ -24,6 +26,11 @@ public Object checkLoggedIn(InvocationContext invocation) throws Exception { + if ( Lifecycle.getPhaseId()!=PhaseId.INVOKE_APPLICATION ) + { + return invocation.proceed(); + } + boolean isLoggedIn = Contexts.getSessionContext().get(LoginIfInterceptor.LOGIN_KEY)!=null; if (isLoggedIn) { |
From: Gavin K. <gav...@jb...> - 2006-01-01 09:34:58
|
User: gavin Date: 06/01/01 04:34:52 Modified: examples/dvdstore/src/com/jboss/dvd/seam ShoppingCartBean.java Log: renamed PROCESS->BUSINESS_PROCESS Revision Changes Path 1.12 +3 -3 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ShoppingCartBean.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ShoppingCartBean.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ShoppingCartBean.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- ShoppingCartBean.java 27 Dec 2005 00:58:40 -0000 1.11 +++ ShoppingCartBean.java 1 Jan 2006 09:34:52 -0000 1.12 @@ -54,11 +54,11 @@ Order order = null; - @Out(scope=ScopeType.PROCESS, required=false) + @Out(scope=ScopeType.BUSINESS_PROCESS, required=false) long orderId; - @Out(scope=ScopeType.PROCESS, required=false) + @Out(scope=ScopeType.BUSINESS_PROCESS, required=false) float amount; - @Out(value="customer",scope=ScopeType.PROCESS, required=false) + @Out(value="customer",scope=ScopeType.BUSINESS_PROCESS, required=false) String customerName; public boolean getIsEmpty() { |
From: Gavin K. <gav...@jb...> - 2006-01-01 13:29:04
|
User: gavin Date: 06/01/01 08:28:56 Modified: examples/dvdstore/src/com/jboss/dvd/seam CategoriesBean.java Log: readmes minor changes Revision Changes Path 1.2 +15 -12 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/CategoriesBean.java (In the diff below, changes in quantity of whitespace are not shown.) Index: CategoriesBean.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/CategoriesBean.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- CategoriesBean.java 1 Jan 2006 09:48:26 -0000 1.1 +++ CategoriesBean.java 1 Jan 2006 13:28:56 -0000 1.2 @@ -7,21 +7,24 @@ package com.jboss.dvd.seam; import java.io.Serializable; -import java.util.*; -import javax.naming.InitialContext; - -import javax.ejb.*; -import javax.persistence.*; - -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.*; -import org.jboss.seam.ejb.SeamInterceptor; - -import javax.faces.application.FacesMessage; -import javax.faces.component.*; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +import javax.ejb.Interceptor; +import javax.ejb.Stateful; +import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Create; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.ejb.SeamInterceptor; @Stateful @Name("catbean") |
From: Gavin K. <gav...@jb...> - 2006-01-02 07:46:27
|
User: gavin Date: 06/01/02 02:46:26 Modified: examples/dvdstore/src/com/jboss/dvd/seam ProcessDefinitionSwitcher.java Log: cleanup Revision Changes Path 1.3 +1 -1 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ProcessDefinitionSwitcher.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ProcessDefinitionSwitcher.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ProcessDefinitionSwitcher.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- ProcessDefinitionSwitcher.java 1 Jan 2006 20:24:11 -0000 1.2 +++ ProcessDefinitionSwitcher.java 2 Jan 2006 07:46:26 -0000 1.3 @@ -50,7 +50,7 @@ } public String switchProcess() { - jbpm.loadProcessDefinition(currentProcessDefinition, true); + jbpm.deployProcessDefinition(currentProcessDefinition); return "admin"; } |
From: Gavin K. <gav...@jb...> - 2006-01-03 02:09:52
|
User: gavin Date: 06/01/02 21:09:48 Modified: examples/dvdstore/src/com/jboss/dvd/seam ProcessDefinitionSwitcher.java Log: minor Revision Changes Path 1.4 +7 -2 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ProcessDefinitionSwitcher.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ProcessDefinitionSwitcher.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ProcessDefinitionSwitcher.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- ProcessDefinitionSwitcher.java 2 Jan 2006 07:46:26 -0000 1.3 +++ ProcessDefinitionSwitcher.java 3 Jan 2006 02:09:48 -0000 1.4 @@ -10,6 +10,7 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.core.Jbpm; +import org.jbpm.JbpmContext; /** * Switches JBPM process definitions dynamically @@ -27,6 +28,9 @@ @In(create=true, value="org.jboss.seam.core.jbpm") private Jbpm jbpm; + @In(create=true) + private JbpmContext jbpmContext; + public List<SelectItem> getProcessDefinitions() { List<SelectItem> result = new ArrayList<SelectItem>(); @@ -50,7 +54,8 @@ } public String switchProcess() { - jbpm.deployProcessDefinition(currentProcessDefinition); + jbpmContext.deployProcessDefinition( + jbpm.getProcessDefinitionFromResource(currentProcessDefinition) ); return "admin"; } |
From: Gavin K. <gav...@jb...> - 2006-01-04 04:36:49
|
User: gavin Date: 06/01/03 23:36:40 Modified: examples/dvdstore/src/com/jboss/dvd/seam ShoppingCartBean.java Log: redirecty stuff Revision Changes Path 1.17 +9 -6 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ShoppingCartBean.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ShoppingCartBean.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ShoppingCartBean.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -b -r1.16 -r1.17 --- ShoppingCartBean.java 3 Jan 2006 18:04:10 -0000 1.16 +++ ShoppingCartBean.java 4 Jan 2006 04:36:40 -0000 1.17 @@ -6,6 +6,10 @@ */ package com.jboss.dvd.seam; +import static org.jboss.seam.ScopeType.BUSINESS_PROCESS; +import static org.jboss.seam.ScopeType.CONVERSATION; +import static org.jboss.seam.ScopeType.SESSION; + import java.io.Serializable; import java.util.ArrayList; import java.util.Date; @@ -20,7 +24,6 @@ import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContextType; -import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.CreateProcess; import org.jboss.seam.annotations.Destroy; import org.jboss.seam.annotations.End; @@ -32,7 +35,7 @@ @Stateful @Name("cart") -@Scope(ScopeType.SESSION) +@Scope(SESSION) @Interceptors(SeamInterceptor.class) //@Intercept(InterceptionType.ALWAYS) public class ShoppingCartBean @@ -51,15 +54,15 @@ //List<OrderLine> cart = new ArrayList<OrderLine>(); Map<Product,Boolean> cartSelection = new HashMap<Product,Boolean>(); - @Out(required=false) + @Out(required=false, scope=CONVERSATION) Order order = null; - @Out(scope=ScopeType.BUSINESS_PROCESS, required=false) + @Out(scope=BUSINESS_PROCESS, required=false) long orderId; - @Out(scope=ScopeType.BUSINESS_PROCESS, required=false) + @Out(scope=BUSINESS_PROCESS, required=false) float amount; - @Out(value="customer",scope=ScopeType.BUSINESS_PROCESS, required=false) + @Out(value="customer",scope=BUSINESS_PROCESS, required=false) String customerName; public List<OrderLine> getCart() { |
From: Gavin K. <gav...@jb...> - 2006-01-09 05:21:24
|
User: gavin Date: 06/01/09 00:21:23 Modified: examples/dvdstore/src/com/jboss/dvd/seam SearchAction.java Log: renamed to pageflow Revision Changes Path 1.19 +1 -1 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/SearchAction.java (In the diff below, changes in quantity of whitespace are not shown.) Index: SearchAction.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/SearchAction.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -b -r1.18 -r1.19 --- SearchAction.java 4 Jan 2006 12:11:12 -0000 1.18 +++ SearchAction.java 9 Jan 2006 05:21:23 -0000 1.19 @@ -78,7 +78,7 @@ return actor; } - @Begin(join=true, processDefinition="shopping") + @Begin(join=true, pageflow="shopping") public String doSearch() { currentPage=0; updateResults(); |
From: Gavin K. <gav...@jb...> - 2006-01-11 03:42:23
|
User: gavin Date: 06/01/10 22:42:20 Modified: examples/dvdstore/src/com/jboss/dvd/seam OrderApprovalDecision.java Log: fixed minor bugs Revision Changes Path 1.2 +1 -1 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/OrderApprovalDecision.java (In the diff below, changes in quantity of whitespace are not shown.) Index: OrderApprovalDecision.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/OrderApprovalDecision.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- OrderApprovalDecision.java 3 Jan 2006 18:04:10 -0000 1.1 +++ OrderApprovalDecision.java 11 Jan 2006 03:42:20 -0000 1.2 @@ -6,7 +6,7 @@ @Name("orderApproval") public class OrderApprovalDecision { @In float amount; - public String howLargeIsOrder() + public String getHowLargeIsOrder() { return amount > 100 ? "large order" : "small order"; } |
From: Gavin K. <gav...@jb...> - 2006-01-13 14:41:23
|
User: gavin Date: 06/01/13 09:41:18 Modified: examples/dvdstore/src/com/jboss/dvd/seam User.java Log: import Revision Changes Path 1.8 +0 -1 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/User.java (In the diff below, changes in quantity of whitespace are not shown.) Index: User.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/User.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- User.java 13 Jan 2006 14:19:19 -0000 1.7 +++ User.java 13 Jan 2006 14:41:18 -0000 1.8 @@ -9,7 +9,6 @@ import java.io.Serializable; import javax.persistence.Column; -import javax.persistence.DiscriminatorType; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; |
From: Gavin K. <gav...@jb...> - 2006-01-18 21:00:04
|
User: gavin Date: 06/01/18 15:59:59 Modified: examples/dvdstore/src/com/jboss/dvd/seam ProcessDefinitionSwitcher.java Log: renamed to .jpdl.xml Revision Changes Path 1.6 +3 -3 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ProcessDefinitionSwitcher.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ProcessDefinitionSwitcher.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ProcessDefinitionSwitcher.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- ProcessDefinitionSwitcher.java 18 Jan 2006 09:31:28 -0000 1.5 +++ ProcessDefinitionSwitcher.java 18 Jan 2006 20:59:59 -0000 1.6 @@ -20,9 +20,9 @@ public class ProcessDefinitionSwitcher { static final String[] ORDER_DEFS = { - "jbpm-ordermanagement1.xml", - "jbpm-ordermanagement2.xml", - "jbpm-ordermanagement3.xml" + "ordermanagement1.jpdl.xml", + "ordermanagement2.jpdl.xml", + "ordermanagement3.jpdl.xml" }; @In(create=true, value="org.jboss.seam.core.jbpm") |
From: Gavin K. <gav...@jb...> - 2006-01-18 21:17:46
|
User: gavin Date: 06/01/18 16:17:40 Modified: examples/dvdstore/src/com/jboss/dvd/seam ProcessDefinitionSwitcher.java Log: minor fix Revision Changes Path 1.7 +1 -1 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ProcessDefinitionSwitcher.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ProcessDefinitionSwitcher.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ProcessDefinitionSwitcher.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- ProcessDefinitionSwitcher.java 18 Jan 2006 20:59:59 -0000 1.6 +++ ProcessDefinitionSwitcher.java 18 Jan 2006 21:17:40 -0000 1.7 @@ -36,7 +36,7 @@ List<SelectItem> result = new ArrayList<SelectItem>(); for (String def: ORDER_DEFS) { - result.add( new SelectItem(def, def.substring(5, def.length()-4)) ); + result.add( new SelectItem(def, def.substring(0, def.length()-9)) ); } return result; } |
From: Gavin K. <gav...@jb...> - 2006-01-28 03:14:29
|
User: gavin Date: 06/01/27 22:14:25 Modified: examples/dvdstore/src/com/jboss/dvd/seam LoginAction.java Log: fix bug where you could not log out from shopping cart Revision Changes Path 1.17 +5 -0 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/LoginAction.java (In the diff below, changes in quantity of whitespace are not shown.) Index: LoginAction.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/LoginAction.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -b -r1.16 -r1.17 --- LoginAction.java 12 Jan 2006 05:59:20 -0000 1.16 +++ LoginAction.java 28 Jan 2006 03:14:25 -0000 1.17 @@ -19,6 +19,7 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.contexts.Context; import org.jboss.seam.core.Actor; +import org.jboss.seam.core.Conversation; import org.jboss.seam.ejb.SeamInterceptor; @Stateless @@ -85,7 +86,11 @@ } } + @In(required=false) + Conversation conversation; + public String logout() { + if (conversation!=null) conversation.leave(); Seam.invalidateSession(); sessionContext.set("currentUser", null); sessionContext.set("loggedIn", null); |
From: Gavin K. <gav...@jb...> - 2006-01-28 03:51:23
|
User: gavin Date: 06/01/27 22:51:21 Modified: examples/dvdstore/src/com/jboss/dvd/seam LoginAction.java Log: no longer needed Revision Changes Path 1.18 +0 -5 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/LoginAction.java (In the diff below, changes in quantity of whitespace are not shown.) Index: LoginAction.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/LoginAction.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -b -r1.17 -r1.18 --- LoginAction.java 28 Jan 2006 03:14:25 -0000 1.17 +++ LoginAction.java 28 Jan 2006 03:51:21 -0000 1.18 @@ -19,7 +19,6 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.contexts.Context; import org.jboss.seam.core.Actor; -import org.jboss.seam.core.Conversation; import org.jboss.seam.ejb.SeamInterceptor; @Stateless @@ -86,11 +85,7 @@ } } - @In(required=false) - Conversation conversation; - public String logout() { - if (conversation!=null) conversation.leave(); Seam.invalidateSession(); sessionContext.set("currentUser", null); sessionContext.set("loggedIn", null); |
From: Gavin K. <gav...@jb...> - 2006-04-15 14:16:37
|
User: gavin Date: 06/04/15 10:16:33 Modified: examples/dvdstore/src/com/jboss/dvd/seam ShipAction.java Log: Revision Changes Path 1.9 +1 -0 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ShipAction.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ShipAction.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ShipAction.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -b -r1.8 -r1.9 --- ShipAction.java 9 Apr 2006 17:50:41 -0000 1.8 +++ ShipAction.java 15 Apr 2006 14:16:33 -0000 1.9 @@ -24,6 +24,7 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Out; import org.jboss.seam.ejb.SeamInterceptor; +import org.jboss.seam.util.Transactions; @Stateful @Name("ship") |
From: Gavin K. <gav...@jb...> - 2006-04-17 21:02:50
|
User: gavin Date: 06/04/17 17:02:48 Modified: examples/dvdstore/src/com/jboss/dvd/seam Order.java Log: minor Revision Changes Path 1.10 +1 -3 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/Order.java (In the diff below, changes in quantity of whitespace are not shown.) Index: Order.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/Order.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- Order.java 11 Jan 2006 08:33:02 -0000 1.9 +++ Order.java 17 Apr 2006 21:02:48 -0000 1.10 @@ -79,11 +79,9 @@ public void removeProduct(Product product) { - OrderLine toRemove = null; - for (OrderLine line: orderLines) { if (product.getProductId() == line.getProduct().getProductId()) { - orderLines.remove(toRemove); + orderLines.remove(line); return; } } |
From: Gavin K. <gav...@jb...> - 2006-04-25 15:50:52
|
User: gavin Date: 06/04/25 11:50:49 Modified: examples/dvdstore/src/com/jboss/dvd/seam CategoriesBean.java Log: don't use APPLICATION-scope SFSBs Revision Changes Path 1.6 +4 -2 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/CategoriesBean.java (In the diff below, changes in quantity of whitespace are not shown.) Index: CategoriesBean.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/CategoriesBean.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- CategoriesBean.java 15 Apr 2006 23:22:32 -0000 1.5 +++ CategoriesBean.java 25 Apr 2006 15:50:49 -0000 1.6 @@ -26,7 +26,7 @@ @Stateful @Name("catbean") -@Scope(ScopeType.APPLICATION) +@Scope(ScopeType.EVENT) public class CategoriesBean implements Categories, Serializable @@ -39,7 +39,9 @@ @Create public void loadData() { - categories = em.createQuery("from Category c").getResultList(); + categories = em.createQuery("from Category c") + .setHint("org.hibernate.cacheable", true) + .getResultList(); Map<String,Category> results = new TreeMap<String,Category>(); |
From: Norman R. <nor...@jb...> - 2006-05-07 03:12:38
|
User: nrichards Date: 06/05/06 23:12:29 Modified: examples/dvdstore/src/com/jboss/dvd/seam Product.java Log: add urls to project page Revision Changes Path 1.7 +10 -0 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/Product.java (In the diff below, changes in quantity of whitespace are not shown.) Index: Product.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/Product.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- Product.java 7 May 2006 02:10:51 -0000 1.6 +++ Product.java 7 May 2006 03:12:29 -0000 1.7 @@ -18,6 +18,7 @@ String title; String actor; String description; + String imageURL; float price; Category category; @@ -66,6 +67,15 @@ this.description = description; } + @Column(name="IMAGE_URL",length=256) + public String getImageURL() { + return imageURL; + } + + public void setImageURL(String imageURL) { + this.imageURL = imageURL; + } + @Column(name="ACTOR",nullable=false,length=50) public String getActor() { return actor; |
From: Norman R. <nor...@jb...> - 2006-05-10 17:45:53
|
User: nrichards Date: 06/05/10 13:45:46 Modified: examples/dvdstore/src/com/jboss/dvd/seam Customer.java Log: improve customer validation Revision Changes Path 1.12 +19 -28 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/Customer.java (In the diff below, changes in quantity of whitespace are not shown.) Index: Customer.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/Customer.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- Customer.java 10 May 2006 02:47:13 -0000 1.11 +++ Customer.java 10 May 2006 17:45:46 -0000 1.12 @@ -8,13 +8,10 @@ import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.Transient; +import javax.persistence.*; import org.jboss.seam.annotations.Name; +import org.hibernate.validator.*; @Entity @Name("customer") @@ -30,8 +27,7 @@ String city; String state; String zip; - String country; - Integer region; + String email; String phone; @@ -46,27 +42,36 @@ @Column(name="ADDRESS1",length=50) + @NotNull public String getAddress1() { return address1; } public void setAddress1(String address1) { this.address1 = address1; } + @Column(name="ADDRESS2",length=50) + @NotNull public String getAddress2() { return address2; } public void setAddress2(String address2) { this.address2 = address2; } + @Column(name="CITY",length=50) + @NotNull public String getCity() { return city; } public void setCity(String city) { this.city = city; } - @Column(name="STATE",length=50) + + + @Column(name="STATE",length=2) + @NotNull + @Length(min=2,max=2) public String getState() { return state; } @@ -74,9 +79,10 @@ this.state = state; } - @Column(name="ZIP", length=50) - //@Length(min=5, max=5) - //@NotNull + @Column(name="ZIP", length=10) + @Length(min=5, max=10) + @Pattern(regex="[0-9]{5}(-[0-9]{4})?", message="not a valid zipcode") // {validator.zip} + @NotNull public String getZip() { return zip; } @@ -84,23 +90,8 @@ this.zip = zip; } - @Column(name="COUNTRY",length=50) - public String getCountry() { - return country; - } - public void setCountry(String country) { - this.country = country; - } - - @Column(name="REGION") - public Integer getRegion() { - return region; - } - public void setRegion(Integer region) { - this.region = region; - } - @Column(name="EMAIL",length=50) + @Email public String getEmail() { return email; } |
From: Norman R. <nor...@jb...> - 2006-05-11 22:50:11
|
User: nrichards Date: 06/05/11 18:50:10 Modified: examples/dvdstore/src/com/jboss/dvd/seam StoreManagerBean.java Log: EntityNotFoundException to NoResultException Revision Changes Path 1.7 +4 -7 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/StoreManagerBean.java (In the diff below, changes in quantity of whitespace are not shown.) Index: StoreManagerBean.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/StoreManagerBean.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- StoreManagerBean.java 15 Apr 2006 23:22:32 -0000 1.6 +++ StoreManagerBean.java 11 May 2006 22:50:10 -0000 1.7 @@ -10,7 +10,7 @@ import javax.ejb.Stateless; import javax.persistence.EntityManager; -import javax.persistence.EntityNotFoundException; +import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import org.jboss.seam.annotations.Name; @@ -35,8 +35,7 @@ return (Float) em.createQuery("select sum(o.totalAmount) from Order o where o.status != :status") .setParameter("status", Order.Status.CANCELLED) .getSingleResult(); - } - catch (EntityNotFoundException e) { + } catch (NoResultException e) { return 0.0; } } @@ -44,8 +43,7 @@ public int getUnitsSold() { try { return (Integer) em.createQuery("select sum(i.sales) from Inventory i").getSingleResult(); - } - catch (EntityNotFoundException e) { + } catch (NoResultException e) { return 0; } } @@ -53,8 +51,7 @@ public int getTotalInventory() { try { return (Integer) em.createQuery("select sum(i.quantity) from Inventory i").getSingleResult(); - } - catch (EntityNotFoundException e) { + } catch (NoResultException e) { return 0; } } |
From: Norman R. <nor...@jb...> - 2006-05-14 05:39:52
|
User: nrichards Date: 06/05/14 01:39:49 Modified: examples/dvdstore/src/com/jboss/dvd/seam EditCustomerAction.java Log: work around panelgrid bugs, make email required Revision Changes Path 1.12 +9 -1 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/EditCustomerAction.java (In the diff below, changes in quantity of whitespace are not shown.) Index: EditCustomerAction.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/EditCustomerAction.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- EditCustomerAction.java 10 May 2006 02:47:13 -0000 1.11 +++ EditCustomerAction.java 14 May 2006 05:39:49 -0000 1.12 @@ -14,7 +14,7 @@ import javax.ejb.*; import javax.persistence.*; -import org.hibernate.validator.Valid; +import org.hibernate.validator.*; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.*; import org.jboss.seam.contexts.Context; @@ -102,10 +102,18 @@ facesMessages.addFromResourceBundle("createCustomerSuccess"); return "success"; + } catch (org.hibernate.validator.InvalidStateException e) { + InvalidValue[] vals = e.getInvalidValues(); + for (InvalidValue val: vals) { + System.out.println("-- " + val); + } + + return null; } catch (RuntimeException e) { ctx.setRollbackOnly(); facesMessages.addFromResourceBundle("createCustomerError"); + return null; } } |
From: Gavin K. <gav...@jb...> - 2006-05-15 00:20:00
|
User: gavin Date: 06/05/14 20:19:57 Modified: examples/dvdstore/src/com/jboss/dvd/seam Admin.java Log: minor Revision Changes Path 1.7 +0 -1 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/Admin.java (In the diff below, changes in quantity of whitespace are not shown.) Index: Admin.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/Admin.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- Admin.java 14 Apr 2006 15:13:39 -0000 1.6 +++ Admin.java 15 May 2006 00:19:57 -0000 1.7 @@ -10,7 +10,6 @@ import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; -import javax.persistence.Inheritance; @Entity @DiscriminatorValue("admin") |
From: Gavin K. <gav...@jb...> - 2006-05-22 03:57:54
|
User: gavin Date: 06/05/21 23:57:53 Modified: examples/dvdstore/src/com/jboss/dvd/seam Order.java Log: don't display cancel button always Revision Changes Path 1.13 +8 -9 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/Order.java (In the diff below, changes in quantity of whitespace are not shown.) Index: Order.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/Order.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -b -r1.12 -r1.13 --- Order.java 14 May 2006 18:48:54 -0000 1.12 +++ Order.java 22 May 2006 03:57:53 -0000 1.13 @@ -61,7 +61,6 @@ return (orderLines == null) || (orderLines.size()==0); } - @OneToMany(mappedBy="order", cascade=CascadeType.ALL) public List<OrderLine> getOrderLines() { return orderLines; @@ -86,7 +85,6 @@ orderLines.add(line); } - public void removeProduct(Product product) { for (OrderLine line: orderLines) { if (product.getProductId() == line.getProduct().getProductId()) { @@ -165,21 +163,22 @@ setTotalAmount(getNetAmount() + getTax()); } - public void cancel() { - setStatus(Order.Status.CANCELLED); + setStatus(Status.CANCELLED); } public void process() { - setStatus(Order.Status.PROCESSING); + setStatus(Status.PROCESSING); } public void ship(String tracking) { - setStatus(Order.Status.SHIPPED); + setStatus(Status.SHIPPED); setTrackingNumber(tracking); } - - + @Transient + public boolean isOpen() { + return status == Status.OPEN; + } } |
From: Gavin K. <gav...@jb...> - 2006-05-22 10:35:44
|
User: gavin Date: 06/05/22 06:35:34 Modified: examples/dvdstore/src/com/jboss/dvd/seam ShowOrdersAction.java Log: non-buggy impl of cancel order Revision Changes Path 1.13 +17 -1 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ShowOrdersAction.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ShowOrdersAction.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ShowOrdersAction.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -b -r1.12 -r1.13 --- ShowOrdersAction.java 12 May 2006 04:56:34 -0000 1.12 +++ ShowOrdersAction.java 22 May 2006 10:35:34 -0000 1.13 @@ -24,6 +24,9 @@ import org.jboss.seam.annotations.Out; import org.jboss.seam.annotations.datamodel.DataModel; import org.jboss.seam.annotations.datamodel.DataModelSelectionIndex; +import org.jboss.seam.core.ManagedJbpmContext; +import org.jbpm.JbpmContext; +import org.jbpm.graph.exe.ProcessInstance; import com.jboss.dvd.seam.Order.Status; @@ -61,13 +64,26 @@ public String cancelOrder() { + order = em.merge(orders.get(index)); + if (order.getStatus() != Status.OPEN) { return null; } - order = em.merge(order); order.setStatus(Status.CANCELLED); + JbpmContext context = ManagedJbpmContext.instance(); + + ProcessInstance pi = (ProcessInstance) context.getSession() + .createQuery("select pi from LongInstance si join si.processInstance pi " + + "where si.name = 'orderId' and si.value = :orderId") + .setLong("orderId", order.getOrderId()) + .uniqueResult(); + + pi.signal("cancel"); + + context.save(pi); + return findOrders(); } |