[jboss-cvs] JBossAS SVN: r58337 - in trunk/server/src/main/org/jboss: deployment metadata

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

Author: alex.loubyansky at jboss.com
Date: 2006-11-14 09:01:10 -0500 (Tue, 14 Nov 2006)
New Revision: 58337

Modified:
   trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
   trunk/server/src/main/org/jboss/metadata/RelationMetaData.java
Log:
set the default relation-name if one is missing from the ejb-jar.xml

Modified: trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java	2006-11-14 13:49:55 UTC (rev 58336)
+++ trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java	2006-11-14 14:01:10 UTC (rev 58337)
@@ -340,6 +340,10 @@
    public void addChild(ApplicationMetaData parent, RelationMetaData relation,
          UnmarshallingContext navigator, String namespaceURI, String localName)
    {
+      if(relation.getRelationName() == null)
+      {
+         relation.setDefaultRelationName();         
+      }
       parent.addRelationship(relation);
    }
 

Modified: trunk/server/src/main/org/jboss/metadata/RelationMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/RelationMetaData.java	2006-11-14 13:49:55 UTC (rev 58336)
+++ trunk/server/src/main/org/jboss/metadata/RelationMetaData.java	2006-11-14 14:01:10 UTC (rev 58337)
@@ -179,13 +179,7 @@
       {
          // generate unique name, we can't rely on ejb-relationship-role-name
          // being unique
-         relationName = left.getEntityName()
-               + (left.getCMRFieldName() == null ? "" : "_"
-                     + left.getCMRFieldName())
-               + "-"
-               + right.getEntityName()
-               + (right.getCMRFieldName() == null ? "" : "_"
-                     + right.getCMRFieldName());
+         setDefaultRelationName();
       }
 
       // assure that the left role and right role do not have the same name
@@ -212,4 +206,15 @@
                + "multiplicity One");
       }
    }
+
+   public void setDefaultRelationName()
+   {
+      relationName = left.getEntityName()
+            + (left.getCMRFieldName() == null ? "" : "_"
+                  + left.getCMRFieldName())
+            + "-"
+            + right.getEntityName()
+            + (right.getCMRFieldName() == null ? "" : "_"
+                  + right.getCMRFieldName());
+   }
 }