Author: dblevins
Date: Wed Apr 2 00:54:00 2008
New Revision: 643779
URL: http://svn.apache.org/viewvc?rev=643779&view=rev
Log:
Merging r636618 - http://svn.apache.org/viewvc?rev=636618&view=rev
svn merge -r 636617:636618 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 .
------------------------------------------------------------------------
r636618 | dblevins | 2008-03-12 20:20:58 -0700 (Wed, 12 Mar 2008) | 1 line
removed annoying itests properties file warning
------------------------------------------------------------------------
Modified:
openejb/branches/openejb-3.0/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestManager.java
Modified: openejb/branches/openejb-3.0/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestManager.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestManager.java?rev=643779&r1=643778&r2=643779&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestManager.java
(original)
+++ openejb/branches/openejb-3.0/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestManager.java
Wed Apr 2 00:54:00 2008
@@ -53,13 +53,7 @@
if (propertiesFileName == null) {
try{
propertiesFileName = System.getProperty(TESTSUITE_PROPERTY_FILENAME);
- if (propertiesFileName == null) {
- if (warn) {
- // TODO: Avoid using System.out
- // TODO: i18n
- System.out.println("WARNING: No test suite configuration file specified,
assuming system properties contain all needed information. To specify a test suite configuration
file by setting its location using the system property \"" + TESTSUITE_PROPERTY_FILENAME +
"\"");
- }
- } else {
+ if (propertiesFileName != null) {
props.putAll( getProperties( propertiesFileName ) );
}
|