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/01/30 01:07:16 UTC

svn commit: r904682 - in /openwebbeans/trunk/webbeans-resource: ./ src/main/java/org/apache/webbeans/resource/ src/main/java/org/apache/webbeans/resource/spi/ src/main/java/org/apache/webbeans/resource/spi/se/

Author: gerdogdu
Date: Sat Jan 30 00:07:15 2010
New Revision: 904682

URL: http://svn.apache.org/viewvc?rev=904682&view=rev
Log:
Update for reflecting SPI module

Removed:
    openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/ResourceService.java
Modified:
    openwebbeans/trunk/webbeans-resource/pom.xml
    openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/OpenWebBeansResourcePlugin.java
    openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/ResourceServiceImpl.java

Modified: openwebbeans/trunk/webbeans-resource/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-resource/pom.xml?rev=904682&r1=904681&r2=904682&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-resource/pom.xml (original)
+++ openwebbeans/trunk/webbeans-resource/pom.xml Sat Jan 30 00:07:15 2010
@@ -59,6 +59,12 @@
 			<version>4.5</version>
 			<scope>test</scope>
 		</dependency>
+        <dependency>
+        	<groupId>org.apache.geronimo.specs</groupId>
+        	<artifactId>geronimo-ejb_3.1_spec</artifactId>
+        	<version>1.0.0-SNAPSHOT</version>
+        	<optional>true</optional>
+        </dependency>
 		
 	</dependencies>
 </project>

Modified: openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/OpenWebBeansResourcePlugin.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/OpenWebBeansResourcePlugin.java?rev=904682&r1=904681&r2=904682&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/OpenWebBeansResourcePlugin.java (original)
+++ openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/OpenWebBeansResourcePlugin.java Sat Jan 30 00:07:15 2010
@@ -18,6 +18,7 @@
 import java.lang.reflect.Type;
 
 import javax.annotation.Resource;
+import javax.ejb.EJB;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceContext;
@@ -27,7 +28,7 @@
 
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.plugins.AbstractOpenWebBeansPlugin;
-import org.apache.webbeans.resource.spi.ResourceService;
+import org.apache.webbeans.spi.ResourceService;
 import org.apache.webbeans.spi.ServiceLoader;
 
 public class OpenWebBeansResourcePlugin extends AbstractOpenWebBeansPlugin implements org.apache.webbeans.plugins.OpenWebBeansResourcePlugin
@@ -39,7 +40,8 @@
         if (annotationClass.equals(Resource.class) || 
                 annotationClass.equals(WebServiceRef.class) || 
                 annotationClass.equals(PersistenceUnit.class) || 
-                annotationClass.equals(PersistenceContext.class))
+                annotationClass.equals(PersistenceContext.class) ||
+                annotationClass.equals(EJB.class))
         {
             return true;
         }

Modified: openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/ResourceServiceImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/ResourceServiceImpl.java?rev=904682&r1=904681&r2=904682&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/ResourceServiceImpl.java (original)
+++ openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/ResourceServiceImpl.java Sat Jan 30 00:07:15 2010
@@ -28,7 +28,7 @@
 import org.apache.webbeans.config.OWBLogConst;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.logger.WebBeansLogger;
-import org.apache.webbeans.resource.spi.ResourceService;
+import org.apache.webbeans.spi.ResourceService;
 
 public class ResourceServiceImpl implements ResourceService
 {