Author: ssmiweve
Date: 2008-01-30 13:17:13 +0100 (Wed, 30 Jan 2008)
New Revision: 6068
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 11:56:14 UTC (rev 6067)
+++
branches/2.16/site-spi/src/test/java/no/sesat/search/site/config/FileResourceLoader.java
2008-01-30 12:17:13 UTC (rev 6068)
@@ -111,16 +111,21 @@
protected final String getProjectName(final String siteName){
- // Very hacky.
+ // Very hacky and awlful!
String projectName = siteName.replaceAll("localhost",
"sesam").replaceAll("generic.localhost", "generic.sesam");
if( projectName.indexOf(':') > 0 ){
projectName = projectName.substring(0, projectName.indexOf(':'));
}
+
if( !projectName.endsWith("/")){
projectName = projectName + '/';
}
+
if( projectName.endsWith("sesam/") &&
!"generic.sesam/".equals(projectName) ){
projectName = projectName.substring(0, projectName.length() - 1) +
".no/";
+ }else if( !projectName.contains(".") ){
+ projectName = projectName.substring(0, projectName.length() - 1) +
".sesam.no/";
+
}
return projectName.replace('/', File.separatorChar);
}
@@ -146,6 +151,7 @@
while(true){
final String basedirNormalised = new
File(basedir).toURI().normalize().toString();
LOG.info("basedirNormalised " + basedirNormalised);
+ assert !"/war".equals(basedirNormalised) : "At root of
filesystem!";
if(basedirNormalised.endsWith(project) ||
basedirNormalised.endsWith(project + "war/")){
LOG.debug("looking in " + basedir + suffix);
final File f = new File(basedir + suffix + getResource());
@@ -159,9 +165,12 @@
for(int i = 0; i < genericSesamLoop; ++i){
basedir = basedir + ".." + File.separatorChar;
}
- basedir = basedir + "sesat-kernel" + File.separatorChar +
"generic.sesam" + File.separatorChar + "war" + File.separatorChar;
+ basedir = basedir + "sesat-kernel" + File.separatorChar
+ + "generic.sesam" + File.separatorChar + "war" +
File.separatorChar;
}else{
- basedir = basedir + ".." + File.separatorChar + ".." +
File.separatorChar + "war" + File.separatorChar;
+ basedir = basedir
+ + (basedir.endsWith("war"+ File.separatorChar) ?
".." + File.separatorChar : "")
+ + ".." + File.separatorChar + "war" +
File.separatorChar;
}
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
