diff --git a/htroot/ConfigAppearance_p.java b/htroot/ConfigAppearance_p.java index 992cdc78a..37d604cdf 100644 --- a/htroot/ConfigAppearance_p.java +++ b/htroot/ConfigAppearance_p.java @@ -44,6 +44,7 @@ import net.yacy.cora.protocol.RequestHeader; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.util.FileUtils; import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import net.yacy.server.serverObjects; import net.yacy.server.serverSwitch; @@ -57,7 +58,7 @@ public class ConfigAppearance_p { public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header, final serverObjects post, final serverSwitch env) { final serverObjects prop = new serverObjects(); final Switchboard sb = (Switchboard) env; - final String skinPath = new File(env.getDataPath(), env.getConfig("skinPath", "DATA/SKINS")).toString(); + final String skinPath = new File(env.getDataPath(), env.getConfig("skinPath", SwitchboardConstants.SKINS_PATH_DEFAULT)).toString(); // Fallback prop.put("currentskin", ""); diff --git a/source/net/yacy/migration.java b/source/net/yacy/migration.java index 1a0268127..90bccdbc7 100644 --- a/source/net/yacy/migration.java +++ b/source/net/yacy/migration.java @@ -99,7 +99,7 @@ public class migration { * copy skins from the release to DATA/SKINS. */ public static void installSkins(final Switchboard sb){ - final File skinsPath = sb.getDataPath("skinPath", "DATA/SKINS"); + final File skinsPath = sb.getDataPath("skinPath", SwitchboardConstants.SKINS_PATH_DEFAULT); final File defaultSkinsPath = new File(sb.getAppPath(), "skins"); if (defaultSkinsPath.exists()) { final List skinFiles = FileUtils.getDirListing(defaultSkinsPath.getAbsolutePath()); @@ -118,7 +118,7 @@ public class migration { if(skin.equals("")){ skin="default"; } - final File skinsDir=sb.getDataPath("skinPath", "DATA/SKINS"); + final File skinsDir=sb.getDataPath("skinPath", SwitchboardConstants.SKINS_PATH_DEFAULT); final File skinFile=new File(skinsDir, skin+".css"); final File htdocsPath=new File(sb.getDataPath(SwitchboardConstants.HTDOCS_PATH, SwitchboardConstants.HTROOT_PATH_DEFAULT), "env"); final File styleFile=new File(htdocsPath, "style.css"); diff --git a/source/net/yacy/repository/Blacklist.java b/source/net/yacy/repository/Blacklist.java index 47ee0e24b..a7042252c 100644 --- a/source/net/yacy/repository/Blacklist.java +++ b/source/net/yacy/repository/Blacklist.java @@ -56,6 +56,7 @@ import net.yacy.kelondro.index.RowHandleSet; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.SetTools; import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; public class Blacklist { @@ -630,7 +631,7 @@ public class Blacklist { } private static File DHTCacheFile(final BlacklistType type) { - String BLACKLIST_DHT_CACHEFILE_NAME = "DATA/LISTS/blacklist_" + type.name() + "_Cache.ser"; + final String BLACKLIST_DHT_CACHEFILE_NAME = SwitchboardConstants.LISTS_PATH_DEFAULT + "/blacklist_" + type.name() + "_Cache.ser"; return new File(Switchboard.getSwitchboard().dataPath, BLACKLIST_DHT_CACHEFILE_NAME); } diff --git a/source/net/yacy/search/SwitchboardConstants.java b/source/net/yacy/search/SwitchboardConstants.java index 0bea89ce6..c0adabeee 100644 --- a/source/net/yacy/search/SwitchboardConstants.java +++ b/source/net/yacy/search/SwitchboardConstants.java @@ -521,4 +521,9 @@ public final class SwitchboardConstants { public static final String GREEDYLEARNING_ENABLED = "greedylearning.enabled"; public static final String GREEDYLEARNING_LIMIT_DOCCOUNT = "greedylearning.limit.doccount"; public static final String GREEDYLEARNING_ACTIVE = "greedylearning.active"; + + /* + * Skins + */ + public static final String SKINS_PATH_DEFAULT = "DATA/SKINS"; }