You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2010/12/19 18:19:29 UTC

svn commit: r1050909 - /axis/axis2/java/sandesha/trunk/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java

Author: veithen
Date: Sun Dec 19 17:19:29 2010
New Revision: 1050909

URL: http://svn.apache.org/viewvc?rev=1050909&view=rev
Log:
Avoid IOExceptions when sandesha2-tests is executed in a multi-module build.

Modified:
    axis/axis2/java/sandesha/trunk/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java

Modified: axis/axis2/java/sandesha/trunk/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java?rev=1050909&r1=1050908&r2=1050909&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java (original)
+++ axis/axis2/java/sandesha/trunk/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java Sun Dec 19 17:19:29 2010
@@ -81,17 +81,20 @@ public class SandeshaTestCase extends Te
         String testRource = "target" + File.separator + "test-classes";
         resourceDir = new File(testRource).getPath();
         
-        String propFileStr = resourceDir + File.separator + PROPERTY_FILE_NAME;
-        properties = new Properties ();
-        
-        try {
-			FileInputStream propertyFile = new FileInputStream (new File(propFileStr));
-			properties.load(propertyFile);
-		} catch (FileNotFoundException e) {
-			log.error(e);
-		} catch (IOException e) {
-			log.error(e);
-		}
+        // TODO: This doesn't work as expected when the sandesha2-test module is executed in a multi-module build.
+        //       Anyway, sandesha2-test.properties only contains a value for the test server port. This value is
+        //       the same as the default, so we may as well skip the code.
+//        String propFileStr = resourceDir + File.separator + PROPERTY_FILE_NAME;
+//        properties = new Properties ();
+//        
+//        try {
+//			FileInputStream propertyFile = new FileInputStream (new File(propFileStr));
+//			properties.load(propertyFile);
+//		} catch (FileNotFoundException e) {
+//			log.error(e);
+//		} catch (IOException e) {
+//			log.error(e);
+//		}
     }
     
     public void setUp () throws Exception {