[jboss-cvs] JBossAS SVN: r57666 - in trunk/ejb3: docs/tutorial/ear src/main/org/jboss/ejb3 src/main/org/jboss/ejb3/deployers

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

Author: bill.burke at jboss.com
Date: 2006-10-13 17:22:18 -0400 (Fri, 13 Oct 2006)
New Revision: 57666

Modified:
   trunk/ejb3/docs/tutorial/ear/build.xml
   trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java
Log:
ear structure workarounds for VFS quirkiness

Modified: trunk/ejb3/docs/tutorial/ear/build.xml
===================================================================
--- trunk/ejb3/docs/tutorial/ear/build.xml	2006-10-13 21:04:27 UTC (rev 57665)
+++ trunk/ejb3/docs/tutorial/ear/build.xml	2006-10-13 21:22:18 UTC (rev 57666)
@@ -8,7 +8,7 @@
 
    <property environment="env"/>
    <property name="src.dir" value="${basedir}/src"/>
-   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="all"/>
+   <property name="jboss.home" value="${env.JBOSS_HOME}"/>   <property name="jboss.server.config" value="default"/>
    <property name="build.dir" value="${basedir}/build"/>
    <property name="build.classes.dir" value="${build.dir}/classes"/>
 
@@ -22,12 +22,9 @@
       <fileset dir="${jboss.home}/server/${jboss.server.config}/lib">
          <include name="**/*.jar"/>
       </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/ejb3.deployer">
+      <fileset dir="${jboss.home}/server/${jboss.server.config}/deployers/ejb3.deployer">
          <include name="*.jar"/>
       </fileset>
-      <fileset dir="${jboss.home}/server/${jboss.server.config}/deploy/jboss-aop-jdk50.deployer">
-         <include name="*.jar"/>
-      </fileset>
       <pathelement location="${build.classes.dir}"/>
    </path>
 

Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2006-10-13 21:04:27 UTC (rev 57665)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJBContainer.java	2006-10-13 21:22:18 UTC (rev 57666)
@@ -180,8 +180,7 @@
       }
       catch (MalformedObjectNameException e)
       {
-         throw new RuntimeException(e); // To change body of catch statement
-         // use Options | File Templates.
+         throw new RuntimeException("failed to create object name for: " + on, e);
       }
       initialContextProperties = ctxProperties;
       Context ctx = getInitialContext();

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java	2006-10-13 21:04:27 UTC (rev 57665)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBoss5DeploymentScope.java	2006-10-13 21:22:18 UTC (rev 57666)
@@ -45,6 +45,13 @@
    public JBoss5DeploymentScope(DeploymentContext parent)
    {
       this.shortName = parent.getName();
+      // this is a hack because VFS has gay URL name.
+      if (shortName.endsWith("!/"))
+      {
+         this.shortName = shortName.substring(0, shortName.length() - 2);
+         int x = shortName.lastIndexOf('/');
+         this.shortName = shortName.substring(x + 1);
+      }
       int idx = shortName.lastIndexOf('.');
       baseName = shortName.substring(0, idx);
       deployments = (ConcurrentHashMap<String, Ejb3Deployment>)parent.getDeploymentUnit().getAttachment("EJB_DEPLOYMENTS");