[jboss-cvs] JBossAS SVN: r75260 - in projects/jpa/trunk/deployers/src: test/resources/org/jboss/jpa/deployers/test/deployment/pu/META-INF and 1 other directory.

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

Author: alesj
Date: 2008-07-01 08:33:56 -0400 (Tue, 01 Jul 2008)
New Revision: 75260

Modified:
   projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceUnitDeployer.java
   projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/deployment/pu/META-INF/persistence.xml
Log:
Fix Carlo's broken test.

Modified: projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceUnitDeployer.java
===================================================================
--- projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceUnitDeployer.java	2008-07-01 12:29:17 UTC (rev 75259)
+++ projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceUnitDeployer.java	2008-07-01 12:33:56 UTC (rev 75260)
@@ -23,10 +23,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.naming.InitialContext;
 
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.deployers.spi.DeploymentException;
@@ -49,10 +47,7 @@
    public PersistenceUnitDeployer()
    {
       super(PersistenceUnitMetaData.class);
-      
-      // We want to process the components created by PersistenceDeployer, this seems to be the only way to get there.
       setComponentsOnly(true);
-      
       addOutput(BeanMetaData.class);
    }
 
@@ -71,8 +66,7 @@
       PersistenceUnitDeployment pu = new PersistenceUnitDeployment(initialContext, persistenceDeployment, explicitEntityClasses, metaData, ear, jar, isScoped, deploymentUnit);
       
       String name = "ToDo";
-      AbstractBeanMetaData beanMetaData = new AbstractBeanMetaData(name, PersistenceUnitDeployment.class.getName());
-      BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(beanMetaData);
+      BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(name, PersistenceUnitDeployment.class.getName());
       builder.setConstructorValue(pu);
       
       unit.addAttachment(BeanMetaData.class, builder.getBeanMetaData());

Modified: projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/deployment/pu/META-INF/persistence.xml
===================================================================
--- projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/deployment/pu/META-INF/persistence.xml	2008-07-01 12:29:17 UTC (rev 75259)
+++ projects/jpa/trunk/deployers/src/test/resources/org/jboss/jpa/deployers/test/deployment/pu/META-INF/persistence.xml	2008-07-01 12:33:56 UTC (rev 75260)
@@ -3,7 +3,7 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
    version="1.0">
-   <persistence-unit name="dummy">
+   <persistence-unit name="ToDo">
       <jta-data-source>java:/DefaultDS</jta-data-source>
       <properties>
           <property name="hibernate.hbm2ddl.auto" value="create-drop"/>