openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r907619 - in /openwebbeans/trunk/webbeans-resource: pom.xml src/main/java/org/apache/webbeans/resource/OpenWebBeansResourcePlugin.java
Date Mon, 08 Feb 2010 11:04:54 GMT
Author: struberg
Date: Mon Feb  8 11:04:53 2010
New Revision: 907619

URL: http://svn.apache.org/viewvc?rev=907619&view=rev
Log:
OWB-270 remove EJB dependency from openwebbeans-resource

Modified:
    openwebbeans/trunk/webbeans-resource/pom.xml
    openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/OpenWebBeansResourcePlugin.java

Modified: openwebbeans/trunk/webbeans-resource/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-resource/pom.xml?rev=907619&r1=907618&r2=907619&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-resource/pom.xml (original)
+++ openwebbeans/trunk/webbeans-resource/pom.xml Mon Feb  8 11:04:53 2010
@@ -1,70 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-	<!--
+<!--
+ 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
 
-		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.
-	-->
+ 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.
+-->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.openwebbeans</groupId>
-		<artifactId>openwebbeans</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>openwebbeans-resource</artifactId>
-	<name>Apache OpenWebBeans :: Resource Integration</name>
-	<packaging>jar</packaging>
-	<description>OpenWebBeans Resource Integration</description>
-	<dependencies>
-                <dependency>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-                        <scope>provided</scope>
-                </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>
-		    <scope>test</scope>
-		</dependency>
-		
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.openwebbeans</groupId>
+        <artifactId>openwebbeans</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>openwebbeans-resource</artifactId>
+    <name>Apache OpenWebBeans :: Resource Integration</name>
+    <packaging>jar</packaging>
+    <description>OpenWebBeans Resource Integration</description>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <scope>provided</scope>
+        </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>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <optional>true</optional>
         </dependency>
-		
-		
-        <dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<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>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
         </dependency>
-		
-	</dependencies>
+    </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=907619&r1=907618&r2=907619&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
Mon Feb  8 11:04:53 2010
@@ -18,7 +18,6 @@
 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;
@@ -40,8 +39,7 @@
         if (annotationClass.equals(Resource.class) || 
                 annotationClass.equals(WebServiceRef.class) || 
                 annotationClass.equals(PersistenceUnit.class) || 
-                annotationClass.equals(PersistenceContext.class) ||
-                annotationClass.equals(EJB.class))
+                annotationClass.equals(PersistenceContext.class))
         {
             return true;
         }



Mime
View raw message