geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1148616 - /geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
Date Wed, 20 Jul 2011 03:40:52 GMT
Author: xuhaihong
Date: Wed Jul 20 03:40:51 2011
New Revision: 1148616

URL: http://svn.apache.org/viewvc?rev=1148616&view=rev
Log:
Update a variable name and reset the original classfinder

Modified:
    geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java

Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java?rev=1148616&r1=1148615&r2=1148616&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
(original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
Wed Jul 20 03:40:51 2011
@@ -18,9 +18,7 @@
 package org.apache.geronimo.openwebbeans.deployment;
 
 import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
 import java.lang.reflect.Member;
-import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -55,6 +53,7 @@ import org.apache.geronimo.kernel.reposi
 import org.apache.geronimo.openejb.cdi.WebBeansConfigurationListener;
 import org.apache.geronimo.web.info.WebAppInfo;
 import org.apache.openejb.jee.WebApp;
+import org.apache.xbean.finder.AbstractFinder;
 import org.apache.xbean.finder.BundleAnnotationFinder;
 import org.apache.xbean.finder.ClassFinder;
 import org.apache.xbean.osgi.bundle.util.DiscoveryRange;
@@ -156,12 +155,14 @@ public class OpenWebBeansModuleBuilderEx
         buildingContext.put(NamingBuilder.INJECTION_KEY, holder);
 
         WebApp webApp = webModule.getSpecDD();
-        XmlObject jettyWebApp = webModule.getVendorDD();
+        XmlObject geronimoWebApp = webModule.getVendorDD();
 
+        AbstractFinder originalFinder = webModule.getClassFinder();
         ClassFinder classFinder = createOpenWebBeansClassFinder(webApp, webModule);
         webModule.setClassFinder(classFinder);
-
-        namingBuilders.buildNaming(webApp, jettyWebApp, webModule, buildingContext);
+        namingBuilders.buildNaming(webApp, geronimoWebApp, webModule, buildingContext);
+        webModule.setClassFinder(originalFinder);
+        
 
 //        AbstractName webBeansGBeanName = moduleContext.getNaming().createChildName(moduleName,
"webbeans-lifecycle", "webbeans");
 //        GBeanData providerData = new GBeanData(webBeansGBeanName, OpenWebBeansGBean.class);



Mime
View raw message