You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/08/30 16:55:29 UTC
svn commit: r809350 - in
/incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation:
beans/ beans/admin/ beans/user/ controller/ controller/admin/
controller/user/ intercept/ util/
Author: gerdogdu
Date: Sun Aug 30 14:55:28 2009
New Revision: 809350
URL: http://svn.apache.org/viewvc?rev=809350&view=rev
Log:
Update for JSR-330
Modified:
incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LoginBean.java
incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/RegisterBean.java
incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminBean.java
incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java
incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java
incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java
incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java
incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserUpdateBean.java
incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java
incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/RegisterController.java
incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java
incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java
incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/LoginDecorator.java
incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java
incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/EntityManagerUtil.java
Modified: incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LoginBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LoginBean.java?rev=809350&r1=809349&r2=809350&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LoginBean.java (original)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/LoginBean.java Sun Aug 30 14:55:28 2009
@@ -19,6 +19,7 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
+import javax.inject.Inject;
import javax.inject.Named;
import org.apache.commons.validator.GenericValidator;
@@ -42,10 +43,10 @@
private String password;
/**Inject of the event instance*/
- private @Any Event<LoggedInEvent> loggedInEvent;
+ private @Inject @Any Event<LoggedInEvent> loggedInEvent;
/**Database related login controller*/
- private @DatabaseLogin LoginController loginController;
+ private @Inject @DatabaseLogin LoginController loginController;
/**
* Check user login.
Modified: incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/RegisterBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/RegisterBean.java?rev=809350&r1=809349&r2=809350&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/RegisterBean.java (original)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/RegisterBean.java Sun Aug 30 14:55:28 2009
@@ -18,7 +18,8 @@
import javax.annotation.PostConstruct;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.enterprise.inject.spi.BeanManager;
@@ -31,7 +32,7 @@
@RequestScoped
public class RegisterBean
{
- private @ApplicationLog Log logger;
+ private @Inject @ApplicationLog Log logger;
private String name;
@@ -45,9 +46,9 @@
private boolean admin;
- private @Current RegisterController personController;
+ private @Inject @Default RegisterController personController;
- private @Current BeanManager manager;
+ private @Inject @Default BeanManager manager;
public RegisterBean()
{
Modified: incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminBean.java?rev=809350&r1=809349&r2=809350&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminBean.java (original)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminBean.java Sun Aug 30 14:55:28 2009
@@ -17,7 +17,8 @@
package org.apache.webbeans.reservation.beans.admin;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import org.apache.webbeans.reservation.controller.admin.AdminController;
@@ -38,7 +39,7 @@
private Number star;
- private @Current AdminController adminController;
+ private @Inject @Default AdminController adminController;
/**
* Add new hotel
Modified: incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java?rev=809350&r1=809349&r2=809350&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java (original)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListBean.java Sun Aug 30 14:55:28 2009
@@ -21,7 +21,8 @@
import java.util.List;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.faces.component.html.HtmlDataTable;
@@ -40,7 +41,7 @@
private HtmlDataTable model;
- private @Current AdminController controller;
+ private @Inject @Default AdminController controller;
private Hotel selected;
Modified: incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java?rev=809350&r1=809349&r2=809350&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java (original)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/admin/AdminListUser.java Sun Aug 30 14:55:28 2009
@@ -22,7 +22,8 @@
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.faces.component.html.HtmlDataTable;
@@ -36,7 +37,7 @@
{
private List<User> users = new ArrayList<User>();
- private @Current AdminController controller;
+ private @Inject @Default AdminController controller;
private HtmlDataTable model;
Modified: incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java?rev=809350&r1=809349&r2=809350&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java (original)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserListBean.java Sun Aug 30 14:55:28 2009
@@ -20,7 +20,8 @@
import java.util.List;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.faces.component.html.HtmlDataTable;
@@ -38,9 +39,9 @@
private HtmlDataTable model = null;
- private @Current UserController controller;
+ private @Inject @Default UserController controller;
- private @Current SessionTracker tracker;
+ private @Inject @Default SessionTracker tracker;
public UserListBean()
{
Modified: incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java?rev=809350&r1=809349&r2=809350&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java (original)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserReservationBean.java Sun Aug 30 14:55:28 2009
@@ -26,7 +26,8 @@
import javax.enterprise.context.Conversation;
import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.faces.component.html.HtmlDataTable;
import javax.faces.model.SelectItem;
@@ -46,19 +47,19 @@
private List<SelectItem> reservations = new ArrayList<SelectItem>();
- private @Current UserController controller;
+ private @Inject @Default UserController controller;
private List<Hotel> hotels = new ArrayList<Hotel>();
- private @Current AdminController adminController;
+ private @Inject @Default AdminController adminController;
private String reservationDate;
private HtmlDataTable model;
- private @Current Conversation conversation;
+ private @Inject @Default Conversation conversation;
- private @Current SessionTracker tracker;
+ private @Inject @Default SessionTracker tracker;
private Integer[] itemSelected = new Integer[0];
Modified: incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserUpdateBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserUpdateBean.java?rev=809350&r1=809349&r2=809350&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserUpdateBean.java (original)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/beans/user/UserUpdateBean.java Sun Aug 30 14:55:28 2009
@@ -17,7 +17,8 @@
package org.apache.webbeans.reservation.beans.user;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import org.apache.webbeans.reservation.controller.user.UserController;
@@ -39,9 +40,9 @@
private String password;
- private @Current UserController controller;
+ private @Inject @Default UserController controller;
- private @Current SessionTracker tracker;
+ private @Inject @Default SessionTracker tracker;
public UserUpdateBean()
{
Modified: incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java?rev=809350&r1=809349&r2=809350&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java (original)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java Sun Aug 30 14:55:28 2009
@@ -21,7 +21,8 @@
import java.util.logging.Logger;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -40,7 +41,7 @@
private Logger logger = Logger.getLogger(LoginController.class.getName());
/**Injection of the request scope entity manager*/
- private @Current EntityManager entityManager;
+ private @Inject @Default EntityManager entityManager;
/**
* Returns true if user exist else false
Modified: incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/RegisterController.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/RegisterController.java?rev=809350&r1=809349&r2=809350&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/RegisterController.java (original)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/RegisterController.java Sun Aug 30 14:55:28 2009
@@ -17,7 +17,8 @@
package org.apache.webbeans.reservation.controller;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.persistence.EntityManager;
import org.apache.commons.logging.Log;
@@ -34,9 +35,9 @@
@RequestScoped
public class RegisterController implements IRegisterController
{
- private @ApplicationLog Log logger;
+ private @Inject @ApplicationLog Log logger;
- private @Current EntityManager entityManager;
+ private @Inject @Default EntityManager entityManager;
/**
* Register the user.
Modified: incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java?rev=809350&r1=809349&r2=809350&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java (original)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java Sun Aug 30 14:55:28 2009
@@ -21,7 +21,8 @@
import java.util.Set;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.inject.Named;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -41,9 +42,9 @@
@RequestScoped
public class AdminController
{
- private @ApplicationLog Log logger;
+ private @Inject @ApplicationLog Log logger;
- private @Current EntityManager entityManager;
+ private @Inject @Default EntityManager entityManager;
@Transactional
public void createNewHotel(String name, int star, String city, String country)
Modified: incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java?rev=809350&r1=809349&r2=809350&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java (original)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java Sun Aug 30 14:55:28 2009
@@ -24,8 +24,9 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
import javax.faces.model.SelectItem;
+import javax.inject.Inject;
import javax.persistence.EntityManager;
import org.apache.commons.logging.Log;
@@ -39,9 +40,9 @@
@RequestScoped
public class UserController
{
- private @Current EntityManager entityManager;
+ private @Inject @Default EntityManager entityManager;
- private @ApplicationLog Log logger;
+ private @Inject @ApplicationLog Log logger;
public UserController()
{
Modified: incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/LoginDecorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/LoginDecorator.java?rev=809350&r1=809349&r2=809350&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/LoginDecorator.java (original)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/LoginDecorator.java Sun Aug 30 14:55:28 2009
@@ -20,6 +20,7 @@
import javax.decorator.Decorates;
import javax.decorator.Decorator;
import javax.enterprise.inject.Any;
+import javax.inject.Inject;
import org.apache.commons.logging.Log;
import org.apache.webbeans.reservation.bindings.ApplicationLog;
@@ -32,7 +33,7 @@
{
@Decorates @Any @DatabaseLogin ILoginController decorator;
- private @ApplicationLog Log logger;
+ private @Inject @ApplicationLog Log logger;
/* (non-Javadoc)
* @see org.apache.webbeans.reservation.controller.LoginController#checkLogin(java.lang.String, java.lang.String)
Modified: incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java?rev=809350&r1=809349&r2=809350&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java (original)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java Sun Aug 30 14:55:28 2009
@@ -16,7 +16,8 @@
*/
package org.apache.webbeans.reservation.intercept;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
@@ -31,9 +32,9 @@
@Transactional
public class TransactionalInterceptor
{
- private @Current EntityManager entityManager;
+ private @Inject @Default EntityManager entityManager;
- private @ApplicationLog Log logger;
+ private @Inject @ApplicationLog Log logger;
@AroundInvoke
public Object invoke(InvocationContext context) throws Exception
Modified: incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/EntityManagerUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/EntityManagerUtil.java?rev=809350&r1=809349&r2=809350&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/EntityManagerUtil.java (original)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/EntityManagerUtil.java Sun Aug 30 14:55:28 2009
@@ -17,7 +17,7 @@
package org.apache.webbeans.reservation.util;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
import javax.persistence.EntityManager;
@@ -26,21 +26,20 @@
@RequestScoped
public class EntityManagerUtil
{
- private @PersistenceContext(unitName="reservation")
- EntityManager entityManager;
+ private @PersistenceContext(unitName="reservation") EntityManager entityManager;
public EntityManagerUtil()
{
}
- @Produces @RequestScoped @Current
+ @Produces @RequestScoped @Default
public EntityManager createEntityManager()
{
return entityManager;
}
- public void dispose(@Disposes @Current EntityManager entityManager)
+ public void dispose(@Disposes @Default EntityManager entityManager)
{
entityManager.close();
}