[jboss-cvs] JBossAS SVN: r63748 - in trunk/ejb3/src/main/org/jboss/ejb3: deployers and 1 other directory.

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

Author: wolfc
Date: 2007-06-29 12:00:09 -0400 (Fri, 29 Jun 2007)
New Revision: 63748

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
Log:
Using DeploymentUnit simple name instead of name

Modified: trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java	2007-06-29 15:14:53 UTC (rev 63747)
+++ trunk/ejb3/src/main/org/jboss/ejb3/clientmodule/ClientENCInjectionContainer.java	2007-06-29 16:00:09 UTC (rev 63748)
@@ -145,7 +145,7 @@
          this.deploymentScope = new JBoss5DeploymentScope(unit.getParent());
       }
 
-      ejbResolver = new ClientEjbResolver(deploymentScope, unit.getName());
+      ejbResolver = new ClientEjbResolver(deploymentScope, unit.getSimpleName());
       messageDestinationResolver = new MessageDestinationResolver(deploymentScope, xml.getMessageDestinations());
 
       String on = Ejb3Module.BASE_EJB3_JMX_NAME + createScopeKernelName(unit, deploymentScope) + ",name=" + applicationClientName;
@@ -156,7 +156,7 @@
       catch(MalformedObjectNameException e)
       {
          // should not happen
-         throw new RuntimeException(e);
+         throw new RuntimeException("Malformed object name " + on, e);
       }
 
       processMetaData();

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2007-06-29 15:14:53 UTC (rev 63747)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2007-06-29 16:00:09 UTC (rev 63748)
@@ -130,7 +130,7 @@
             log.trace("EJBRegistrationDeployer suffix not allowed: " + jar.getName());
             return;
          }
-         log.debug("********* EJBRegistrationDepoyer Begin Unit: " + unit.getName() + " jar: " + jar.getName());
+         log.debug("********* EJBRegistrationDepoyer Begin Unit: " + unit.getSimpleName() + " jar: " + jar.getName());
          VirtualFile ejbjar = unit.getMetaDataFile("ejb-jar.xml");
          if (ejbjar != null)
          {
@@ -141,7 +141,7 @@
          }
          DeploymentScope scope = null;
          VFSDeploymentUnit parent = unit.getParent();
-         if (parent != null && parent.getName().endsWith(".ear")) // todo should look for metadata instead of ".ear"
+         if (parent != null && parent.getSimpleName().endsWith(".ear")) // todo should look for metadata instead of ".ear"
          {
             scope = parent.getAttachment(DeploymentScope.class);
             if (scope == null)
@@ -158,7 +158,7 @@
          deployment.create();
          if (deployment.getEjbContainers().size() == 0 && deployment.getPersistenceUnitDeployments().size() == 0)
          {
-            log.trace("EJBRegistrationDeployer no containers in scanned jar, consider adding it to the ignore list: " + jar.getName() + " url: " + jar.toURL() + " unit: " + unit.getName());
+            log.trace("EJBRegistrationDeployer no containers in scanned jar, consider adding it to the ignore list: " + jar.getName() + " url: " + jar.toURL() + " unit: " + unit.getSimpleName());
             return;
          }
          unit.addAttachment(Ejb3Deployment.class, deployment);

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java	2007-06-29 15:14:53 UTC (rev 63747)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBStage2Deployer.java	2007-06-29 16:00:09 UTC (rev 63748)
@@ -48,7 +48,7 @@
    {
       try
       {
-         log.debug("********* EJBStage2 Begin Unit: " + unit.getName() + " jar: " + unit.getName());
+         log.debug("********* EJBStage2 Begin Unit: " + unit.getName() + " jar: " + unit.getSimpleName());
          deployment.start();
       }
       catch (Exception e)

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2007-06-29 15:14:53 UTC (rev 63747)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java	2007-06-29 16:00:09 UTC (rev 63748)
@@ -110,7 +110,7 @@
       if(jndiName != null)
          return jndiName;
 
-      String shortName = unit.getName();
+      String shortName = unit.getSimpleName();
       if(shortName.endsWith(".jar/"))
          jndiName = shortName.substring(0, shortName.length() - 5);
       else if(shortName.endsWith(".jar"))