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

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

Author: bill.burke at jboss.com
Date: 2006-11-02 13:03:14 -0500 (Thu, 02 Nov 2006)
New Revision: 58015

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/EJB3Deployer.java
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
Log:
fix URL so that JarEntry urls come out correctly.

Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJB3Deployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJB3Deployer.java	2006-11-02 17:50:42 UTC (rev 58014)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJB3Deployer.java	2006-11-02 18:03:14 UTC (rev 58015)
@@ -90,7 +90,7 @@
       setRelativeOrder(400); // before old EJB 2.1 deployer
    }
 
-   protected boolean hasFile(DeploymentInfo di, String filePath)
+   public static boolean hasFile(DeploymentInfo di, String filePath)
    {
       String urlStr = di.url.getFile();
       try
@@ -120,20 +120,25 @@
       return false;
    }
 
-   protected boolean hasPersistenceXml(DeploymentInfo di)
+   public static boolean hasPersistenceXml(DeploymentInfo di)
    {
       return hasFile(di, "META-INF/persistence.xml");
    }
 
-   protected boolean has30EjbJarXml(DeploymentInfo di)
+   public static boolean has30EjbJarXml(DeploymentInfo di)
    {
       if (!hasFile(di, "META-INF/ejb-jar.xml")) return false;
+      InputStream ddStream = di.localCl.getResourceAsStream("META-INF/ejb-jar.xml");
 
+      return has30EjbJarXml(ddStream);
+   }
+
+   public static boolean has30EjbJarXml(InputStream ddStream)
+   {
       try
       {
          // look for version="3.0" in the file
          byte[] stringToFind = "version=\"3.0\"".getBytes();
-         InputStream ddStream = di.localCl.getResourceAsStream("META-INF/ejb-jar.xml");
          InputStreamReader reader = new InputStreamReader(ddStream);
          try
          {

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2006-11-02 17:50:42 UTC (rev 58014)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java	2006-11-02 18:03:14 UTC (rev 58015)
@@ -27,6 +27,7 @@
 import org.jboss.deployers.spi.structure.DeploymentContext;
 import org.jboss.ejb3.DeploymentScope;
 import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.EJB3Deployer;
 import org.jboss.kernel.Kernel;
 import org.jboss.virtual.VirtualFile;
 import org.jboss.logging.Logger;
@@ -126,6 +127,11 @@
             }
          }
          log.debug("********* EJBRegistrationDepoyer Begin Unit: " + unit.getName() + " jar: " + jar.getName());
+         VirtualFile ejbjar = unit.getMetaDataFile("ejb-jar.xml");
+         if (ejbjar != null)
+         {
+            if (!EJB3Deployer.has30EjbJarXml(ejbjar.openStream())) return;
+         }
          DeploymentScope scope = null;
          DeploymentContext parent = unit.getDeploymentContext().getParent();
          if (parent != null && parent.getRoot().getName().endsWith(".ear")) // todo should look for metadata instead of ".ear"