[openejb-scm] openejb1/modules/core/src/java/org/openejb OpenEJB.java

[dblevins]

dblevins    2005/07/12 19:51:16

  Modified:    modules/core/src/java/org/openejb OpenEJB.java
  Log:

  Tomcat 4 Common (Global) support works.  Per-webapp is still hosed.
  
  Revision  Changes    Path
  1.8       +7 -2      openejb1/modules/core/src/java/org/openejb/OpenEJB.java
  
  Index: OpenEJB.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/OpenEJB.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- OpenEJB.java      6 Jul 2005 02:04:02 -0000       1.7
  +++ OpenEJB.java      12 Jul 2005 23:51:16 -0000      1.8
  @@ -60,6 +60,7 @@
   import org.openejb.util.Logger;
   import org.openejb.util.Messages;
   import org.openejb.util.SafeToolkit;
  +import org.openejb.loader.SystemInstance;
   
   
   /**
  @@ -136,7 +137,11 @@
        * @since JDK 1.2
        */
       public static void init(Properties initProps, ApplicationServer 
appServer) throws OpenEJBException {
  -
  +        try {
  +            SystemInstance.init(initProps);
  +        } catch (Exception e) {
  +            throw new OpenEJBException(e);
  +        }
           if ( initialized ) {
            String msg = messages.message( "startup.alreadyInitialzied" );
               logger.i18n.error( msg );