[jboss-cvs] JBossAS SVN: r65039 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2007-09-04 08:26:08 -0400 (Tue, 04 Sep 2007)
New Revision: 65039

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
Log:
- JBCTS-643: Initialize metadata before processing web services references.
- injectionContainer.getEnvironmentRefGroup() returns the webDD field, which is only initialized in the processMetadata() method.

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-09-04 11:42:17 UTC (rev 65038)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2007-09-04 12:26:08 UTC (rev 65039)
@@ -482,6 +482,11 @@
                log.debug("linkSecurityDomain");
                linkSecurityDomain(securityDomain, envCtx);
 
+               // we need to do this because the classloader is initialize by the web container and
+               // the injection container needs the classloader so that it can build up Injectors and ENC populators
+               injectionContainer.setClassLoader(webLoader.getClassLoader());
+               injectionContainer.processMetadata();
+
                // Bind <service-ref> elements
                UnifiedVirtualFile vfsRoot = new VirtualFileAdaptor(unit.getRoot());
                EnvironmentRefGroup envRefGroup = injectionContainer.getEnvironmentRefGroup();
@@ -505,10 +510,6 @@
             }
 
             log.debug("injectionContainer enabled and processing beginning");
-            // we need to do this because the classloader is initialize by the web container and
-            // the injection container needs the classloader so that it can build up Injectors and ENC populators
-            injectionContainer.setClassLoader(webLoader.getClassLoader());
-            injectionContainer.processMetadata();
 
          }
       }