[jboss-cvs] JBossAS SVN: r66363 - trunk/ejb3/src/main/org/jboss/ejb3/deployers.

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

Author: thomas.diesler at jboss.com
Date: 2007-10-23 11:22:12 -0400 (Tue, 23 Oct 2007)
New Revision: 66363

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java
Log:
Derive shortName from vfs.simpleName

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java	2007-10-23 14:16:19 UTC (rev 66362)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java	2007-10-23 15:22:12 UTC (rev 66363)
@@ -43,25 +43,13 @@
 
    public JBoss5DeploymentScope(VFSDeploymentUnit parent)
    {
-      // Use the root vfs path name
-      this.shortName = parent.getRoot().getPathName();
-      if( shortName.length() == 0 )
-      {
-         shortName = parent.getName();
-         // this is a hack because VFS has gay URL name.
-         if (shortName.endsWith("!/"))
-         {
-            this.shortName = shortName.substring(0, shortName.length() - 2);
-         }
-      }
-      // Further reduce the path to the last component of the url name 
-      int x = shortName.lastIndexOf('/');
-      this.shortName = shortName.substring(x + 1);
-
-      baseName = shortName;
+      this.shortName = parent.getSimpleName();
+      this.baseName = shortName;
+      
       int idx = shortName.lastIndexOf('.');
       if( idx > 0 )
          baseName = shortName.substring(0, idx);
+      
       deployments = (ConcurrentHashMap<String, Ejb3Deployment>)parent.getAttachment("EJB_DEPLOYMENTS");
       if (deployments == null)
       {