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

[ssmiweve]

Author: ssmiweve
Date: 2008-01-31 22:35:05 +0100 (Thu, 31 Jan 2008)
New Revision: 6077

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-31 20:50:52 UTC (rev 6076)
+++ 
branches/2.16/site-spi/src/test/java/no/sesat/search/site/config/FileResourceLoader.java
    2008-01-31 21:35:05 UTC (rev 6077)
@@ -111,8 +111,11 @@
 
      protected final String getProjectName(final String siteName){
 
-        // Very hacky and awlful!
-        String projectName = siteName.replaceAll("localhost", 
"sesam").replaceAll("generic.localhost", "generic.sesam");
+        // XXX Very hacky and awful! desparately needs attention.
+        String projectName = siteName
+                
.replaceAll("(localhost|(alpha|nuclei|beta|electron|gamma).test.sesam)", 
"sesam")
+                .replaceAll("generic.(sesam.no)", "generic.sesam");
+        
         if( projectName.indexOf(':') > 0 ){
             projectName = projectName.substring(0, projectName.indexOf(':'));
         }
@@ -148,9 +151,10 @@
             }            
             
             String basedir = System.getProperty("basedir") + 
File.separatorChar;
+            LOG.debug("project " + project);
             while(true){
                 final String basedirNormalised = new 
File(basedir).toURI().normalize().toString();
-                LOG.info("basedirNormalised " + basedirNormalised);
+                LOG.debug("basedirNormalised " + basedirNormalised);
                 assert !"/war".equals(basedirNormalised) : "At root of 
filesystem!";
                 if(basedirNormalised.endsWith(project) || 
basedirNormalised.endsWith(project + "war/")){
                     LOG.debug("looking in " + basedir + suffix);

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