[jboss-cvs] JBossAS SVN: r107864 - trunk/server/src/main/java/org/jboss/web/deployers.

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

Author: wolfc
Date: 2010-08-27 15:03:59 -0400 (Fri, 27 Aug 2010)
New Revision: 107864

Modified:
   trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
Log:
JBAS-6795: emuckenhuber's patch for adding PU dependencies


Modified: trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java	2010-08-27 18:27:16 UTC (rev 107863)
+++ trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java	2010-08-27 19:03:59 UTC (rev 107864)
@@ -58,6 +58,8 @@
 import org.jboss.metadata.ear.jboss.JBossAppMetaData;
 import org.jboss.metadata.ear.spec.ModuleMetaData;
 import org.jboss.metadata.ear.spec.WebModuleMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceUnitReferenceMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
 import org.jboss.metadata.web.jboss.ClassLoadingMetaData;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.metadata.web.spec.WebMetaData;
@@ -705,6 +707,21 @@
                dependencies.add(sdmd);
             }
          }
+
+         PersistenceUnitReferencesMetaData refs = metaData.getPersistenceUnitRefs();
+         if (refs != null)
+         {
+            for (PersistenceUnitReferenceMetaData ref : metaData.getPersistenceUnitRefs())
+            {
+               // TODO: this is a duplication of the logic in PersistenceUnitHandler
+               String unitName = ref.getPersistenceUnitName();
+               String beanName = persistenceUnitDependencyResolver.resolvePersistenceUnitSupplier(unit, unitName);
+               ServiceDependencyMetaData sdmd = new ServiceDependencyMetaData();
+               sdmd.setIDependOn(beanName);
+               dependencies.add(sdmd);
+            }
+         }
+
          webModule.setDependencies(dependencies);
 
          // Here's where a bit of magic happens. By attaching the ServiceMetaData