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

[jlaskowski]

jlaskowski    2004/07/05 11:47:45

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

  Further enhancements to make OpenEJB instances to not interfere with each other when 
embedded in separate webapps
  
  Revision  Changes    Path
  1.2       +6 -4      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- OpenEJB.java      26 Mar 2004 21:41:21 -0000      1.1
  +++ OpenEJB.java      5 Jul 2004 15:47:45 -0000       1.2
  @@ -145,9 +145,9 @@
               // OpenEJB does.
               JarUtils.setHandlerSystemProperty();
   
  +            Logger.initialize( initProps );
  +            
               logger = Logger.getInstance( "OpenEJB.startup", 
"org.openejb.util.resources" );
  -
  -            initialized = true;
           }
   
        /*
  @@ -159,7 +159,7 @@
            versionInfo.load( new URL( "resource:/openejb-version.properties" 
).openConnection().getInputStream() );
        } catch (java.io.IOException e) {
        }
  -        if( System.getProperty( "openejb.nobanner" ) == null ) {
  +        if( initProps.getProperty( "openejb.nobanner" ) == null ) {
               System.out.println( "OpenEJB " + versionInfo.get( "version" ) +"    
build: "+versionInfo.get( "date" )+"-"+versionInfo.get( "time" ));
               System.out.println( "" + versionInfo.get( "url" ) );
           }
  @@ -307,6 +307,8 @@
           } else {
               logger.i18n.debug( "startup.transactionManager", 
transactionManager.getClass().getName() );
           }
  +
  +        initialized = true;
   
           logger.i18n.info( "startup.ready" );
       }