geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1081246 - in /geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans: GeronimoResourceInjectionService.java GeronimoWebBeansPlugin.java OsgiMetaDataScannerService.java
Date Mon, 14 Mar 2011 02:15:32 GMT
Author: genspring
Date: Mon Mar 14 02:15:31 2011
New Revision: 1081246

URL: http://svn.apache.org/viewvc?rev=1081246&view=rev
Log:
fixing compile error caused by owb interface changes.

Modified:
    geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoResourceInjectionService.java
    geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoWebBeansPlugin.java
    geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java

Modified: geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoResourceInjectionService.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoResourceInjectionService.java?rev=1081246&r1=1081245&r2=1081246&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoResourceInjectionService.java
(original)
+++ geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoResourceInjectionService.java
Mon Mar 14 02:15:31 2011
@@ -29,7 +29,6 @@ import java.lang.reflect.Modifier;
 
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.Bean;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -57,7 +56,7 @@ public class GeronimoResourceInjectionSe
 
     //from StandaloneResourceInjectionService
     @Override
-    public void injectJavaEEResources(Object managedBeanInstance) throws Exception {
+    public void injectJavaEEResources(Object managedBeanInstance) {
         Class<?> currentClass = managedBeanInstance.getClass();
 
         while (currentClass != null && Object.class != currentClass)

Modified: geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoWebBeansPlugin.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoWebBeansPlugin.java?rev=1081246&r1=1081245&r2=1081246&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoWebBeansPlugin.java
(original)
+++ geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/GeronimoWebBeansPlugin.java
Mon Mar 14 02:15:31 2011
@@ -41,10 +41,10 @@ import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 import javax.transaction.UserTransaction;
 
+import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.spi.SecurityService;
 import org.apache.webbeans.spi.TransactionService;
 import org.apache.webbeans.spi.plugins.AbstractOwbPlugin;
-import org.apache.webbeans.spi.plugins.OpenWebBeansEjbPlugin;
 import org.apache.webbeans.spi.plugins.OpenWebBeansJavaEEPlugin;
 
 public class GeronimoWebBeansPlugin 
@@ -85,7 +85,7 @@ public class GeronimoWebBeansPlugin 
     }
 
     @Override
-    public void isManagedBean(Class<?> clazz) throws Exception {
+    public void isManagedBean(Class<?> clazz) {
         if(Servlet.class.isAssignableFrom(clazz) ||
                 Filter.class.isAssignableFrom(clazz) ||
                 ServletContextListener.class.isAssignableFrom(clazz) ||
@@ -98,7 +98,7 @@ public class GeronimoWebBeansPlugin 
                 ServletRequestAttributeListener.class.isAssignableFrom(clazz) ||
                 AsyncListener.class.isAssignableFrom(clazz) )
         {
-            throw new Exception("Given class  : " + clazz.getName() + " is not managed bean");
+            throw new WebBeansConfigurationException("Given class  : " + clazz.getName()
+ " is not managed bean");
         }
     }
 

Modified: geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java?rev=1081246&r1=1081245&r2=1081246&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java
(original)
+++ geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java
Mon Mar 14 02:15:31 2011
@@ -20,6 +20,7 @@ package org.apache.geronimo.openwebbeans
 
 import java.io.InputStream;
 import java.net.URL;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Set;
@@ -74,6 +75,10 @@ public class OsgiMetaDataScannerService 
     }
 
     @Override
+    public Set<String> getAllAnnotations(String className) {
+        return Collections.EMPTY_SET;
+    }
+    @Override
     public void init(Object object)
     {
         // set per BDA beans.xml flag here because setting it in constructor



Mime
View raw message