svn commit: r982753 - /geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java

[dj...@apache.org]

Author: djencks
Date: Thu Aug  5 19:55:24 2010
New Revision: 982753

URL: http://svn.apache.org/viewvc?rev=982753&view=rev
Log:
add some logging and always install the dependencies on other components in the module

Modified:
    geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java?rev=982753&r1=982752&r2=982753&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java Thu Aug  5 19:55:24 2010
@@ -242,6 +242,7 @@ public abstract class AbstractWebModuleB
     }
 
     protected void addGBeanDependencies(EARContext earContext, GBeanData webModuleData) {
+        log.debug("Adding dependencies to web module: " + webModuleData.getAbstractName());
         Configuration earConfiguration = earContext.getConfiguration();
         addDependencies(earContext.findGBeanDatas(earConfiguration, MANAGED_CONNECTION_FACTORY_PATTERN), webModuleData);
         addDependencies(earContext.findGBeanDatas(earConfiguration, ADMIN_OBJECT_PATTERN), webModuleData);
@@ -257,6 +258,7 @@ public abstract class AbstractWebModuleB
         for (GBeanData dependency : dependencies) {
             AbstractName dependencyName = dependency.getAbstractName();
             webModuleData.addDependency(dependencyName);
+            log.debug("Dependency on " + dependencyName);
         }
     }
 
@@ -696,9 +698,7 @@ public abstract class AbstractWebModuleB
         //Add dependencies on managed connection factories and ejbs in this app
         //This is overkill, but allows for people not using java:comp context (even though we don't support it)
         //and sidesteps the problem of circular references between ejbs.
-        if (earContext != moduleContext) {
-            addGBeanDependencies(earContext, webModuleData);
-        }
+        addGBeanDependencies(earContext, webModuleData);
         webModuleData.setReferencePattern("TransactionManager", moduleContext.getTransactionManagerName());
         webModuleData.setReferencePattern("TrackedConnectionAssociator", moduleContext.getConnectionTrackerName());
         webModuleData.setAttribute("modulePath", webModule.isStandAlone() || webModule.getEarContext() != webModule.getRootEarContext() ? null : webModule.getTargetPath());