[Kernel-commits] r6069 - branches/2.16/site-spi/src/test/java/no/sesat/search/site/config

[ssmiweve]

Author: ssmiweve
Date: 2008-01-30 15:17:08 +0100 (Wed, 30 Jan 2008)
New Revision: 6069

Modified:
   
branches/2.16/site-spi/src/test/java/no/sesat/search/site/config/FileResourceLoader.java
Log:
SEARCH-4043 - Enable tests to run again

Modified: 
branches/2.16/site-spi/src/test/java/no/sesat/search/site/config/FileResourceLoader.java
===================================================================
--- 
branches/2.16/site-spi/src/test/java/no/sesat/search/site/config/FileResourceLoader.java
    2008-01-30 12:17:13 UTC (rev 6068)
+++ 
branches/2.16/site-spi/src/test/java/no/sesat/search/site/config/FileResourceLoader.java
    2008-01-30 14:17:08 UTC (rev 6069)
@@ -165,8 +165,14 @@
                     for(int i = 0; i < genericSesamLoop; ++i){
                         basedir = basedir + ".." + File.separatorChar;
                     }
-                    basedir = basedir + "sesat-kernel" + File.separatorChar 
-                            + "generic.sesam" + File.separatorChar + "war" + 
File.separatorChar;
+                    if(new File(basedir + "generic.sesam").exists()){
+                        // we are already inside sesat-kernel
+                        basedir = basedir + "generic.sesam" + 
File.separatorChar + "war" + File.separatorChar;
+                        
+                    }else{
+                        basedir = basedir + "sesat-kernel" + 
File.separatorChar 
+                                + "generic.sesam" + File.separatorChar + "war" 
+ File.separatorChar;
+                    }
                 }else{
                     basedir = basedir 
                             + (basedir.endsWith("war"+ File.separatorChar) ? 
".." + File.separatorChar : "")

_______________________________________________
Kernel-commits mailing list
Kernel-commits@sesat.no
http://sesat.no/mailman/listinfo/kernel-commits