[jboss-cvs] jboss-seam/examples/booking/src/org/jboss/seam/example/booking ...
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/booking/src/org/jboss/seam/example/booking
AuthenticatorAction.java BookingListAction.java
ChangePasswordAction.java HotelBookingAction.java
HotelSearchingAction.java RegisterAction.java
Log:
update to new packaging
Revision Changes Path
1.3 +2 -1 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/AuthenticatorAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AuthenticatorAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/AuthenticatorAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- AuthenticatorAction.java 25 Feb 2007 23:27:19 -0000 1.2
+++ AuthenticatorAction.java 19 Jun 2007 20:54:23 -0000 1.3
@@ -15,7 +15,8 @@
@Name("authenticator")
public class AuthenticatorAction implements Authenticator
{
- @PersistenceContext EntityManager em;
+ @PersistenceContext
+ private EntityManager em;
@Out(required=false, scope = SESSION)
private User user;
1.21 +4 -4 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/BookingListAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BookingListAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/BookingListAction.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- BookingListAction.java 6 Jun 2007 01:22:44 -0000 1.20
+++ BookingListAction.java 19 Jun 2007 20:54:23 -0000 1.21
@@ -1,4 +1,4 @@
-//$Id: BookingListAction.java,v 1.20 2007/06/06 01:22:44 gavin Exp $
+//$Id: BookingListAction.java,v 1.21 2007/06/19 20:54:23 gavin Exp $
package org.jboss.seam.example.booking;
import static javax.ejb.TransactionAttributeType.REQUIRES_NEW;
@@ -13,7 +13,6 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.Factory;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Logger;
@@ -23,7 +22,7 @@
import org.jboss.seam.annotations.datamodel.DataModel;
import org.jboss.seam.annotations.datamodel.DataModelSelection;
import org.jboss.seam.annotations.security.Restrict;
-import org.jboss.seam.core.FacesMessages;
+import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.log.Log;
@Stateful
@@ -34,6 +33,7 @@
public class BookingListAction implements BookingList, Serializable
{
private static final long serialVersionUID = 1L;
+
@PersistenceContext
private EntityManager em;
@@ -71,6 +71,6 @@
return booking;
}
- @Destroy @Remove
+ @Remove
public void destroy() {}
}
1.20 +7 -4 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/ChangePasswordAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangePasswordAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/ChangePasswordAction.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- ChangePasswordAction.java 13 Feb 2007 03:49:42 -0000 1.19
+++ ChangePasswordAction.java 19 Jun 2007 20:54:23 -0000 1.20
@@ -1,17 +1,20 @@
-//$Id: ChangePasswordAction.java,v 1.19 2007/02/13 03:49:42 sbryzak2 Exp $
+//$Id: ChangePasswordAction.java,v 1.20 2007/06/19 20:54:23 gavin Exp $
package org.jboss.seam.example.booking;
+
import static org.jboss.seam.ScopeType.EVENT;
+
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-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.annotations.Scope;
import org.jboss.seam.annotations.security.Restrict;
-import org.jboss.seam.core.FacesMessages;
+import org.jboss.seam.faces.FacesMessages;
+
@Stateful
@Scope(EVENT)
@Name("changePassword")
@@ -65,6 +68,6 @@
this.verify = verify;
}
- @Destroy @Remove
+ @Remove
public void destroy() {}
}
1.51 +3 -4 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelBookingAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HotelBookingAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelBookingAction.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- HotelBookingAction.java 17 May 2007 23:43:09 -0000 1.50
+++ HotelBookingAction.java 19 Jun 2007 20:54:23 -0000 1.51
@@ -1,4 +1,4 @@
-//$Id: HotelBookingAction.java,v 1.50 2007/05/17 23:43:09 gavin Exp $
+//$Id: HotelBookingAction.java,v 1.51 2007/06/19 20:54:23 gavin Exp $
package org.jboss.seam.example.booking;
import static javax.persistence.PersistenceContextType.EXTENDED;
@@ -11,7 +11,6 @@
import javax.persistence.PersistenceContext;
import org.jboss.seam.annotations.Begin;
-import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.End;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Logger;
@@ -19,7 +18,7 @@
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.core.Events;
-import org.jboss.seam.core.FacesMessages;
+import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.log.Log;
@Stateful
@@ -104,6 +103,6 @@
@End
public void cancel() {}
- @Destroy @Remove
+ @Remove
public void destroy() {}
}
\ No newline at end of file
1.18 +6 -3 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelSearchingAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HotelSearchingAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelSearchingAction.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- HotelSearchingAction.java 25 Feb 2007 19:09:39 -0000 1.17
+++ HotelSearchingAction.java 19 Jun 2007 20:54:23 -0000 1.18
@@ -1,17 +1,20 @@
-//$Id: HotelSearchingAction.java,v 1.17 2007/02/25 19:09:39 gavin Exp $
+//$Id: HotelSearchingAction.java,v 1.18 2007/06/19 20:54:23 gavin Exp $
package org.jboss.seam.example.booking;
+
import java.util.List;
+
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+
import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Destroy;
import org.jboss.seam.annotations.Factory;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.datamodel.DataModel;
import org.jboss.seam.annotations.security.Restrict;
+
@Stateful
@Name("hotelSearch")
@Scope(ScopeType.SESSION)
@@ -78,6 +81,6 @@
this.searchString = searchString;
}
- @Destroy @Remove
+ @Remove
public void destroy() {}
}
\ No newline at end of file
1.21 +8 -4 jboss-seam/examples/booking/src/org/jboss/seam/example/booking/RegisterAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RegisterAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/RegisterAction.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- RegisterAction.java 25 Feb 2007 19:09:39 -0000 1.20
+++ RegisterAction.java 19 Jun 2007 20:54:23 -0000 1.21
@@ -1,16 +1,20 @@
-//$Id: RegisterAction.java,v 1.20 2007/02/25 19:09:39 gavin Exp $
+//$Id: RegisterAction.java,v 1.21 2007/06/19 20:54:23 gavin Exp $
package org.jboss.seam.example.booking;
+
import static org.jboss.seam.ScopeType.EVENT;
+
import java.util.List;
+
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import org.jboss.seam.annotations.Destroy;
+
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.core.FacesMessages;
+import org.jboss.seam.faces.FacesMessages;
+
@Stateful
@Scope(EVENT)
@Name("register")
@@ -71,6 +75,6 @@
this.verify = verify;
}
- @Destroy @Remove
+ @Remove
public void destroy() {}
}
More information about the jboss-cvs-commits
mailing list