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 2010/02/14 03:05:09 UTC
svn commit: r909951 - in /openwebbeans/trunk/samples:
conversation-sample/src/main/webapp/WEB-INF/ ejb-sample/ ejb-telephone/
guess/ jms-sample/ reservation/
reservation/src/main/java/org/apache/webbeans/reservation/bindings/
reservation/src/main/java/...
Author: gerdogdu
Date: Sun Feb 14 02:05:08 2010
New Revision: 909951
URL: http://svn.apache.org/viewvc?rev=909951&view=rev
Log:
[OWB-281] update resource plugin handling, update poms
Added:
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/EntityManagerQualifier.java (with props)
Modified:
openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml
openwebbeans/trunk/samples/ejb-sample/pom.xml
openwebbeans/trunk/samples/ejb-telephone/pom.xml
openwebbeans/trunk/samples/guess/pom.xml
openwebbeans/trunk/samples/jms-sample/pom.xml
openwebbeans/trunk/samples/reservation/pom.xml
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/RegisterController.java
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java
openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/EntityManagerUtil.java
openwebbeans/trunk/samples/standalone-sample/pom.xml
Modified: openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml?rev=909951&r1=909950&r2=909951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml Sun Feb 14 02:05:08 2010
@@ -27,7 +27,7 @@
<from-view-id>/buy.xhtml</from-view-id>
<navigation-case>
<from-outcome>toListingPage</from-outcome>
- <to-view-id>/listing.xhtml</to-view-id>
+ <to-view-id>/listing.xhtml</to-view-id>
<redirect/>
</navigation-case>
</navigation-rule>
Modified: openwebbeans/trunk/samples/ejb-sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/ejb-sample/pom.xml?rev=909951&r1=909950&r2=909951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/ejb-sample/pom.xml (original)
+++ openwebbeans/trunk/samples/ejb-sample/pom.xml Sun Feb 14 02:05:08 2010
@@ -42,12 +42,6 @@
</build>
- <properties>
- <geronimo_cdi.version>1.0-SNAPSHOT</geronimo_cdi.version>
- <geronimo_atinject.version>1.0-SNAPSHOT</geronimo_atinject.version>
- </properties>
-
-
<dependencies>
<!-- For Junit Test -->
@@ -64,21 +58,6 @@
<version>1.1.14</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>${geronimo_cdi.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${geronimo_atinject.version}</version>
- <scope>provided</scope>
- </dependency>
-
-
<!-- JSR-299 Implementation -->
<dependency>
<groupId>org.apache.openwebbeans</groupId>
@@ -135,24 +114,18 @@
<version>${project.version}</version>
</dependency>
- <!-- Geronimo PLugin-->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
-
- <!-- Interceptor API -->
-
- <!-- JPA API -->
-
-
</dependencies>
</project>
Modified: openwebbeans/trunk/samples/ejb-telephone/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/ejb-telephone/pom.xml?rev=909951&r1=909950&r2=909951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/ejb-telephone/pom.xml (original)
+++ openwebbeans/trunk/samples/ejb-telephone/pom.xml Sun Feb 14 02:05:08 2010
@@ -42,12 +42,6 @@
</build>
- <properties>
- <geronimo_cdi.version>1.0-SNAPSHOT</geronimo_cdi.version>
- <geronimo_atinject.version>1.0-SNAPSHOT</geronimo_atinject.version>
- </properties>
-
-
<dependencies>
<!-- JSF Facelet -->
@@ -56,21 +50,6 @@
<artifactId>jsf-facelets</artifactId>
<version>1.1.14</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>${geronimo_cdi.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${geronimo_atinject.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- JSR-299 Implementation -->
<dependency>
@@ -128,24 +107,18 @@
<version>${project.version}</version>
</dependency>
- <!-- Geronimo PLugin-->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
-
-
- <!-- Interceptor API -->
-
- <!-- JPA API -->
-
-
+
</dependencies>
</project>
Modified: openwebbeans/trunk/samples/guess/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/pom.xml?rev=909951&r1=909950&r2=909951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/pom.xml (original)
+++ openwebbeans/trunk/samples/guess/pom.xml Sun Feb 14 02:05:08 2010
@@ -32,35 +32,8 @@
<finalName>guess</finalName>
</build>
- <properties>
- <geronimo_cdi.version>1.0-SNAPSHOT</geronimo_cdi.version>
- <geronimo_atinject.version>1.0-SNAPSHOT</geronimo_atinject.version>
- </properties>
-
-
<dependencies>
- <!-- For Junit Test -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>${geronimo_cdi.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${geronimo_atinject.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- JSF Facelet -->
<dependency>
<groupId>com.sun.facelets</groupId>
@@ -88,6 +61,15 @@
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<scope>provided</scope>
</dependency>
+
+
+ <!-- OWB implementation per application -->
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
@@ -97,25 +79,6 @@
<id>jetty</id>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>${geronimo_cdi.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${geronimo_atinject.version}</version>
- </dependency>
-
- <!-- OWB implementation per application -->
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<!-- MyFaces API -->
<dependency>
<groupId>org.apache.myfaces.core</groupId>
Modified: openwebbeans/trunk/samples/jms-sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/jms-sample/pom.xml?rev=909951&r1=909950&r2=909951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/jms-sample/pom.xml (original)
+++ openwebbeans/trunk/samples/jms-sample/pom.xml Sun Feb 14 02:05:08 2010
@@ -32,20 +32,8 @@
<finalName>jms-sample</finalName>
</build>
- <properties>
- <geronimo_cdi.version>1.0-SNAPSHOT</geronimo_cdi.version>
- <geronimo_atinject.version>1.0-SNAPSHOT</geronimo_atinject.version>
- </properties>
-
<dependencies>
- <!-- For Junit Test -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
<!-- JSF Facelet -->
<dependency>
<groupId>com.sun.facelets</groupId>
@@ -53,20 +41,6 @@
<version>1.1.14</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>${geronimo_cdi.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${geronimo_atinject.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- JSF Plugin -->
<dependency>
Modified: openwebbeans/trunk/samples/reservation/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/pom.xml?rev=909951&r1=909950&r2=909951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/pom.xml (original)
+++ openwebbeans/trunk/samples/reservation/pom.xml Sun Feb 14 02:05:08 2010
@@ -32,20 +32,8 @@
<finalName>reservation</finalName>
</build>
- <properties>
- <geronimo_cdi.version>1.0-SNAPSHOT</geronimo_cdi.version>
- <geronimo_atinject.version>1.0-SNAPSHOT</geronimo_atinject.version>
- </properties>
-
<dependencies>
- <!-- JUnit Test -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
<!-- Facelet -->
<dependency>
<groupId>com.sun.facelets</groupId>
@@ -53,20 +41,6 @@
<version>1.1.14</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>${geronimo_cdi.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${geronimo_atinject.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- JSF Plugin -->
<dependency>
<groupId>org.apache.openwebbeans</groupId>
@@ -112,7 +86,7 @@
<!-- EL API -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_1.0_spec</artifactId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -129,34 +103,21 @@
<artifactId>openwebbeans-resource</artifactId>
<version>${project.version}</version>
</dependency>
-
- </dependencies>
+ <!-- OWB Impl -->
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
<profiles>
<profile>
<id>jetty</id>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>${geronimo_cdi.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>${geronimo_atinject.version}</version>
- </dependency>
-
- <!-- OWB Impl -->
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<!-- My Faces API -->
<dependency>
<groupId>org.apache.myfaces.core</groupId>
Added: openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/EntityManagerQualifier.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/EntityManagerQualifier.java?rev=909951&view=auto
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/EntityManagerQualifier.java (added)
+++ openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/EntityManagerQualifier.java Sun Feb 14 02:05:08 2010
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.webbeans.reservation.bindings;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.PARAMETER;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+
+@Qualifier
+@Retention(RetentionPolicy.RUNTIME)
+@Target( {FIELD, METHOD, TYPE,PARAMETER})
+public @interface EntityManagerQualifier
+{
+
+}
Propchange: openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/bindings/EntityManagerQualifier.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java?rev=909951&r1=909950&r2=909951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java (original)
+++ openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/LoginController.java Sun Feb 14 02:05:08 2010
@@ -21,7 +21,6 @@
import java.util.logging.Logger;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.inject.Named;
import javax.persistence.EntityManager;
@@ -29,6 +28,7 @@
import org.apache.commons.validator.GenericValidator;
import org.apache.webbeans.reservation.bindings.DatabaseLogin;
+import org.apache.webbeans.reservation.bindings.EntityManagerQualifier;
import org.apache.webbeans.reservation.bindings.intercep.Transactional;
import org.apache.webbeans.reservation.controller.api.ILoginController;
import org.apache.webbeans.reservation.entity.User;
@@ -41,7 +41,7 @@
private Logger logger = Logger.getLogger(LoginController.class.getName());
/**Injection of the request scope entity manager*/
- private @Inject @Default EntityManager entityManager;
+ private @Inject @EntityManagerQualifier EntityManager entityManager;
/**
* Returns true if user exist else false
Modified: openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/RegisterController.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/RegisterController.java?rev=909951&r1=909950&r2=909951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/RegisterController.java (original)
+++ openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/RegisterController.java Sun Feb 14 02:05:08 2010
@@ -17,13 +17,13 @@
package org.apache.webbeans.reservation.controller;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.persistence.EntityManager;
import org.apache.commons.logging.Log;
import org.apache.commons.validator.GenericValidator;
import org.apache.webbeans.reservation.bindings.ApplicationLog;
+import org.apache.webbeans.reservation.bindings.EntityManagerQualifier;
import org.apache.webbeans.reservation.bindings.intercep.Transactional;
import org.apache.webbeans.reservation.controller.api.IRegisterController;
import org.apache.webbeans.reservation.entity.User;
@@ -37,7 +37,7 @@
{
private @Inject @ApplicationLog Log logger;
- private @Inject @Default EntityManager entityManager;
+ private @Inject @EntityManagerQualifier EntityManager entityManager;
/**
* Register the user.
Modified: openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java?rev=909951&r1=909950&r2=909951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java (original)
+++ openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/admin/AdminController.java Sun Feb 14 02:05:08 2010
@@ -21,7 +21,6 @@
import java.util.Set;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.inject.Named;
import javax.persistence.EntityManager;
@@ -30,6 +29,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.validator.GenericValidator;
import org.apache.webbeans.reservation.bindings.ApplicationLog;
+import org.apache.webbeans.reservation.bindings.EntityManagerQualifier;
import org.apache.webbeans.reservation.bindings.intercep.Transactional;
import org.apache.webbeans.reservation.entity.Hotel;
import org.apache.webbeans.reservation.entity.Reservation;
@@ -44,7 +44,7 @@
{
private @Inject @ApplicationLog Log logger;
- private @Inject @Default EntityManager entityManager;
+ private @Inject @EntityManagerQualifier EntityManager entityManager;
@Transactional
public void createNewHotel(String name, int star, String city, String country)
Modified: openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java?rev=909951&r1=909950&r2=909951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java (original)
+++ openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/controller/user/UserController.java Sun Feb 14 02:05:08 2010
@@ -24,13 +24,13 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
import javax.faces.model.SelectItem;
import javax.inject.Inject;
import javax.persistence.EntityManager;
import org.apache.commons.logging.Log;
import org.apache.webbeans.reservation.bindings.ApplicationLog;
+import org.apache.webbeans.reservation.bindings.EntityManagerQualifier;
import org.apache.webbeans.reservation.bindings.intercep.Transactional;
import org.apache.webbeans.reservation.entity.Hotel;
import org.apache.webbeans.reservation.entity.Reservation;
@@ -40,7 +40,7 @@
@RequestScoped
public class UserController
{
- private @Inject @Default EntityManager entityManager;
+ private @Inject @EntityManagerQualifier EntityManager entityManager;
private @Inject @ApplicationLog Log logger;
Modified: openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java?rev=909951&r1=909950&r2=909951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java (original)
+++ openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/intercept/TransactionalInterceptor.java Sun Feb 14 02:05:08 2010
@@ -16,7 +16,6 @@
*/
package org.apache.webbeans.reservation.intercept;
-import javax.enterprise.inject.Default;
import javax.inject.Inject;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
@@ -26,13 +25,14 @@
import org.apache.commons.logging.Log;
import org.apache.webbeans.reservation.bindings.ApplicationLog;
+import org.apache.webbeans.reservation.bindings.EntityManagerQualifier;
import org.apache.webbeans.reservation.bindings.intercep.Transactional;
@Interceptor
@Transactional
public class TransactionalInterceptor
{
- private @Inject @Default EntityManager entityManager;
+ private @Inject @EntityManagerQualifier EntityManager entityManager;
private @Inject @ApplicationLog Log logger;
Modified: openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/EntityManagerUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/EntityManagerUtil.java?rev=909951&r1=909950&r2=909951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/EntityManagerUtil.java (original)
+++ openwebbeans/trunk/samples/reservation/src/main/java/org/apache/webbeans/reservation/util/EntityManagerUtil.java Sun Feb 14 02:05:08 2010
@@ -17,7 +17,6 @@
package org.apache.webbeans.reservation.util;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Default;
import javax.enterprise.inject.Disposes;
import javax.enterprise.inject.Produces;
import javax.persistence.EntityManager;
@@ -26,20 +25,20 @@
@RequestScoped
public class EntityManagerUtil
{
- private @PersistenceContext(unitName="reservation") EntityManager entityManager;
+ private @Produces @PersistenceContext(unitName="reservation") EntityManager entityManager;
public EntityManagerUtil()
{
}
- @Produces @RequestScoped @Default
+ @Produces @RequestScoped @org.apache.webbeans.reservation.bindings.EntityManagerQualifier
public EntityManager createEntityManager()
{
return entityManager;
}
- public void dispose(@Disposes @Default EntityManager entityManager)
+ public void dispose(@Disposes @org.apache.webbeans.reservation.bindings.EntityManagerQualifier EntityManager entityManager)
{
entityManager.close();
}
Modified: openwebbeans/trunk/samples/standalone-sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/standalone-sample/pom.xml?rev=909951&r1=909950&r2=909951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/standalone-sample/pom.xml (original)
+++ openwebbeans/trunk/samples/standalone-sample/pom.xml Sun Feb 14 02:05:08 2010
@@ -32,18 +32,13 @@
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_1.0_spec</artifactId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
</dependency>
<dependency>