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

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

Author: jaikiran
Date: 2010-08-31 09:09:27 -0400 (Tue, 31 Aug 2010)
New Revision: 107914

Modified:
   trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
Log:
JBAS-6795 JBCTS-911 Added dependencies on PersistenceContext references in a web deployment

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-31 11:41:48 UTC (rev 107913)
+++ trunk/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java	2010-08-31 13:09:27 UTC (rev 107914)
@@ -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.PersistenceContextReferenceMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceContextReferencesMetaData;
 import org.jboss.metadata.javaee.spec.PersistenceUnitReferenceMetaData;
 import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
 import org.jboss.metadata.web.jboss.ClassLoadingMetaData;
@@ -70,7 +72,6 @@
 import org.jboss.system.metadata.ServiceDependencyMetaData;
 import org.jboss.system.metadata.ServiceInjectionValueMetaData;
 import org.jboss.system.metadata.ServiceMetaData;
-import org.jboss.util.file.Files;
 import org.jboss.vfs.VFS;
 import org.jboss.vfs.VFSUtils;
 import org.jboss.vfs.VirtualFile;
@@ -708,19 +709,35 @@
             }
          }
 
-         PersistenceUnitReferencesMetaData refs = metaData.getPersistenceUnitRefs();
-         if (refs != null)
+         // JBAS-6795 Add dependency on PersistenceUnit references
+         PersistenceUnitReferencesMetaData puRefs = metaData.getPersistenceUnitRefs();
+         if (puRefs != null)
          {
-            for (PersistenceUnitReferenceMetaData ref : metaData.getPersistenceUnitRefs())
+            for (PersistenceUnitReferenceMetaData puRef : metaData.getPersistenceUnitRefs())
             {
                // TODO: this is a duplication of the logic in PersistenceUnitHandler
-               String unitName = ref.getPersistenceUnitName();
-               String beanName = persistenceUnitDependencyResolver.resolvePersistenceUnitSupplier(unit, unitName);
+               String persistenceUnitName = puRef.getPersistenceUnitName();
+               String beanName = persistenceUnitDependencyResolver.resolvePersistenceUnitSupplier(unit, persistenceUnitName);
                ServiceDependencyMetaData sdmd = new ServiceDependencyMetaData();
                sdmd.setIDependOn(beanName);
                dependencies.add(sdmd);
             }
          }
+         
+         // JBAS-6795 Add dependency on PersistenceContext references
+         PersistenceContextReferencesMetaData pcRefs = metaData.getPersistenceContextRefs();
+         if (pcRefs != null)
+         {
+            for (PersistenceContextReferenceMetaData pcRef : metaData.getPersistenceContextRefs())
+            {
+               // TODO: this is a duplication of the logic in PersistenceContextHandler
+               String persistenceUnitName = pcRef.getPersistenceUnitName();
+               String beanName = persistenceUnitDependencyResolver.resolvePersistenceUnitSupplier(unit, persistenceUnitName);
+               ServiceDependencyMetaData sdmd = new ServiceDependencyMetaData();
+               sdmd.setIDependOn(beanName);
+               dependencies.add(sdmd);
+            }
+         }
 
          webModule.setDependencies(dependencies);