[openejb-scm] openejb1/modules/core/src/java/org/openejb/alt/config EjbJarUtils.java

[dblevins]

dblevins    2005/08/29 03:40:19

  Modified:    modules/core/src/java/org/openejb/alt/config
                        EjbJarUtils.java
  Log:

  Fix for for broken deploy tool
  
  Revision  Changes    Path
  1.9       +8 -2      
openejb1/modules/core/src/java/org/openejb/alt/config/EjbJarUtils.java
  
  Index: EjbJarUtils.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/alt/config/EjbJarUtils.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- EjbJarUtils.java  6 Aug 2005 16:55:19 -0000       1.8
  +++ EjbJarUtils.java  29 Aug 2005 07:40:19 -0000      1.9
  @@ -54,6 +54,7 @@
   import org.openejb.loader.SystemInstance;
   import org.openejb.util.JarUtils;
   import org.openejb.util.Messages;
  +import org.openejb.util.Logger;
   
   import java.io.File;
   import java.io.FileInputStream;
  @@ -72,6 +73,7 @@
   public class EjbJarUtils {
   
       public static final Messages messages = new 
Messages("org.openejb.util.resources");
  +    public static final Logger logger = 
Logger.getInstance("OpenEJB.startup", "org.openejb.util.resources");
   
       private final EjbJar ejbJar;
       private final String jarLocation;
  @@ -83,7 +85,11 @@
           /*[1.1]  Get the jar ***************/
           this.jarLocation = jarLocation;
           this.ejbJar = readEjbJar(jarLocation);
  -        this.openejbJar = readOpenEjbJar(jarLocation);
  +        try {
  +            this.openejbJar = readOpenEjbJar(jarLocation);
  +        } catch (OpenEJBException e) {
  +            logger.warning("Reading openejb-jar.xml.",e);
  +        }
       }
   
       /**