Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge rc1/master

Browse Source
This commit is contained in:
reger 2013-10-16 03:02:21 +02:00
commit 1adb4b8741
17 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.classpath
View File

@ -45,9 +45,9 @@
<classpathentry kind="lib" path="lib/wstx-asl-3.2.9.jar"/>
<classpathentry kind="lib" path="lib/slf4j-jdk14-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/log4j-over-slf4j-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.3.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.3.1.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.3.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.3.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.3.1.jar"/>
<classpathentry kind="lib" path="lib/noggit-0.5.jar"/>
<classpathentry kind="lib" path="lib/metadata-extractor-2.6.2.jar"/>
<classpathentry kind="lib" path="lib/jcifs-1.3.17.jar"/>

4
addon/YaCy.app/Contents/Info.plist
View File

@ -62,9 +62,9 @@
<string>$JAVAROOT/lib/geronimo-stax-api_1.0_spec-1.0.1.jar</string>
<string>$JAVAROOT/lib/guava-13.0.1.jar</string>
<string>$JAVAROOT/lib/htmllexer.jar</string>
<string>$JAVAROOT/lib/httpclient-4.3.jar</string>
<string>$JAVAROOT/lib/httpclient-4.3.1.jar</string>
<string>$JAVAROOT/lib/httpcore-4.3.jar</string>
<string>$JAVAROOT/lib/httpmime-4.3.jar</string>
<string>$JAVAROOT/lib/httpmime-4.3.1.jar</string>
<string>$JAVAROOT/lib/icu4j-core.jar</string>
<string>$JAVAROOT/lib/iri-0.8.jar</string>
<string>$JAVAROOT/lib/J7Zip-modified.jar</string>

4
build.xml
View File

@ -187,9 +187,9 @@
<pathelement location="${lib}/geronimo-stax-api_1.0_spec-1.0.1.jar" />
<pathelement location="${lib}/guava-13.0.1.jar" />
<pathelement location="${lib}/htmllexer.jar" />
<pathelement location="${lib}/httpclient-4.3.jar" />
<pathelement location="${lib}/httpclient-4.3.1.jar" />
<pathelement location="${lib}/httpcore-4.3.jar" />
<pathelement location="${lib}/httpmime-4.3.jar" />
<pathelement location="${lib}/httpmime-4.3.1.jar" />
<pathelement location="${lib}/icu4j-core.jar" />
<pathelement location="${lib}/iri-0.8.jar" />
<pathelement location="${lib}/J7Zip-modified.jar" />

22
htroot/Blacklist_p.java
View File

