[jboss-cvs] JBossAS SVN: r80588 - projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers.

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

Author: alesj
Date: 2008-11-06 08:48:59 -0500 (Thu, 06 Nov 2008)
New Revision: 80588

Modified:
   projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceDeployer.java
Log:
[JBAS-6165]; change how we name PUMD component, as it conflicts with BMD in PUDeployer.
Remove obsolete code.

Modified: projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceDeployer.java
===================================================================
--- projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceDeployer.java	2008-11-06 13:04:59 UTC (rev 80587)
+++ projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceDeployer.java	2008-11-06 13:48:59 UTC (rev 80588)
@@ -21,27 +21,24 @@
  */
 package org.jboss.jpa.deployers;
 
-import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 
-import org.jboss.beans.metadata.api.annotations.Inject;
 import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.jpa.resolvers.PersistenceUnitDependencyResolver;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.jpa.spec.PersistenceMetaData;
 import org.jboss.metadata.jpa.spec.PersistenceUnitMetaData;
 
 /**
  * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  * @version $Revision: $
  */
 public class PersistenceDeployer extends AbstractComponentDeployer<PersistenceMetaData, PersistenceUnitMetaData>
 {
    private static final Logger log = Logger.getLogger(PersistenceDeployer.class);
    
-   private PersistenceUnitDependencyResolver persistenceUnitDependencyResolver;
-   
    public PersistenceDeployer()
    {
       //setComponentVisitor(new PersistenceUnitDeploymentVisitor());
@@ -68,33 +65,12 @@
       @Override
       protected String getName(DeploymentUnit unit, PersistenceUnitMetaData component)
       {
-         return persistenceUnitDependencyResolver.createBeanName(unit, component.getName());
+         // we should be OK with this name, as I don't expect multiple PUMDs with same name on same DU?
+         String pumdName = component.getName();
+         if (pumdName == null)
+            pumdName = UUID.randomUUID().toString();
+         
+         return PersistenceUnitMetaData.class.getName() + "." + pumdName;
       }
    }
-   
-   private class PersistenceUnitDeploymentVisitor extends AbstractDeploymentVisitor<PersistenceUnitMetaData, PersistenceUnitMetaData>
-   {
-      public Class<PersistenceUnitMetaData> getVisitorType()
-      {
-         return PersistenceUnitMetaData.class;
-      }
-
-      @Override
-      protected List<PersistenceUnitMetaData> getComponents(PersistenceUnitMetaData deployment)
-      {
-         return Collections.singletonList(deployment);
-      }
-
-      @Override
-      protected String getName(DeploymentUnit unit, PersistenceUnitMetaData component)
-      {
-         return persistenceUnitDependencyResolver.createBeanName(unit, component.getName());
-      }
-   }
-   
-   @Inject
-   public void setPersistenceUnitDependencyResolver(PersistenceUnitDependencyResolver resolver)
-   {
-      this.persistenceUnitDependencyResolver = resolver;
-   }
 }