[jboss-cvs] jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam ...
Norman Richards
norman.richards at jboss.com
Thu Oct 18 01:29:24 EDT 2007
User: nrichards
Date: 07/10/18 01:29:24
Modified: examples/dvdstore/src/com/jboss/dvd/seam
AuthenticatorAction.java Checkout.java
CheckoutAction.java FullTextSearch.java Order.java
testng.xml
Log:
JBSEAM-2068
Revision Changes Path
1.7 +0 -1 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/AuthenticatorAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AuthenticatorAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/AuthenticatorAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- AuthenticatorAction.java 4 Oct 2007 23:15:17 -0000 1.6
+++ AuthenticatorAction.java 18 Oct 2007 05:29:23 -0000 1.7
@@ -42,7 +42,6 @@
identity.addRole("admin");
}
- System.out.println("CURRENT USER IS " + currentUser);
return true;
}
}
1.3 +1 -2 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/Checkout.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Checkout.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/Checkout.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Checkout.java 10 May 2006 07:29:20 -0000 1.2
+++ Checkout.java 18 Oct 2007 05:29:23 -0000 1.3
@@ -8,7 +8,6 @@
public interface Checkout
{
-// public void startCheckout();
public void createOrder();
public void submitOrder();
1.13 +6 -5 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/CheckoutAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CheckoutAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/CheckoutAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- CheckoutAction.java 16 Oct 2007 19:19:22 -0000 1.12
+++ CheckoutAction.java 18 Oct 2007 05:29:23 -0000 1.13
@@ -21,6 +21,7 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Begin;
import org.jboss.seam.annotations.bpm.CreateProcess;
+import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.annotations.End;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
@@ -28,7 +29,6 @@
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.faces.FacesMessages;
-
@Stateful
@Name("checkout")
public class CheckoutAction
@@ -58,6 +58,7 @@
@Out(value="customer",scope=ScopeType.BUSINESS_PROCESS, required=false)
String customerName;
+
@Begin(nested=true, pageflow="checkout")
public void createOrder() {
currentOrder = new Order();
@@ -73,6 +74,7 @@
@End
@CreateProcess(definition="OrderManagement", processKey="#{completedOrder.orderId}")
+ @Restrict("#{identity.loggedIn}")
public void submitOrder() {
try {
completedOrder = purchase(customer, currentOrder);
@@ -89,7 +91,6 @@
}
}
-
private Order purchase(Customer customer, Order order)
throws InsufficientQuantityException
{
1.2 +2 -6 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/FullTextSearch.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FullTextSearch.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/FullTextSearch.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- FullTextSearch.java 23 Jun 2007 22:04:52 -0000 1.1
+++ FullTextSearch.java 18 Oct 2007 05:29:23 -0000 1.2
@@ -1,4 +1,4 @@
-//$Id: FullTextSearch.java,v 1.1 2007/06/23 22:04:52 gavin Exp $
+//$Id: FullTextSearch.java,v 1.2 2007/10/18 05:29:23 nrichards Exp $
package com.jboss.dvd.seam;
/**
@@ -32,10 +32,6 @@
public void setPageSize(int pageSize);
- /*public void setCategory(Category category) ;
-
- public Category getCategory();*/
-
public void reset();
public void destroy();
1.18 +0 -1 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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- Order.java 22 Mar 2007 19:39:31 -0000 1.17
+++ Order.java 18 Oct 2007 05:29:23 -0000 1.18
@@ -165,7 +165,6 @@
setNetAmount(total);
-
setTax(round(getNetAmount().multiply(TAX_RATE)));
setTotalAmount(getNetAmount().add(getTax()));
}
1.5 +6 -0 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/testng.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: testng.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/testng.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testng.xml 13 Jul 2007 16:05:20 -0000 1.4
+++ testng.xml 18 Oct 2007 05:29:23 -0000 1.5
@@ -18,4 +18,10 @@
<class name="com.jboss.dvd.seam.test.StoreManagerTest"/>
</classes>
</test>
+
+ <test name="DVD Store: Order">
+ <classes>
+ <class name="com.jboss.dvd.seam.test.OrderTest" />
+ </classes>
+ </test>
</suite>
More information about the jboss-cvs-commits
mailing list