You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by cs...@apache.org on 2012/10/24 15:03:59 UTC

svn commit: r1401662 - /cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java

Author: cschneider
Date: Wed Oct 24 13:03:58 2012
New Revision: 1401662

URL: http://svn.apache.org/viewvc?rev=1401662&view=rev
Log:
Allow test to run in Eclipse

Modified:
    cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java

Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java?rev=1401662&r1=1401661&r2=1401662&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java Wed Oct 24 13:03:58 2012
@@ -59,7 +59,11 @@ public class TestImportService extends A
         opts.add(CoreOptions.provision(getTestClientBundle()));
         opts.add(CoreOptions.systemProperty("org.osgi.framework.startlevel.beginning").value("" + startLevel));
 
-        opts.add(CoreOptions.systemProperty("java.util.logging.config.file").value(System.getProperty("java.util.logging.config.file")));
+        String loggingConfigFile = System.getProperty("java.util.logging.config.file");
+        if (loggingConfigFile != null) {
+            // When running from eclipse junit the loggingConfigFile will not be set
+            opts.add(CoreOptions.systemProperty("java.util.logging.config.file").value(loggingConfigFile));
+        }
 
         // For debugging...
         final String debugPort = System.getProperty("org.apache.cxf.dosgi.test.debug.port");