You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2008/03/24 22:48:59 UTC

svn commit: r640596 - in /openejb/branches/openejb-3.0/container/openejb-core/src/main: java/org/apache/openejb/OpenEJB.java resources/org/apache/openejb/util/resources/Messages.properties

Author: dblevins
Date: Mon Mar 24 14:48:56 2008
New Revision: 640596

URL: http://svn.apache.org/viewvc?rev=640596&view=rev
Log:
Merging r640579 - http://svn.apache.org/viewvc?rev=640579&view=rev

svn merge -r 640578:640579 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 .

------------------------------------------------------------------------
r640579 | dblevins | 2008-03-24 14:06:21 -0700 (Mon, 24 Mar 2008) | 2 lines

Tweaked the "ready" log output

------------------------------------------------------------------------

Modified:
    openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
    openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties

Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java?rev=640596&r1=640595&r2=640596&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java (original)
+++ openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/OpenEJB.java Mon Mar 24 14:48:56 2008
@@ -245,13 +245,8 @@
             }
             SystemInstance.get().setComponent(TransactionManager.class, transactionManager);
 
-            logger.info("startup.ready");
+            logger.debug("startup.ready");
 
-            String loader = initProps.getProperty("openejb.loader");
-            String nobanner = initProps.getProperty("openejb.nobanner");
-            if (nobanner == null && (loader == null || (loader != null && loader.startsWith("tomcat")))) {
-                System.out.println(messages.message("startup.ready"));
-            }
         }
 
         public Throwable getInitialized() {

Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties?rev=640596&r1=640595&r2=640596&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties (original)
+++ openejb/branches/openejb-3.0/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties Mon Mar 24 14:48:56 2008
@@ -40,7 +40,7 @@
 startup.securityService=SecurityService   : {0}
 startup.assemblerReturnedNullTransactionManager=OpenEJB has encountered a fatal error and cannot be started: The Assembler returned a null transaction manager.
 startup.transactionManager=TransactionManager: {0}
-startup.ready=OpenEJB ready.
+startup.ready=OpenEJB Container System ready.
 startup.noContainersConfigured=Attemtped to access containers where none are configured.
 startup.scrapeFailedForModule=Unable to scrape for @Stateful, @Stateless or @MessageDriven annotations. Invalid EjbModule URL: {0}
 startup.beanInstanceSystemExceptionThrown=The bean instance business method encountered a system exception: {0}