@ -124,7 +124,7 @@ public class Blacklist_p {
blacklistToUse = post.get("newListName", "").trim();
if (blacklistToUse.isEmpty()) {
prop.put("LOCATION","");
prop.put(serverObjects.ACTION_LOCATION,"");
return prop;
}
@ -171,7 +171,7 @@ public class Blacklist_p {
blacklistToUse = post.get("selectedListName");
if (blacklistToUse == null || blacklistToUse.isEmpty()) {
prop.put("LOCATION","");
prop.put(serverObjects.ACTION_LOCATION,"");
return prop;
}
@ -199,7 +199,7 @@ public class Blacklist_p {
blacklistToUse = post.get("selectedListName", "").trim();
if (blacklistToUse == null || blacklistToUse.isEmpty()) {
prop.put("LOCATION", "");
prop.put(serverObjects.ACTION_LOCATION, "");
return prop;
}
@ -222,7 +222,7 @@ public class Blacklist_p {
blacklistToUse = post.get("selectedListName", "").trim();
if (blacklistToUse == null || blacklistToUse.isEmpty()) {
prop.put("LOCATION", "");
prop.put(serverObjects.ACTION_LOCATION, "");
return prop;
}
@ -246,7 +246,7 @@ public class Blacklist_p {
String temp = null;
for (final String selectedBlacklistEntry : selectedBlacklistEntries) {
if ((temp = deleteBlacklistEntry(blacklistToUse, selectedBlacklistEntry, header)) != null) {
prop.put("LOCATION", temp);
prop.put(serverObjects.ACTION_LOCATION, temp);
return prop;
}
}
@ -269,7 +269,7 @@ public class Blacklist_p {
final String temp = addBlacklistEntry(blacklistToUse, blentry, header);
if (temp != null) {
prop.put("LOCATION", temp);
prop.put(serverObjects.ACTION_LOCATION, temp);
return prop;
}
@ -295,12 +295,12 @@ public class Blacklist_p {
String temp;
for (final String selectedBlacklistEntry : selectedBlacklistEntries) {
if ((temp = addBlacklistEntry(targetBlacklist, selectedBlacklistEntry, header)) != null) {
prop.put("LOCATION", temp);
prop.put(serverObjects.ACTION_LOCATION, temp);
return prop;
}
if ((temp = deleteBlacklistEntry(blacklistToUse, selectedBlacklistEntry, header)) != null) {
prop.put("LOCATION", temp);
prop.put(serverObjects.ACTION_LOCATION, temp);
return prop;
}
@ -326,7 +326,7 @@ public class Blacklist_p {
final String[] selectedBlacklistEntries = post.getAll("selectedBlacklistEntry.*");
if (selectedBlacklistEntries.length != editedBlacklistEntries.length) {
prop.put("LOCATION", "");
prop.put(serverObjects.ACTION_LOCATION, "");
return prop;
}
@ -337,12 +337,12 @@ public class Blacklist_p {
if (!selectedBlacklistEntries[i].equals(editedBlacklistEntries[i])) {
if ((temp = deleteBlacklistEntry(blacklistToUse, selectedBlacklistEntries[i], header)) != null) {
prop.put("LOCATION", temp);
prop.put(serverObjects.ACTION_LOCATION, temp);
return prop;
}
if ((temp = addBlacklistEntry(blacklistToUse, editedBlacklistEntries[i], header)) != null) {
prop.put("LOCATION", temp);
prop.put(serverObjects.ACTION_LOCATION, temp);
return prop;
}
}

4
htroot/BlogComments.java
View File

@ -129,7 +129,7 @@ public class BlogComments {
blogEntry.addComment(commentID);
sb.blogDB.writeBlogEntry(blogEntry);
sb.blogCommentDB.write(sb.blogCommentDB.newEntry(commentID, subject, author, ip, date, content));
prop.putHTML("LOCATION","BlogComments.html?page=" + pagename);
prop.putHTML(serverObjects.ACTION_LOCATION,"BlogComments.html?page=" + pagename);
MessageBoard.entry msgEntry = sb.messageDB.newEntry(
"blogComment",
@ -179,7 +179,7 @@ public class BlogComments {
// show blog-entry/entries
prop.put("mode", "0"); //viewing
if("blog_default".equals(pagename)) {
prop.put("LOCATION","Blog.html");
prop.put(serverObjects.ACTION_LOCATION,"Blog.html");
} else {
//show 1 blog entry
prop.put("mode_pageid", page.getKey());

2
htroot/Connections_p.java
View File

@ -65,7 +65,7 @@ public final class Connections_p {
if (post.containsKey("closeServerSession")) {
final String sessionName = post.get("closeServerSession", null);
sb.closeSessions(sessionName);
prop.put("LOCATION","");
prop.put(serverObjects.ACTION_LOCATION,"");
return prop;
}
} else {

4
htroot/Status.java
View File

@ -81,7 +81,7 @@ public class Status
}
boolean redirect = false;
if ( post.containsKey("login") ) {
prop.put("LOCATION", "");
prop.put(serverObjects.ACTION_LOCATION, "");
return prop;
} else if ( post.containsKey("pauseCrawlJob") ) {
final String jobType = post.get("jobType");
@ -113,7 +113,7 @@ public class Status
}
if ( redirect ) {
prop.put("LOCATION", "");
prop.put(serverObjects.ACTION_LOCATION, "");
return prop;
}
}

4
htroot/User.java
View File

@ -120,7 +120,7 @@ public class User{
prop.put("logged-in_identified-by", "1");
prop.putHTML("logged-in_username", username);
if(post.containsKey("returnto")){
prop.put("LOCATION", post.get("returnto"));
prop.put(serverObjects.ACTION_LOCATION, post.get("returnto"));
}
}
}
@ -160,7 +160,7 @@ public class User{
prop.authenticationRequired();
}
if(post.containsKey("returnto")){
prop.put("LOCATION", post.get("returnto"));
prop.put(serverObjects.ACTION_LOCATION, post.get("returnto"));
}
}
// return rewrite properties

4
htroot/Wiki.java
View File

@ -123,8 +123,8 @@ public class Wiki {
sb.peers.newsPool.publishMyNews(sb.peers.mySeed(), NewsPool.CATEGORY_WIKI_UPDATE, map);
}
page = newEntry;
prop.putHTML("LOCATION", "/Wiki.html?page=" + pagename);
prop.put("LOCATION", prop.get("LOCATION"));
prop.putHTML(serverObjects.ACTION_LOCATION, "/Wiki.html?page=" + pagename);
prop.put(serverObjects.ACTION_LOCATION, prop.get(serverObjects.ACTION_LOCATION));
}
if (post != null && post.containsKey("edit")) {

2
htroot/sharedBlacklist_p.java
View File

@ -242,7 +242,7 @@ public class sharedBlacklist_p {
* turn the ampersand into &amp; which renders the parameters
* useless (at least when using Opera 9.53, haven't tested other browsers)
*/
prop.put("LOCATION","Blacklist_p.html?selectedListName=" + CharacterCoding.unicode2html(selectedBlacklistName, true) + "&selectList=select");
prop.put(serverObjects.ACTION_LOCATION,"Blacklist_p.html?selectedListName=" + CharacterCoding.unicode2html(selectedBlacklistName, true) + "&selectList=select");
return prop;
}

2
lib/dependencies.txt
View File

@ -22,7 +22,7 @@ commons-io-2.1.jar
commons-lang-2.6.jar
geronimo-stax-api_1.0_spec-1.0.1.jar
guava-r05.jar
httpclient-4.3.jar
httpclient-4.3.1.jar
httpcore-4.3.jar
jcl-over-slf4j-1.6.1.jar
log4j-over-slf4j-1.6.1.jar

0
lib/httpclient-4.3.License → lib/httpclient-4.3.1.License
View File

BIN
lib/httpclient-4.3.jar → lib/httpclient-4.3.1.jar
View File

Binary file not shown.

0
lib/httpmime-4.3.License → lib/httpmime-4.3.1.License
View File

BIN
lib/httpmime-4.3.jar → lib/httpmime-4.3.1.jar
View File

Binary file not shown.

2
nbproject/project.xml
View File

@ -73,7 +73,7 @@
<compilation-unit>
<package-root>source</package-root>
<package-root>htroot</package-root>
<classpath mode="compile">lib/activation.jar;lib/apache-mime4j-0.6.jar;lib/arq-2.8.7.jar;lib/bcmail-jdk15-145.jar;lib/bcprov-jdk15-145.jar;lib/commons-codec-1.7.jar;lib/commons-compress-1.4.1.jar;lib/commons-fileupload-1.2.2.jar;lib/commons-httpclient-3.1.jar;lib/commons-io-2.1.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.1.3.jar;lib/fontbox-1.7.1.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-13.0.1.jar;lib/htmllexer.jar;lib/httpclient-4.3.jar;lib/httpcore-4.3.jar;lib/httpmime-4.3.jar;lib/icu4j-core.jar;lib/iri-0.8.jar;lib/J7Zip-modified.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/jcifs-1.3.15.jar;lib/jcl-over-slf4j-1.7.2.jar;lib/jempbox-1.7.1.jar;lib/jena-2.6.4.jar;lib/jsch-0.1.42.jar;lib/json-simple-1.1.jar;lib/jsoup-1.6.3.jar;lib/log4j-1.2.17.jar;lib/log4j-over-slf4j-1.7.2.jar;lib/lucene-analyzers-common-4.2.1.jar;lib/lucene-analyzers-phonetic-4.2.1.jar;lib/lucene-core-4.2.1.jar;lib/lucene-misc-4.2.1.jar;lib/lucene-spatial-4.2.1.jar;lib/metadata-extractor-2.4.0-beta-1.jar;lib/mysql-connector-java-5.1.12-bin.jar;lib/pdfbox-1.7.1.jar;lib/poi-3.6-20091214.jar;lib/poi-scratchpad-3.6-20091214.jar;lib/sax-2.0.1.jar;lib/servlet-api-2.5-20081211.jar;lib/slf4j-api-1.7.2.jar;lib/slf4j-jdk14-1.7.2.jar;lib/solr-core-4.2.1.jar;lib/solr-solrj-4.2.1.jar;lib/spatial4j-0.3.jar;lib/webcat-0.1-swf.jar;lib/wstx-asl-3.2.7.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/zookeeper-3.4.5.jar</classpath>
<classpath mode="compile">lib/activation.jar;lib/apache-mime4j-0.6.jar;lib/arq-2.8.7.jar;lib/bcmail-jdk15-145.jar;lib/bcprov-jdk15-145.jar;lib/commons-codec-1.7.jar;lib/commons-compress-1.4.1.jar;lib/commons-fileupload-1.2.2.jar;lib/commons-httpclient-3.1.jar;lib/commons-io-2.1.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.1.3.jar;lib/fontbox-1.7.1.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-13.0.1.jar;lib/htmllexer.jar;lib/httpclient-4.3.1.jar;lib/httpcore-4.3.jar;lib/httpmime-4.3.1.jar;lib/icu4j-core.jar;lib/iri-0.8.jar;lib/J7Zip-modified.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/jcifs-1.3.15.jar;lib/jcl-over-slf4j-1.7.2.jar;lib/jempbox-1.7.1.jar;lib/jena-2.6.4.jar;lib/jsch-0.1.42.jar;lib/json-simple-1.1.jar;lib/jsoup-1.6.3.jar;lib/log4j-1.2.17.jar;lib/log4j-over-slf4j-1.7.2.jar;lib/lucene-analyzers-common-4.2.1.jar;lib/lucene-analyzers-phonetic-4.2.1.jar;lib/lucene-core-4.2.1.jar;lib/lucene-misc-4.2.1.jar;lib/lucene-spatial-4.2.1.jar;lib/metadata-extractor-2.4.0-beta-1.jar;lib/mysql-connector-java-5.1.12-bin.jar;lib/pdfbox-1.7.1.jar;lib/poi-3.6-20091214.jar;lib/poi-scratchpad-3.6-20091214.jar;lib/sax-2.0.1.jar;lib/servlet-api-2.5-20081211.jar;lib/slf4j-api-1.7.2.jar;lib/slf4j-jdk14-1.7.2.jar;lib/solr-core-4.2.1.jar;lib/solr-solrj-4.2.1.jar;lib/spatial4j-0.3.jar;lib/webcat-0.1-swf.jar;lib/wstx-asl-3.2.7.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/zookeeper-3.4.5.jar</classpath>
<source-level>1.6</source-level>
</compilation-unit>
</java-data>

5
source/net/yacy/server/http/HTTPDProxyHandler.java
View File

@ -88,6 +88,7 @@ import net.yacy.document.parser.html.ContentTransformer;
import net.yacy.document.parser.html.Transformer;
import net.yacy.kelondro.io.ByteCountOutputStream;
import net.yacy.kelondro.util.FileUtils;
import net.yacy.peers.operation.yacyBuildProperties;
import net.yacy.repository.Blacklist.BlacklistType;
import net.yacy.search.Switchboard;
import net.yacy.search.SwitchboardConstants;
@ -1208,7 +1209,7 @@ public final class HTTPDProxyHandler {
viaValue
.append(httpVer).append(" ")
.append(myAddress).append(" ")
.append("(YaCy ").append(sb.getConfig("vString", "0.0")).append(")");
.append("(YaCy ").append(yacyBuildProperties.getVersion()).append(")");
// storing header back
header.put(HeaderFramework.VIA, viaValue.toString());
@ -1572,7 +1573,7 @@ public final class HTTPDProxyHandler {
userAgentStr
.append(browserUserAgent.substring(0,pos))
.append("; YaCy ")
.append(sb.getConfig("vString","0.1"))
.append(yacyBuildProperties.getVersion())
.append("; yacy.net")
.append(browserUserAgent.substring(pos));
} else {