diff options
| author | orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542> | 2011-01-28 10:54:13 +0000 |
|---|---|---|
| committer | orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542> | 2011-01-28 10:54:13 +0000 |
| commit | 88773e4daa06bebe51d3204a8ea4c47706c31afa (patch) | |
| tree | b4b195161742df29ff6b7f2e4ad09b8ef2b78c7e /htroot | |
| parent | 6c35b68f173eb33a158fa76288e24ab523879ae0 (diff) | |
changed the default port from 8080 to 8090
see also: http://forum.yacy-websuche.de/viewtopic.php?p=21683#p21683
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7454 6c8d7289-2bf4-0310-a012-ef5d649a1542
Diffstat (limited to 'htroot')
30 files changed, 45 insertions, 48 deletions
diff --git a/htroot/ConfigBasic.java b/htroot/ConfigBasic.java index 6e5c7ec25..7f6a20492 100644 --- a/htroot/ConfigBasic.java +++ b/htroot/ConfigBasic.java @@ -96,9 +96,9 @@ public class ConfigBasic { // port settings final long port; if (post != null && post.containsKey("port") && Integer.parseInt(post.get("port")) > 1023) { - port = post.getLong("port", 8080); + port = post.getLong("port", 8090); } else { - port = env.getConfigLong("port", 8080); //this allows a low port, but it will only get one, if the user edits the config himself. + port = env.getConfigLong("port", 8090); //this allows a low port, but it will only get one, if the user edits the config himself. } // check if peer name already exists @@ -254,7 +254,7 @@ public class ConfigBasic { // set default values prop.putHTML("defaultName", sb.peers.mySeed().getName()); - prop.putHTML("defaultPort", env.getConfig("port", "8080")); + prop.putHTML("defaultPort", env.getConfig("port", "8090")); lang = env.getConfig("locale.language", "default"); // re-assign lang, may have changed if ("default".equals(lang)) { prop.put("langDeutsch", "0"); diff --git a/htroot/ConfigLiveSearch.java b/htroot/ConfigLiveSearch.java index 62c82dd93..00d84c292 100644 --- a/htroot/ConfigLiveSearch.java +++ b/htroot/ConfigLiveSearch.java @@ -37,7 +37,7 @@ public class ConfigLiveSearch { final Switchboard sb = (Switchboard) env;
prop.putHTML("ip", sb.peers.mySeed().getIP());
- prop.putHTML("port", sb.getConfig("port", "8080"));
+ prop.putHTML("port", sb.getConfig("port", "8090"));
return prop;
}
diff --git a/htroot/ConfigPortal.java b/htroot/ConfigPortal.java index 5531e0d26..b1b168f4e 100644 --- a/htroot/ConfigPortal.java +++ b/htroot/ConfigPortal.java @@ -115,7 +115,7 @@ public class ConfigPortal { String myaddress = sb.peers.mySeed().getPublicAddress();
if (myaddress == null) {
- myaddress = "localhost:" + sb.getConfig("port", "8080");
+ myaddress = "localhost:" + sb.getConfig("port", "8090");
}
prop.put("myaddress", myaddress);
return prop;
diff --git a/htroot/ConfigSearchBox.java b/htroot/ConfigSearchBox.java index 247bc95bb..cf92de73b 100644 --- a/htroot/ConfigSearchBox.java +++ b/htroot/ConfigSearchBox.java @@ -35,7 +35,7 @@ public class ConfigSearchBox { final Switchboard sb = (Switchboard) env;
String myaddress = sb.peers.mySeed().getPublicAddress();
- if (myaddress == null) myaddress = "localhost:" + sb.getConfig("port", "8080");
+ if (myaddress == null) myaddress = "localhost:" + sb.getConfig("port", "8090");
prop.put("myaddress", myaddress);
return prop;
}
diff --git a/htroot/CrawlStartExpert_p.java b/htroot/CrawlStartExpert_p.java index ad2475193..836d0516c 100644 --- a/htroot/CrawlStartExpert_p.java +++ b/htroot/CrawlStartExpert_p.java @@ -38,9 +38,6 @@ public class CrawlStartExpert_p { final serverObjects prop = new serverObjects(); // define visible variables - //String a = sb.peers.mySeed().getPublicAddress(); - //boolean intranet = sb.getConfig(SwitchboardConstants.NETWORK_NAME, "").equals("intranet"); - //String repository = "http://" + ((a == null) ? "localhost:" + sb.getConfig("port", "8080") : a) + "/repository/"; prop.put("starturl", /*(intranet) ? repository :*/ "http://"); prop.put("proxyPrefetchDepth", env.getConfig("proxyPrefetchDepth", "0")); prop.put("crawlingDepth", Math.min(3, env.getConfigLong("crawlingDepth", 0))); diff --git a/htroot/CrawlStartScanner_p.java b/htroot/CrawlStartScanner_p.java index a6e1c5f4e..fdc9bf377 100644 --- a/htroot/CrawlStartScanner_p.java +++ b/htroot/CrawlStartScanner_p.java @@ -146,7 +146,7 @@ public class CrawlStartScanner_p { if (url != null) { String path = "/Crawler_p.html?createBookmark=off&xsstopw=off&crawlingDomMaxPages=10000&intention=&range=domain&indexMedia=on&recrawl=nodoubles&xdstopw=off&storeHTCache=on&sitemapURL=&repeat_time=7&crawlingQ=on&cachePolicy=iffresh&indexText=on&crawlingMode=url&mustnotmatch=&crawlingDomFilterDepth=1&crawlingDomFilterCheck=off&crawlingstart=Start%20New%20Crawl&xpstopw=off&repeat_unit=seldays&crawlingDepth=99"; path += "&crawlingURL=" + url.toNormalform(true, false); - WorkTables.execAPICall("localhost", (int) sb.getConfigLong("port", 8080), sb.getConfig("adminAccountBase64MD5", ""), path, pk); + WorkTables.execAPICall("localhost", (int) sb.getConfigLong("port", 8090), sb.getConfig("adminAccountBase64MD5", ""), path, pk); } } } @@ -180,7 +180,7 @@ public class CrawlStartScanner_p { if (host.getValue() == Access.granted && Scanner.inIndex(apiCommentCache, urlString) == null) { String path = "/Crawler_p.html?createBookmark=off&xsstopw=off&crawlingDomMaxPages=10000&intention=&range=domain&indexMedia=on&recrawl=nodoubles&xdstopw=off&storeHTCache=on&sitemapURL=&repeat_time=7&crawlingQ=on&cachePolicy=iffresh&indexText=on&crawlingMode=url&mustnotmatch=&crawlingDomFilterDepth=1&crawlingDomFilterCheck=off&crawlingstart=Start%20New%20Crawl&xpstopw=off&repeat_unit=seldays&crawlingDepth=99"; path += "&crawlingURL=" + urlString; - WorkTables.execAPICall("localhost", (int) sb.getConfigLong("port", 8080), sb.getConfig("adminAccountBase64MD5", ""), path, u.hash()); + WorkTables.execAPICall("localhost", (int) sb.getConfigLong("port", 8090), sb.getConfig("adminAccountBase64MD5", ""), path, u.hash()); } i++; } catch (MalformedURLException e) { diff --git a/htroot/Load_MediawikiWiki.java b/htroot/Load_MediawikiWiki.java index 7941ea696..36a875230 100644 --- a/htroot/Load_MediawikiWiki.java +++ b/htroot/Load_MediawikiWiki.java @@ -39,7 +39,7 @@ public class Load_MediawikiWiki { // define visible variables String a = sb.peers.mySeed().getPublicAddress(); - if (a == null) a = "localhost:" + sb.getConfig("port", "8080"); + if (a == null) a = "localhost:" + sb.getConfig("port", "8090"); boolean intranet = sb.getConfig(SwitchboardConstants.NETWORK_NAME, "").equals("intranet"); String repository = "http://" + a + "/repository/"; prop.put("starturl", (intranet) ? repository : "http://"); diff --git a/htroot/Load_PHPBB3.java b/htroot/Load_PHPBB3.java index 8c8bf5656..0545f1bd5 100644 --- a/htroot/Load_PHPBB3.java +++ b/htroot/Load_PHPBB3.java @@ -39,7 +39,7 @@ public class Load_PHPBB3 { // define visible variables String a = sb.peers.mySeed().getPublicAddress(); - if (a == null) a = "localhost:" + sb.getConfig("port", "8080"); + if (a == null) a = "localhost:" + sb.getConfig("port", "8090"); boolean intranet = sb.getConfig(SwitchboardConstants.NETWORK_NAME, "").equals("intranet"); String repository = "http://" + a + "/repository/"; prop.put("starturl", (intranet) ? repository : "http://"); diff --git a/htroot/Network.html b/htroot/Network.html index d0681b526..80bd095fa 100644 --- a/htroot/Network.html +++ b/htroot/Network.html @@ -371,7 +371,7 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de <table>
<tr>
<td>ip:port</td>
- <td><input id="otherPeerAddress" type="text" size="32" maxlength="128" value=":8080" /></td>
+ <td><input id="otherPeerAddress" type="text" size="32" maxlength="128" value=":8090" /></td>
</tr>
<tr>
<td> </td>
diff --git a/htroot/ProxyIndexingMonitor_p.html b/htroot/ProxyIndexingMonitor_p.html index 865fd1c31..b98a36a12 100644 --- a/htroot/ProxyIndexingMonitor_p.html +++ b/htroot/ProxyIndexingMonitor_p.html @@ -19,7 +19,7 @@ <table border="0" cellpadding="5" cellspacing="1">
<tr class="TableCellDark">
<td colspan="3"><strong>Proxy Auto Config:</strong>
- this controls the proxy auto configuration script for browsers at http://localhost:8080/autoconfig.pac
+ this controls the proxy auto configuration script for browsers at http://localhost:8090/autoconfig.pac
</td>
</tr>
<tr valign="top" class="TableCellLight">
diff --git a/htroot/QuickCrawlLink_p.java b/htroot/QuickCrawlLink_p.java index 5226f0c92..7c4ec4d40 100644 --- a/htroot/QuickCrawlLink_p.java +++ b/htroot/QuickCrawlLink_p.java @@ -51,7 +51,7 @@ public class QuickCrawlLink_p { /**
* Example Javascript to call this servlet:
- * <code>javascript:w = window.open('http://user:pwd@localhost:8080/QuickCrawlLink_p.html?indexText=on&indexMedia=on&crawlingQ=on&xdstopw=on&title=' + escape(document.title) + '&url=' + location.href,'_blank','height=150,width=500,resizable=yes,scrollbar=no,directory=no,menubar=no,location=no'); w.focus();</code>
+ * <code>javascript:w = window.open('http://user:pwd@localhost:8090/QuickCrawlLink_p.html?indexText=on&indexMedia=on&crawlingQ=on&xdstopw=on&title=' + escape(document.title) + '&url=' + location.href,'_blank','height=150,width=500,resizable=yes,scrollbar=no,directory=no,menubar=no,location=no'); w.focus();</code>
* @param header the complete HTTP header of the request
* @param post any arguments for this servlet, the request carried with (GET as well as POST)
* @param env the serverSwitch object holding all runtime-data
diff --git a/htroot/Settings_ProxyAccess.inc b/htroot/Settings_ProxyAccess.inc index 358cfc5fd..4306a64eb 100644 --- a/htroot/Settings_ProxyAccess.inc +++ b/htroot/Settings_ProxyAccess.inc @@ -11,10 +11,10 @@ You have four possibilities to specify the address:
</p>
<ul>
- <li>defining a port only (<em>e.g. 8080</em>)</li>
- <li>defining IP address and port (<em>e.g. 192.168.0.1:8080</em>)</li>
- <li>defining host name and port (<em>e.g. home:8080</em>)</li>
- <li>defining interface name and port (<em>e.g. #eth0:8080</em>)</li>
+ <li>defining a port only (<em>e.g. 8090</em>)</li>
+ <li>defining IP address and port (<em>e.g. 192.168.0.1:8090</em>)</li>
+ <li>defining host name and port (<em>e.g. home:8090</em>)</li>
+ <li>defining interface name and port (<em>e.g. #eth0:8090</em>)</li>
</ul>
<p><em>Hint: Dont forget to change your firewall configuration after you have changed the port.</em></p>
<table border="0" cellspacing="5">
diff --git a/htroot/Settings_p.java b/htroot/Settings_p.java index 09072dc14..0980cb1ee 100644 --- a/htroot/Settings_p.java +++ b/htroot/Settings_p.java @@ -76,7 +76,7 @@ public final class Settings_p { prop.put("settingsTables", "");
}
- prop.put("port", env.getConfig("port", "8080"));
+ prop.put("port", env.getConfig("port", "8090"));
prop.putHTML("peerName", sb.peers.mySeed().getName());
prop.putHTML("staticIP", env.getConfig("staticIP", ""));
diff --git a/htroot/Status.html b/htroot/Status.html index b226a4d6e..d40bdf639 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -83,7 +83,7 @@ A possible reason is that you are behind a firewall, NAT or Router.
But you can <a href="index.html">search the internet</a> using the other peers'
global index on your own search page.
- We encourage you to open your firewall for the port you configured (usually: 8080),
+ We encourage you to open your firewall for the port you configured (usually: 8090),
or to set up a 'virtual server' in your router settings (often called DMZ).
Please be fair, contribute your own index to the global index.
</dd>
diff --git a/htroot/Status.java b/htroot/Status.java index 988f02195..60dd20f4f 100644 --- a/htroot/Status.java +++ b/htroot/Status.java @@ -177,7 +177,7 @@ public class Status { }
// hostname and port
- final String extendedPortString = sb.getConfig("port", "8080");
+ final String extendedPortString = sb.getConfig("port", "8090");
final int pos = extendedPortString.indexOf(":");
prop.put("port",serverCore.getPortNr(extendedPortString));
if (pos != -1) {
diff --git a/htroot/Table_API_p.java b/htroot/Table_API_p.java index e33927f4a..94c4967d8 100644 --- a/htroot/Table_API_p.java +++ b/htroot/Table_API_p.java @@ -144,7 +144,7 @@ public class Table_API_p { } // now call the api URLs and store the result status - Map<String, Integer> l = sb.tables.execAPICalls("localhost", (int) sb.getConfigLong("port", 8080), sb.getConfig("adminAccountBase64MD5", ""), pks); + Map<String, Integer> l = sb.tables.execAPICalls("localhost", (int) sb.getConfigLong("port", 8090), sb.getConfig("adminAccountBase64MD5", ""), pks); // construct result table prop.put("showexec", l.size() > 0 ? 1 : 0); @@ -217,7 +217,7 @@ public class Table_API_p { prop.put("showtable_list_" + count + "_repeatTime", time); prop.put("showtable_list_" + count + "_type", row.get(WorkTables.TABLE_API_COL_TYPE)); prop.put("showtable_list_" + count + "_comment", row.get(WorkTables.TABLE_API_COL_COMMENT)); - prop.putHTML("showtable_list_" + count + "_inline_url", "http://" + sb.myPublicIP() + ":" + sb.getConfig("port", "8080") + new String(row.get(WorkTables.TABLE_API_COL_URL))); + prop.putHTML("showtable_list_" + count + "_inline_url", "http://" + sb.myPublicIP() + ":" + sb.getConfig("port", "8090") + new String(row.get(WorkTables.TABLE_API_COL_URL))); if (time == 0) { prop.put("showtable_list_" + count + "_scheduler", 0); diff --git a/htroot/mediawiki_p.java b/htroot/mediawiki_p.java index c9fb2e2b7..87d8eaa39 100644 --- a/htroot/mediawiki_p.java +++ b/htroot/mediawiki_p.java @@ -36,7 +36,7 @@ import de.anomic.server.serverSwitch; public class mediawiki_p { - //http://localhost:8080/mediawiki_p.html?dump=wikipedia.de.xml&title=Kartoffel + //http://localhost:8090/mediawiki_p.html?dump=wikipedia.de.xml&title=Kartoffel public static serverObjects respond(final RequestHeader header, serverObjects post, final serverSwitch env) throws IOException { final Switchboard sb = (Switchboard) env; final serverObjects prop = new serverObjects(); diff --git a/htroot/opensearchdescription.java b/htroot/opensearchdescription.java index 7d0529bfe..6e674231d 100644 --- a/htroot/opensearchdescription.java +++ b/htroot/opensearchdescription.java @@ -40,7 +40,7 @@ public class opensearchdescription { if (env.getConfigBool(SwitchboardConstants.GREETING_NETWORK_NAME, false)) promoteSearchPageGreeting = env.getConfig("network.unit.description", ""); String thisaddress = header.get("Host", "localhost"); - if (thisaddress.indexOf(':') == -1) thisaddress += ":" + serverCore.getPortNr(env.getConfig("port", "8080")); + if (thisaddress.indexOf(':') == -1) thisaddress += ":" + serverCore.getPortNr(env.getConfig("port", "8090")); int compareyacy = 0; if (post != null && post.get("compare_yacy", "false").equals("true")) diff --git a/htroot/processing/domaingraph/applet/domaingraph.java b/htroot/processing/domaingraph/applet/domaingraph.java index 50a27df77..f4bf3d7d3 100755 --- a/htroot/processing/domaingraph/applet/domaingraph.java +++ b/htroot/processing/domaingraph/applet/domaingraph.java @@ -56,7 +56,7 @@ public void setup() { } catch (NullPointerException e) {} if (url == null) { host="localhost"; - port=8080; + port=8090; } else { host=url.getHost(); port=url.getPort(); diff --git a/htroot/processing/domaingraph/applet/domaingraph.pde b/htroot/processing/domaingraph/applet/domaingraph.pde index 1dfbb495a..514c5f661 100755 --- a/htroot/processing/domaingraph/applet/domaingraph.pde +++ b/htroot/processing/domaingraph/applet/domaingraph.pde @@ -56,7 +56,7 @@ void setup() { } catch (NullPointerException e) {} if (url == null) { host="localhost"; - port=8080; + port=8090; } else { host=url.getHost(); port=url.getPort(); diff --git a/htroot/processing/domaingraph/domaingraph.pde b/htroot/processing/domaingraph/domaingraph.pde index 1dfbb495a..514c5f661 100755 --- a/htroot/processing/domaingraph/domaingraph.pde +++ b/htroot/processing/domaingraph/domaingraph.pde @@ -56,7 +56,7 @@ void setup() { } catch (NullPointerException e) {} if (url == null) { host="localhost"; - port=8080; + port=8090; } else { host=url.getHost(); port=url.getPort(); diff --git a/htroot/rssTerminal.html b/htroot/rssTerminal.html index 5da249751..5ac9a22ed 100755 --- a/htroot/rssTerminal.html +++ b/htroot/rssTerminal.html @@ -41,7 +41,7 @@ var requestCount = 0; function fillLines() {
alert(maxlines);
for (var i = 0; i < maxlines + 1; i++) {
- alert(maxlines);http://localhost:8080/Steering.html?shutdown=
+ alert(maxlines);http://localhost:8090/Steering.html?shutdown=
addLine(i + "-123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789-");
//addLine("");
}
diff --git a/htroot/sharedBlacklist_p.java b/htroot/sharedBlacklist_p.java index a07c52e7f..00cbb6ded 100644 --- a/htroot/sharedBlacklist_p.java +++ b/htroot/sharedBlacklist_p.java @@ -122,7 +122,7 @@ public class sharedBlacklist_p { final yacySeed seed = sb.peers.getConnected(Hash);
if (seed != null) {
final String IP = seed.getIP();
- final String Port = seed.get(yacySeed.PORT, "8080");
+ final String Port = seed.get(yacySeed.PORT, "8090");
final String peerName = seed.get(yacySeed.NAME, "<" + IP + ":" + Port + ">");
prop.putHTML("page_source", peerName);
downloadURLOld = "http://" + IP + ":" + Port + "/yacy/list.html?col=black";
diff --git a/htroot/test.java b/htroot/test.java index ec03dd5a8..a727fbf09 100644 --- a/htroot/test.java +++ b/htroot/test.java @@ -10,7 +10,7 @@ import de.anomic.server.serverSwitch; public class test { - // http://localhost:8080/test.xml?count=10 + // http://localhost:8090/test.xml?count=10 public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) { final serverObjects prop = new serverObjects(); diff --git a/htroot/www/welcome.java b/htroot/www/welcome.java index 2224033c6..e94e1b592 100644 --- a/htroot/www/welcome.java +++ b/htroot/www/welcome.java @@ -55,7 +55,7 @@ public class welcome { prop.putHTML("peeraddress", sb.peers.mySeed().getPublicAddress());
prop.put("hostname", env.myPublicIP());
prop.put("hostip", Domains.dnsResolve(env.myPublicIP()).getHostAddress());
- prop.put("port", serverCore.getPortNr(env.getConfig("port","8080")));
+ prop.put("port", serverCore.getPortNr(env.getConfig("port","8090")));
prop.put("clientip", header.get(HeaderFramework.CONNECTION_PROP_CLIENTIP, ""));
final String peertype = (sb.peers.mySeed() == null) ? yacySeed.PEERTYPE_JUNIOR : sb.peers.mySeed().get(yacySeed.PEERTYPE, yacySeed.PEERTYPE_VIRGIN);
diff --git a/htroot/yacy/hello.java b/htroot/yacy/hello.java index b6b3d1340..08e542806 100644 --- a/htroot/yacy/hello.java +++ b/htroot/yacy/hello.java @@ -52,8 +52,8 @@ import de.anomic.yacy.dht.PeerSelection; public final class hello {
// example:
- // http://localhost:8080/yacy/hello.html?count=1&seed=p|{Hash=sCJ6Tq8T0N9x,IPType=∅,Port=8080,IP=,Uptime=8,rI=190,Version=0.10004882,PeerType=junior,UTC=+0200,RCount=0,sI=0,LastSeen=20080605103333,Name=intratest,CCount=5.0,SCount=40,news=,USpeed=0,CRTCnt=0,CRWCnt=0,BDate=20080605081349,rU=190,LCount=187,dct=1212668923654,ICount=2,sU=0,ISpeed=0,RSpeed=0.0,NCount=0,Flags=oooo}
- // http://localhost:8080/yacy/hello.html?count=10&seed=z|H4sIAAAAAAAAADWQW2vDMAyF_81eJork3GyGX-YxGigly2WFvZTQijbQJsHx1pWx_z7nMj1J4ug7B_2s6-GsP5q3G-G6vBz2e0iz8t6zfuBr7-5PUNanQfulhqyzTkuUCFXvmitrBJtq4ed3tkPTtRpXhIiRDAmq0uhHFIiQMduJ-NXYU9NCbrrP1vnjIdUqgk09uIK51V6rMBRIilAo2NajwzfhGcx8QUKsEIp5iCJo-eaTVUXPfPQ4k5dm4pp8NzaESsLzS-14QVNIMlA-ka2m1JuZJJWIBRwPo0GIIiYp4zCSkC5GQSLiJIah0p6X_rvlS-MTbWdhkCSBIni9jA_rfP3-Ae1Oye9dAQAA
+ // http://localhost:8090/yacy/hello.html?count=1&seed=p|{Hash=sCJ6Tq8T0N9x,IPType=∅,Port=8090,IP=,Uptime=8,rI=190,Version=0.10004882,PeerType=junior,UTC=+0200,RCount=0,sI=0,LastSeen=20080605103333,Name=intratest,CCount=5.0,SCount=40,news=,USpeed=0,CRTCnt=0,CRWCnt=0,BDate=20080605081349,rU=190,LCount=187,dct=1212668923654,ICount=2,sU=0,ISpeed=0,RSpeed=0.0,NCount=0,Flags=oooo}
+ // http://localhost:8090/yacy/hello.html?count=10&seed=z|H4sIAAAAAAAAADWQW2vDMAyF_81eJork3GyGX-YxGigly2WFvZTQijbQJsHx1pWx_z7nMj1J4ug7B_2s6-GsP5q3G-G6vBz2e0iz8t6zfuBr7-5PUNanQfulhqyzTkuUCFXvmitrBJtq4ed3tkPTtRpXhIiRDAmq0uhHFIiQMduJ-NXYU9NCbrrP1vnjIdUqgk09uIK51V6rMBRIilAo2NajwzfhGcx8QUKsEIp5iCJo-eaTVUXPfPQ4k5dm4pp8NzaESsLzS-14QVNIMlA-ka2m1JuZJJWIBRwPo0GIIiYp4zCSkC5GQSLiJIah0p6X_rvlS-MTbWdhkCSBIni9jA_rfP3-Ae1Oye9dAQAA
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch env) throws InterruptedException {
final Switchboard sb = (Switchboard) env;
final serverObjects prop = new serverObjects();
diff --git a/htroot/yacy/query.java b/htroot/yacy/query.java index f2694283a..714193d54 100644 --- a/htroot/yacy/query.java +++ b/htroot/yacy/query.java @@ -43,7 +43,7 @@ import de.anomic.yacy.yacyNetwork; public final class query {
// example:
- // http://localhost:8080/yacy/query.html?youare=sCJ6Tq8T0N9x&object=lurlcount
+ // http://localhost:8090/yacy/query.html?youare=sCJ6Tq8T0N9x&object=lurlcount
public static serverObjects respond(final RequestHeader header, final serverObjects post, final serverSwitch ss) {
if (post == null || ss == null) { return null; }
diff --git a/htroot/yacy/search.java b/htroot/yacy/search.java index a188f5c65..ae89d4942 100644 --- a/htroot/yacy/search.java +++ b/htroot/yacy/search.java @@ -126,13 +126,13 @@ public final class search { // Date remoteTime = yacyCore.parseUniversalDate((String) post.get(yacySeed.MYTIME)); // read remote time
// test:
- // http://localhost:8080/yacy/search.html?query=4galTpdpDM5Q (search for linux)
- // http://localhost:8080/yacy/search.html?query=gh8DKIhGKXws (search for book)
- // http://localhost:8080/yacy/search.html?query=UEhMGfGv2vOE (search for kernel)
- // http://localhost:8080/yacy/search.html?query=ZX-LjaYo74PP (search for help)
- // http://localhost:8080/yacy/search.html?query=uDqIalxDfM2a (search for mail)
- // http://localhost:8080/yacy/search.html?query=4galTpdpDM5Qgh8DKIhGKXws&abstracts=auto (search for linux and book, generate abstract automatically)
- // http://localhost:8080/yacy/search.html?query=&abstracts=4galTpdpDM5Q (only abstracts for linux)
+ // http://localhost:8090/yacy/search.html?query=4galTpdpDM5Q (search for linux)
+ // http://localhost:8090/yacy/search.html?query=gh8DKIhGKXws (search for book)
+ // http://localhost:8090/yacy/search.html?query=UEhMGfGv2vOE (search for kernel)
+ // http://localhost:8090/yacy/search.html?query=ZX-LjaYo74PP (search for help)
+ // http://localhost:8090/yacy/search.html?query=uDqIalxDfM2a (search for mail)
+ // http://localhost:8090/yacy/search.html?query=4galTpdpDM5Qgh8DKIhGKXws&abstracts=auto (search for linux and book, generate abstract automatically)
+ // http://localhost:8090/yacy/search.html?query=&abstracts=4galTpdpDM5Q (only abstracts for linux)
if ((sb.isRobinsonMode()) &&
(!((sb.isPublicRobinson()) ||
diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java index 61efec208..2b2702a5c 100644 --- a/htroot/yacysearch.java +++ b/htroot/yacysearch.java @@ -693,7 +693,7 @@ public class yacysearch { // adding some additional properties needed for the rss feed
String hostName = header.get("Host", "localhost");
- if (hostName.indexOf(':') == -1) hostName += ":" + serverCore.getPortNr(env.getConfig("port", "8080"));
+ if (hostName.indexOf(':') == -1) hostName += ":" + serverCore.getPortNr(env.getConfig("port", "8090"));
prop.put("searchBaseURL", "http://" + hostName + "/yacysearch.html");
prop.put("rssYacyImageURL", "http://" + hostName + "/env/grafics/yacy.gif");
}
diff --git a/htroot/yacysearch_location.java b/htroot/yacysearch_location.java index c1d0e2c05..a4c2d2038 100644 --- a/htroot/yacysearch_location.java +++ b/htroot/yacysearch_location.java @@ -64,7 +64,7 @@ public class yacysearch_location { boolean search_subject = search_mdall || post.get("dom", "").indexOf("subject") >= 0; long maximumTime = post.getLong("maximumTime", 3000); int maximumRecords = post.getInt("maximumRecords", 200); - //i.e. http://localhost:8080/yacysearch_location.kml?query=berlin&maximumTime=2000&maximumRecords=100 + //i.e. http://localhost:8090/yacysearch_location.kml?query=berlin&maximumTime=2000&maximumRecords=100 int placemarkCounter = 0; if (search_query) { @@ -91,7 +91,7 @@ public class yacysearch_location { if (search_title || search_publisher || search_creator || search_subject) try { // get a queue of search results - String rssSearchServiceURL = "http://localhost:" + sb.getConfig("port", "8080") + "/yacysearch.rss"; + String rssSearchServiceURL = "http://localhost:" + sb.getConfig("port", "8090") + "/yacysearch.rss"; BlockingQueue<RSSMessage> results = new LinkedBlockingQueue<RSSMessage>(); SearchSRURSS.searchSRURSS(results, rssSearchServiceURL, query, maximumTime, Integer.MAX_VALUE, false, false, null); @@ -137,7 +137,7 @@ public class yacysearch_location { String promoteSearchPageGreeting = env.getConfig(SwitchboardConstants.GREETING, ""); if (env.getConfigBool(SwitchboardConstants.GREETING_NETWORK_NAME, false)) promoteSearchPageGreeting = env.getConfig("network.unit.description", ""); String hostName = header.get("Host", "localhost"); - if (hostName.indexOf(':') == -1) hostName += ":" + serverCore.getPortNr(env.getConfig("port", "8080")); + if (hostName.indexOf(':') == -1) hostName += ":" + serverCore.getPortNr(env.getConfig("port", "8090")); final String originalquerystring = (post == null) ? "" : post.get("query", post.get("search", "")).trim(); // SRU compliance final boolean global = post.get("kml_resource", "local").equals("global"); |
