geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r498000 - /geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Date Fri, 19 Jan 2007 23:15:48 GMT
Author: djencks
Date: Fri Jan 19 15:15:48 2007
New Revision: 498000

URL: http://svn.apache.org/viewvc?view=rev&rev=498000
Log:
GERONIMO-2756 basic @Resource injection for cxf web services.  Missed in first commit, make
component context available to web service builder in tomcat

Modified:
    geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?view=diff&rev=498000&r1=497999&r2=498000
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Fri Jan 19 15:15:48 2007
@@ -286,6 +286,7 @@
 
         GBeanData webModuleData = new GBeanData(moduleName, TomcatWebAppContext.GBEAN_INFO);
         try {
+            moduleContext.addGBean(webModuleData);
             webModuleData.setReferencePattern("J2EEServer", moduleContext.getServerName());
             if (!module.isStandAlone()) {
                 webModuleData.setReferencePattern("J2EEApplication", earContext.getModuleName());
@@ -451,8 +452,6 @@
 
                 webModuleData.setAttribute("securityHolder", securityHolder);
             }
-
-            moduleContext.addGBean(webModuleData);
 
             if (!module.isStandAlone()) {
                 ConfigurationData moduleConfigurationData = moduleContext.getConfigurationData();



Mime
View raw message