[jboss-cvs] jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam ...
Gavin King
gavin.king at jboss.com
Tue Jun 19 16:54:23 EDT 2007
User: gavin
Date: 07/06/19 16:54:23
Modified: examples/dvdstore/src/com/jboss/dvd/seam
AcceptAction.java Admin.java
AuthenticatorAction.java CheckoutAction.java
EditCustomerAction.java
ProcessDefinitionSwitcher.java ShipAction.java
ShoppingCartBean.java ShowOrdersAction.java
Log:
update to new packaging
Revision Changes Path
1.16 +0 -2 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/AcceptAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AcceptAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/AcceptAction.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- AcceptAction.java 18 Jun 2007 01:22:40 -0000 1.15
+++ AcceptAction.java 19 Jun 2007 20:54:23 -0000 1.16
@@ -15,7 +15,6 @@
import javax.persistence.PersistenceContextType;
import org.jboss.seam.annotations.BeginTask;
-import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.EndTask;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
@@ -56,7 +55,6 @@
return "admin";
}
- @Destroy
@Remove
public void destroy() {}
}
1.9 +1 -0 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- Admin.java 22 Feb 2007 06:03:45 -0000 1.8
+++ Admin.java 19 Jun 2007 20:54:23 -0000 1.9
@@ -19,6 +19,7 @@
implements Serializable
{
@Transient
+ @Override
public boolean isAdmin() {
return true;
}
1.3 +1 -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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- AuthenticatorAction.java 22 Mar 2007 19:39:31 -0000 1.2
+++ AuthenticatorAction.java 19 Jun 2007 20:54:23 -0000 1.3
@@ -6,8 +6,8 @@
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
+import org.jboss.seam.bpm.Actor;
import org.jboss.seam.contexts.Context;
-import org.jboss.seam.core.Actor;
import org.jboss.seam.security.Identity;
@Stateless
1.9 +2 -7 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- CheckoutAction.java 17 Jun 2007 23:07:53 -0000 1.8
+++ CheckoutAction.java 19 Jun 2007 20:54:23 -0000 1.9
@@ -4,12 +4,10 @@
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
-
package com.jboss.dvd.seam;
-import java.math.BigDecimal;
-
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -23,13 +21,12 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Begin;
import org.jboss.seam.annotations.CreateProcess;
-import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.End;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.core.FacesMessages;
+import org.jboss.seam.faces.FacesMessages;
@Stateful
@@ -120,8 +117,6 @@
return order;
}
-
- @Destroy
@Remove
public void destroy() {}
1.20 +4 -6 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.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- EditCustomerAction.java 22 Mar 2007 19:39:31 -0000 1.19
+++ EditCustomerAction.java 19 Jun 2007 20:54:23 -0000 1.20
@@ -20,13 +20,12 @@
import org.hibernate.validator.InvalidStateException;
import org.hibernate.validator.InvalidValue;
import org.jboss.seam.annotations.Begin;
-import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
+import org.jboss.seam.bpm.Actor;
import org.jboss.seam.contexts.Context;
-import org.jboss.seam.core.Actor;
-import org.jboss.seam.core.FacesMessages;
+import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.security.Identity;
@Stateful
@@ -140,7 +139,6 @@
return map;
}
- @Destroy @Remove
- public void destroy() {
- }
+ @Remove
+ public void destroy() {}
}
1.10 +2 -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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ProcessDefinitionSwitcher.java 17 Nov 2006 02:49:04 -0000 1.9
+++ ProcessDefinitionSwitcher.java 19 Jun 2007 20:54:23 -0000 1.10
@@ -9,7 +9,7 @@
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.core.Jbpm;
+import org.jboss.seam.bpm.Jbpm;
import org.jbpm.JbpmContext;
/**
@@ -25,7 +25,7 @@
"ordermanagement3.jpdl.xml"
};
- @In(value="org.jboss.seam.core.jbpm")
+ @In(value="org.jboss.seam.bpm.jbpm")
private Jbpm jbpm;
@In
1.16 +1 -2 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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- ShipAction.java 18 Jun 2007 01:22:40 -0000 1.15
+++ ShipAction.java 19 Jun 2007 20:54:23 -0000 1.16
@@ -14,7 +14,6 @@
import org.hibernate.validator.Length;
import org.hibernate.validator.NotNull;
import org.jboss.seam.annotations.BeginTask;
-import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.EndTask;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
@@ -53,6 +52,6 @@
return "admin";
}
- @Destroy @Remove
+ @Remove
public void destroy() { }
}
1.27 +1 -5 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.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- ShoppingCartBean.java 17 Dec 2006 07:20:05 -0000 1.26
+++ ShoppingCartBean.java 19 Jun 2007 20:54:23 -0000 1.27
@@ -8,9 +8,8 @@
import static org.jboss.seam.ScopeType.SESSION;
-import java.math.BigDecimal;
-
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -22,7 +21,6 @@
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
-import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
@@ -69,7 +67,6 @@
return cartOrder.getTotalAmount();
}
-
public void updateCart() {
List<OrderLine> newLines = new ArrayList<OrderLine>();
@@ -91,7 +88,6 @@
cartOrder = new Order();
}
- @Destroy
@Remove
public void destroy() {}
1.18 +0 -2 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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- ShowOrdersAction.java 18 Jun 2007 01:22:40 -0000 1.17
+++ ShowOrdersAction.java 19 Jun 2007 20:54:23 -0000 1.18
@@ -17,7 +17,6 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Begin;
-import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.End;
import org.jboss.seam.annotations.Factory;
import org.jboss.seam.annotations.In;
@@ -89,7 +88,6 @@
return null;
}
- @Destroy
@Remove
public void destroy() {}
More information about the jboss-cvs-commits
mailing list