0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ignore crawler.properties

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-12-01 06:40:44 +09:00
parent 7592bf0ab4
commit cc96836ba9
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/org/codelibs/fess/util/ResourceUtil.java
View file

@ -62,29 +62,28 @@ public class ResourceUtil {
try {
final ServletContext servletContext = SingletonLaContainer.getComponent(ServletContext.class);
final String webinfoPath = servletContext.getRealPath("/WEB-INF/" + base);
if (webinfoPath != null) {
final Path path = Paths.get(webinfoPath, names);
if (Files.exists(path)) {
return path;
final String webinfPath = servletContext.getRealPath("/WEB-INF/" + base);
if (webinfPath != null) {
if (Files.exists(Paths.get(webinfPath))) {
return Paths.get(webinfPath, names);
}
}
} catch (final Throwable e) { // NOSONAR
// ignore
}
final Path defaultPath = Paths.get("WEB-INF/" + base, names);
if (Files.exists(defaultPath)) {
return defaultPath;
final String webinfBase = "WEB-INF/" + base;
if (Files.exists(Paths.get(webinfBase))) {
return Paths.get(webinfBase, names);
}
final Path srcBasePath = Paths.get("src/main/webapps/WEB-INF/" + base, names);
if (Files.exists(srcBasePath)) {
return srcBasePath;
final String srcWebInfBase = "src/main/webapps/WEB-INF/" + base;
if (Files.exists(Paths.get(srcWebInfBase))) {
return Paths.get(srcWebInfBase, names);
}
final Path targetBasePath = Paths.get("target/fess/WEB-INF/" + base, names);
if (Files.exists(targetBasePath)) {
return targetBasePath;
final String targetWebInfBase = "target/fess/WEB-INF/" + base;
if (Files.exists(Paths.get(targetWebInfBase))) {
return Paths.get(targetWebInfBase, names);
}
return defaultPath;
return Paths.get(webinfBase, names);
}
public static File[] getJarFiles(final String namePrefix) {

0
src/main/webapp/WEB-INF/conf/crawler.properties
View file