svn commit: r809345 - in /incubator/openwebbeans/trunk/samples/ejb-sample: pom.xml src/main/java/org/apache/webbeans/sample/bean/EchoManaged.java src/main/java/org/apache/webbeans/sample/injection/InjectionTargetBean.java

[ge...@apache.org]

Author: gerdogdu
Date: Sun Aug 30 14:48:17 2009
New Revision: 809345

URL: http://svn.apache.org/viewvc?rev=809345&view=rev
Log:
Update for JSR-330

Modified:
    incubator/openwebbeans/trunk/samples/ejb-sample/pom.xml
    incubator/openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/bean/EchoManaged.java
    incubator/openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/injection/InjectionTargetBean.java

Modified: incubator/openwebbeans/trunk/samples/ejb-sample/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/ejb-sample/pom.xml?rev=809345&r1=809344&r2=809345&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/ejb-sample/pom.xml (original)
+++ incubator/openwebbeans/trunk/samples/ejb-sample/pom.xml Sun Aug 30 14:48:17 2009
@@ -57,7 +57,7 @@
 			<scope>provided</scope>
 		</dependency>
 		
-		<!-- JSR-299 API, provided -->
+		<!-- JSR-299 Implementation -->
 		<dependency>
 			<groupId>org.apache.openwebbeans</groupId>
 			<artifactId>openwebbeans-impl</artifactId>

Modified: incubator/openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/bean/EchoManaged.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/bean/EchoManaged.java?rev=809345&r1=809344&r2=809345&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/bean/EchoManaged.java (original)
+++ incubator/openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/bean/EchoManaged.java Sun Aug 30 14:48:17 2009
@@ -14,7 +14,8 @@
 package org.apache.webbeans.sample.bean;
 
 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.Produces;
 import javax.enterprise.inject.spi.Bean;
@@ -30,13 +31,13 @@
 @Named("echo")
 public class EchoManaged
 {
-    private @Current Echo echo;
+    private @Inject @Default Echo echo;
         
     private String text;
     
     private String name;
     
-    private @Produces @Current @PersistenceUnit(unitName="myDataBase") EntityManagerFactory emf;
+    private @Produces @Default @PersistenceUnit(unitName="myDataBase") EntityManagerFactory emf;
     
     public String getName()
     {

Modified: incubator/openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/injection/InjectionTargetBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/injection/InjectionTargetBean.java?rev=809345&r1=809344&r2=809345&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/injection/InjectionTargetBean.java (original)
+++ incubator/openwebbeans/trunk/samples/ejb-sample/src/main/java/org/apache/webbeans/sample/injection/InjectionTargetBean.java Sun Aug 30 14:48:17 2009
@@ -15,7 +15,8 @@
 
 import javax.annotation.Resource;
 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.EntityManagerFactory;
 import javax.sql.DataSource;
@@ -24,7 +25,7 @@
 @Named("injected")
 public class InjectionTargetBean
 {
-    @Current EntityManagerFactory emf;
+    @Inject @Default EntityManagerFactory emf;
     
     @Resource(name="My DataSource") DataSource dataSource;