summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreger <reger18@arcor.de>2014-12-14 21:27:45 +0100
committerreger <reger18@arcor.de>2014-12-14 21:27:45 +0100
commit6c3f36def1397a1235ea2b0432640fe21fff919f (patch)
treec435cedb11bef27012c52455032efd5a4436b7cd
parent00113dcfbdee4776cd78baf60cce27f9eb9e9448 (diff)
- fix path to default heuristic.cfg
- deprecate unused ProxyServlet
-rw-r--r--htroot/ConfigHeuristics_p.java2
-rw-r--r--source/net/yacy/http/servlets/YaCyProxyServlet.java4
2 files changed, 4 insertions, 2 deletions
diff --git a/htroot/ConfigHeuristics_p.java b/htroot/ConfigHeuristics_p.java
index 0e746741b..a171ea078 100644
--- a/htroot/ConfigHeuristics_p.java
+++ b/htroot/ConfigHeuristics_p.java
@@ -138,7 +138,7 @@ public class ConfigHeuristics_p {
// copy default opensearch heuristic config with sample entries
if (post.containsKey("copydefaultosdconfig") || post.containsKey("resettodefaultosdlist")) {
// prepare a solr index profile switch list
- final File osdDefaultConfig = new File(sb.getDataPath(), "defaults/heuristicopensearch.conf");
+ final File osdDefaultConfig = new File(sb.getAppPath(), "defaults/heuristicopensearch.conf");
final File osdConfig = new File(sb.getDataPath(), "DATA/SETTINGS/heuristicopensearch.conf");
if ((post.containsKey("resettodefaultosdlist") || !osdConfig.exists()) && osdDefaultConfig.exists()) {
try {
diff --git a/source/net/yacy/http/servlets/YaCyProxyServlet.java b/source/net/yacy/http/servlets/YaCyProxyServlet.java
index a2cd87283..d13b96798 100644
--- a/source/net/yacy/http/servlets/YaCyProxyServlet.java
+++ b/source/net/yacy/http/servlets/YaCyProxyServlet.java
@@ -54,8 +54,10 @@ import org.eclipse.jetty.proxy.ProxyServlet;
* later improvemnts should/could use implementation to avoid back and forth converting
* between YaCy and Servlet header/parameter style and use proxy implementation within
* servlet specification or a existing reverse-proxy library.
- *
+ *
+ * @deprecated since 1.81 use {@link UrlProxyServlet} instead.
*/
+@Deprecated //use UrlProxyServlet instead
public class YaCyProxyServlet extends ProxyServlet implements Servlet {
private static final long serialVersionUID = 4900000000000001120L;