[jboss-cvs] JBossAS SVN: r62799 - in trunk: server/src/main/org/jboss/metamodel/descriptor and 1 other directory.

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

Author: bdecoste
Date: 2007-05-03 20:45:31 -0400 (Thu, 03 May 2007)
New Revision: 62799

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java
   trunk/server/src/main/org/jboss/metamodel/descriptor/PersistenceUnitRef.java
Log:
allow for "" persistence unit name

Modified: trunk/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java	2007-05-03 21:11:12 UTC (rev 62798)
+++ trunk/ejb3/src/main/org/jboss/ejb3/entity/PersistenceUnitDeployment.java	2007-05-04 00:45:31 UTC (rev 62799)
@@ -70,8 +70,12 @@
       xml = metadata;
       kernelName = "persistence.units:";
       String name = getEntityManagerName();
-      if (name == null || name.equals(""))
-         throw new RuntimeException("Empty string is not allowed for a persistence unit.  Fix your persistence.xml file");
+      if (name == null)
+         throw new RuntimeException("Null string is not allowed for a persistence unit name.  Fix your persistence.xml file");
+      
+      if (name.length() == 0)
+         xml.setName(name);
+      
       if (ear != null)
       {
          kernelName += "ear=" + ear;

Modified: trunk/server/src/main/org/jboss/metamodel/descriptor/PersistenceUnitRef.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/PersistenceUnitRef.java	2007-05-03 21:11:12 UTC (rev 62798)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/PersistenceUnitRef.java	2007-05-04 00:45:31 UTC (rev 62799)
@@ -32,7 +32,7 @@
 public class PersistenceUnitRef extends Ref
 {
    private String refName;
-   private String unitName;
+   private String unitName = "";
 
    public String getRefName()
    {