svn commit: r1145432 - /geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java

[dj...@apache.org]

Author: djencks
Date: Tue Jul 12 02:26:20 2011
New Revision: 1145432

URL: http://svn.apache.org/viewvc?rev=1145432&view=rev
Log:
Get the injection holder from the known location in shared context rather than trying to fish it out of a gbean

Modified:
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java?rev=1145432&r1=1145431&r2=1145432&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java Tue Jul 12 02:26:20 2011
@@ -37,6 +37,7 @@ import org.apache.geronimo.gbean.GBeanIn
 import org.apache.geronimo.j2ee.annotation.Holder;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
+import org.apache.geronimo.j2ee.deployment.NamingBuilder;
 import org.apache.geronimo.j2ee.deployment.WebModule;
 import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
 import org.apache.geronimo.jaxws.JAXWSEJBApplicationContext;
@@ -276,8 +277,7 @@ public abstract class JAXWSServiceBuilde
         try {
             //TODO Now we share the same DeploymentContext in the ear package, which means all the gbeans are saved in the one EARContext
             //Might need to update while we have real EAR support
-            GBeanData moduleGBean = context.getGBeanInstance(module.getModuleName());
-            moduleHolder = (Holder) moduleGBean.getAttribute("holder");
+            moduleHolder = (Holder) module.getSharedContext().get(NamingBuilder.INJECTION_KEY);
             GBeanData contextSourceGBean = context.getGBeanInstance(context.getNaming().createChildName(module.getModuleName(), "ContextSource", "ContextSource"));
             componentContext = (Map) contextSourceGBean.getAttribute("componentContext");
         } catch (GBeanNotFoundException e) {