[jboss-cvs] JBossAS SVN: r77426 - trunk/ejb3/src/main/org/jboss/ejb3/deployers.

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

Author: wolfc
Date: 2008-08-25 08:22:43 -0400 (Mon, 25 Aug 2008)
New Revision: 77426

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java
Log:
JBCTS-800: reverted workaround

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java	2008-08-25 12:06:27 UTC (rev 77425)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossASKernel.java	2008-08-25 12:22:43 UTC (rev 77426)
@@ -38,7 +38,6 @@
 import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
 import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
 import org.jboss.beans.metadata.plugins.AbstractDemandMetaData;
-import org.jboss.beans.metadata.plugins.AbstractSupplyMetaData;
 import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
 import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
 import org.jboss.beans.metadata.spi.DemandMetaData;
@@ -106,28 +105,12 @@
       }
 
       // Create the metadata for the bean to install
-      // Hack for JBCTS-800
-      String extraSupplyName = null;
-      if(name.startsWith("persistence.units:"))
-      {
-         if(name.startsWith("persistence.units:unitName=") == false)
-         {
-            // Build the simple persistence.units:unitName=xxx as a supplies
-            int unitName = name.indexOf("unitName=");
-            if(unitName > 0)
-            {
-               extraSupplyName = "persistence.units:" + name.substring(unitName);
-            }
-         }
-      }
-      MCDependencyPolicy policy = (MCDependencyPolicy) dependencies;
       AbstractBeanMetaData bean = new AbstractBeanMetaData(name, service.getClass().getName());
       bean.setConstructor(new AlreadyInstantiated(service));
+      MCDependencyPolicy policy = (MCDependencyPolicy) dependencies;
       bean.setDepends(policy.getDependencies());
       bean.setDemands(policy.getDemands());
       bean.setSupplies(policy.getSupplies());
-      if(extraSupplyName != null)
-         bean.getSupplies().add(new AbstractSupplyMetaData(extraSupplyName));
       log.info("installing bean: " + name);
       log.info("  with dependencies:");
       for (Object obj : policy.getDependencies())