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 00:27:33 UTC
svn commit: r809210 - in
/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample:
bean/ bindings/ conversation/ guess/ model/conversation/ util/
Author: gerdogdu
Date: Sat Aug 29 22:27:33 2009
New Revision: 809210
URL: http://svn.apache.org/viewvc?rev=809210&view=rev
Log:
Changing of BindingType, Named and Initializer with JSR-330
Modified:
incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java
incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/JmsBinding.java
incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/LoggedInUser.java
incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java
incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/Highest.java
incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java
incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NextNumber.java
incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NumberProducer.java
incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/model/conversation/ConversationModel.java
incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java
Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java?rev=809210&r1=809209&r2=809210&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LoginBean.java Sat Aug 29 22:27:33 2009
@@ -23,7 +23,7 @@
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
import javax.enterprise.inject.Produces;
import javax.faces.application.FacesMessage;
Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java?rev=809210&r1=809209&r2=809210&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bean/LogoutBean.java Sat Aug 29 22:27:33 2009
@@ -16,7 +16,7 @@
*/
package org.apache.webbeans.sample.bean;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
import javax.faces.context.FacesContext;
import javax.servlet.http.HttpSession;
Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/JmsBinding.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/JmsBinding.java?rev=809210&r1=809209&r2=809210&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/JmsBinding.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/JmsBinding.java Sat Aug 29 22:27:33 2009
@@ -21,10 +21,10 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
-@BindingType
+@Qualifier
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD,ElementType.METHOD, ElementType.TYPE, ElementType.PARAMETER})
public @interface JmsBinding
Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/LoggedInUser.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/LoggedInUser.java?rev=809210&r1=809209&r2=809210&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/LoggedInUser.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/LoggedInUser.java Sat Aug 29 22:27:33 2009
@@ -21,10 +21,10 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
-@BindingType
+@Qualifier
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD,ElementType.METHOD, ElementType.TYPE, ElementType.PARAMETER})
public @interface LoggedInUser
Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java?rev=809210&r1=809209&r2=809210&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/ShoppingCardBean.java Sat Aug 29 22:27:33 2009
@@ -21,7 +21,7 @@
import javax.enterprise.context.Conversation;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
import javax.faces.application.FacesMessage;
import org.apache.webbeans.sample.model.conversation.ConversationModel;
Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/Highest.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/Highest.java?rev=809210&r1=809209&r2=809210&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/Highest.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/Highest.java Sat Aug 29 22:27:33 2009
@@ -27,9 +27,10 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
-@BindingType
+
+@Qualifier
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java?rev=809210&r1=809209&r2=809210&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/JSFNumberGuess.java Sat Aug 29 22:27:33 2009
@@ -20,12 +20,12 @@
import javax.enterprise.context.SessionScoped;
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
+import javax.inject.Inject;
@Named(value = "game")
@SessionScoped
@@ -47,7 +47,7 @@
}
- @Initializer
+ @Inject
public JSFNumberGuess(@NextNumber Integer number, @Highest Integer maxNumber)
{
this.no = number;
Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NextNumber.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NextNumber.java?rev=809210&r1=809209&r2=809210&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NextNumber.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NextNumber.java Sat Aug 29 22:27:33 2009
@@ -27,10 +27,10 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
-@BindingType
+@Qualifier
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NumberProducer.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NumberProducer.java?rev=809210&r1=809209&r2=809210&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NumberProducer.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/guess/NumberProducer.java Sat Aug 29 22:27:33 2009
@@ -20,7 +20,7 @@
import java.io.Serializable;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
import javax.enterprise.inject.Produces;
@SessionScoped
Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/model/conversation/ConversationModel.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/model/conversation/ConversationModel.java?rev=809210&r1=809209&r2=809210&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/model/conversation/ConversationModel.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/model/conversation/ConversationModel.java Sat Aug 29 22:27:33 2009
@@ -21,7 +21,7 @@
import java.util.List;
import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
@ConversationScoped
@Named
Modified: incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java?rev=809210&r1=809209&r2=809210&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/java/org/apache/webbeans/sample/util/FacesMessageUtil.java Sat Aug 29 22:27:33 2009
@@ -17,7 +17,7 @@
package org.apache.webbeans.sample.util;
import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Named;
+import javax.inject.Named;
import javax.faces.application.FacesMessage;
import javax.faces.application.FacesMessage.Severity;
import javax.faces.context.FacesContext;