diff --git a/source/de/anomic/crawler/RobotsTxt.java b/source/de/anomic/crawler/RobotsTxt.java index d108c621a..c41fbf44e 100644 --- a/source/de/anomic/crawler/RobotsTxt.java +++ b/source/de/anomic/crawler/RobotsTxt.java @@ -48,9 +48,9 @@ import net.yacy.kelondro.util.kelondroException; import de.anomic.crawler.retrieval.HTTPLoader; import de.anomic.http.client.Client; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; -import de.anomic.http.metadata.ResponseContainer; +import de.anomic.http.server.HeaderFramework; +import de.anomic.http.server.RequestHeader; +import de.anomic.http.server.ResponseContainer; public class RobotsTxt { diff --git a/source/de/anomic/crawler/retrieval/FTPLoader.java b/source/de/anomic/crawler/retrieval/FTPLoader.java index aa5b295b0..0ebfea3fc 100644 --- a/source/de/anomic/crawler/retrieval/FTPLoader.java +++ b/source/de/anomic/crawler/retrieval/FTPLoader.java @@ -38,9 +38,9 @@ import net.yacy.kelondro.util.DateFormatter; import de.anomic.crawler.Latency; import de.anomic.document.Parser; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; -import de.anomic.http.metadata.ResponseHeader; +import de.anomic.http.server.HeaderFramework; +import de.anomic.http.server.RequestHeader; +import de.anomic.http.server.ResponseHeader; import de.anomic.net.ftpc; import de.anomic.search.Segments; import de.anomic.search.Switchboard; diff --git a/source/de/anomic/crawler/retrieval/HTTPLoader.java b/source/de/anomic/crawler/retrieval/HTTPLoader.java index a1d6249b1..027bbb38b 100644 --- a/source/de/anomic/crawler/retrieval/HTTPLoader.java +++ b/source/de/anomic/crawler/retrieval/HTTPLoader.java @@ -35,9 +35,9 @@ import de.anomic.crawler.Latency; import de.anomic.data.Blacklist; import de.anomic.document.Parser; import de.anomic.http.client.Client; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; -import de.anomic.http.metadata.ResponseContainer; +import de.anomic.http.server.HeaderFramework; +import de.anomic.http.server.RequestHeader; +import de.anomic.http.server.ResponseContainer; import de.anomic.search.Segments; import de.anomic.search.Switchboard; diff --git a/source/de/anomic/crawler/retrieval/LoaderDispatcher.java b/source/de/anomic/crawler/retrieval/LoaderDispatcher.java index 546106dac..93bc154ae 100644 --- a/source/de/anomic/crawler/retrieval/LoaderDispatcher.java +++ b/source/de/anomic/crawler/retrieval/LoaderDispatcher.java @@ -43,9 +43,9 @@ import de.anomic.crawler.CrawlProfile; import de.anomic.document.Document; import de.anomic.document.ParserException; import de.anomic.http.client.Cache; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; -import de.anomic.http.metadata.ResponseHeader; +import de.anomic.http.server.HeaderFramework; +import de.anomic.http.server.RequestHeader; +import de.anomic.http.server.ResponseHeader; import de.anomic.search.Segments; import de.anomic.search.Switchboard; import de.anomic.server.serverCore; diff --git a/source/de/anomic/crawler/retrieval/Response.java b/source/de/anomic/crawler/retrieval/Response.java index f3bfb4405..27f4c5ef9 100755 --- a/source/de/anomic/crawler/retrieval/Response.java +++ b/source/de/anomic/crawler/retrieval/Response.java @@ -34,9 +34,9 @@ import net.yacy.kelondro.util.DateFormatter; import de.anomic.crawler.CrawlProfile; import de.anomic.document.Classification; import de.anomic.document.Parser; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; -import de.anomic.http.metadata.ResponseHeader; +import de.anomic.http.server.HeaderFramework; +import de.anomic.http.server.RequestHeader; +import de.anomic.http.server.ResponseHeader; import de.anomic.search.SwitchboardConstants; public class Response { diff --git a/source/de/anomic/data/SitemapParser.java b/source/de/anomic/data/SitemapParser.java index 19afefab0..7d7347298 100644 --- a/source/de/anomic/data/SitemapParser.java +++ b/source/de/anomic/data/SitemapParser.java @@ -36,6 +36,7 @@ import javax.xml.parsers.SAXParserFactory; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.data.meta.URIMetadataRow; +import net.yacy.kelondro.io.ByteCountInputStream; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.DateFormatter; @@ -47,10 +48,9 @@ import de.anomic.crawler.CrawlProfile; import de.anomic.crawler.retrieval.HTTPLoader; import de.anomic.crawler.retrieval.Request; import de.anomic.http.client.Client; -import de.anomic.http.io.ByteCountInputStream; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; -import de.anomic.http.metadata.ResponseContainer; +import de.anomic.http.server.HeaderFramework; +import de.anomic.http.server.RequestHeader; +import de.anomic.http.server.ResponseContainer; import de.anomic.search.Segments; import de.anomic.search.Switchboard; diff --git a/source/de/anomic/data/userDB.java b/source/de/anomic/data/userDB.java index 89379a65a..526ab399e 100644 --- a/source/de/anomic/data/userDB.java +++ b/source/de/anomic/data/userDB.java @@ -44,7 +44,7 @@ import net.yacy.kelondro.order.NaturalOrder; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.kelondroException; -import de.anomic.http.metadata.RequestHeader; +import de.anomic.http.server.RequestHeader; public final class userDB { diff --git a/source/de/anomic/document/Document.java b/source/de/anomic/document/Document.java index f62c91065..f81c3e457 100644 --- a/source/de/anomic/document/Document.java +++ b/source/de/anomic/document/Document.java @@ -51,7 +51,7 @@ import de.anomic.document.parser.html.ContentScraper; import de.anomic.document.parser.html.ImageEntry; import de.anomic.http.client.Cache; import de.anomic.http.client.Client; -import de.anomic.http.metadata.ResponseHeader; +import de.anomic.http.server.ResponseHeader; import de.anomic.server.serverCachedFileOutputStream; import de.anomic.ymage.WebStructureGraph; diff --git a/source/de/anomic/document/parser/odtParser.java b/source/de/anomic/document/parser/odtParser.java index 9ffdb6d37..db635392a 100644 --- a/source/de/anomic/document/parser/odtParser.java +++ b/source/de/anomic/document/parser/odtParser.java @@ -54,8 +54,8 @@ import de.anomic.document.Document; import de.anomic.document.parser.xml.ODContentHandler; import de.anomic.document.parser.xml.ODMetaHandler; import de.anomic.http.client.Client; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; +import de.anomic.http.server.HeaderFramework; +import de.anomic.http.server.RequestHeader; import de.anomic.server.serverCharBuffer; public class odtParser extends AbstractParser implements Idiom { diff --git a/source/de/anomic/document/parser/ooxmlParser.java b/source/de/anomic/document/parser/ooxmlParser.java index efadaab96..77a7901d9 100644 --- a/source/de/anomic/document/parser/ooxmlParser.java +++ b/source/de/anomic/document/parser/ooxmlParser.java @@ -54,8 +54,8 @@ import de.anomic.document.Document; import de.anomic.document.parser.xml.ODContentHandler; import de.anomic.document.parser.xml.ODMetaHandler; import de.anomic.http.client.Client; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; +import de.anomic.http.server.HeaderFramework; +import de.anomic.http.server.RequestHeader; import de.anomic.server.serverCharBuffer; public class ooxmlParser extends AbstractParser implements Idiom { diff --git a/source/de/anomic/document/parser/vcfParser.java b/source/de/anomic/document/parser/vcfParser.java index ffdcef38d..1234dec90 100644 --- a/source/de/anomic/document/parser/vcfParser.java +++ b/source/de/anomic/document/parser/vcfParser.java @@ -47,8 +47,8 @@ import de.anomic.document.Idiom; import de.anomic.document.ParserException; import de.anomic.document.Document; import de.anomic.http.client.Client; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; +import de.anomic.http.server.HeaderFramework; +import de.anomic.http.server.RequestHeader; /** * Vcard specification: http://www.imc.org/pdi/vcard-21.txt diff --git a/source/de/anomic/http/client/Cache.java b/source/de/anomic/http/client/Cache.java index bd939a752..ca11ace1c 100644 --- a/source/de/anomic/http/client/Cache.java +++ b/source/de/anomic/http/client/Cache.java @@ -51,7 +51,7 @@ import net.yacy.kelondro.data.word.Word; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.order.Base64Order; -import de.anomic.http.metadata.ResponseHeader; +import de.anomic.http.server.ResponseHeader; public final class Cache { diff --git a/source/de/anomic/http/client/Client.java b/source/de/anomic/http/client/Client.java index 950176cd3..f73b9fbe0 100644 --- a/source/de/anomic/http/client/Client.java +++ b/source/de/anomic/http/client/Client.java @@ -63,10 +63,10 @@ import org.apache.commons.httpclient.protocol.Protocol; import org.apache.commons.httpclient.protocol.ProtocolSocketFactory; import de.anomic.crawler.Latency; -import de.anomic.http.metadata.RequestHeader; -import de.anomic.http.metadata.ResponseContainer; -import de.anomic.http.metadata.ResponseHeader; -import de.anomic.http.metadata.HeaderFramework; +import de.anomic.http.server.HeaderFramework; +import de.anomic.http.server.RequestHeader; +import de.anomic.http.server.ResponseContainer; +import de.anomic.http.server.ResponseHeader; /** * HttpClient implementation which uses Jakarta Commons HttpClient 3.x {@link http://hc.apache.org/httpclient-3.x/} diff --git a/source/de/anomic/http/io/BoundedSizeOutputStream.java b/source/de/anomic/http/io/BoundedSizeOutputStream.java deleted file mode 100644 index 52655cbb6..000000000 --- a/source/de/anomic/http/io/BoundedSizeOutputStream.java +++ /dev/null @@ -1,79 +0,0 @@ -//httpBoundedSizeOutputStream.java -//----------------------- -//(C) by Michael Peter Christen; mc@yacy.net -//first published on http://www.anomic.de -//Frankfurt, Germany, 2004 -// -// This file is contributed by Martin Thelian -// last major change: $LastChangedDate: 2006-08-16 21:49:31 +0200 (Mi, 16 Aug 2006) $ by $LastChangedBy: orbiter $ -// Revision: $LastChangedRevision: 2414 $ -// -//This program is free software; you can redistribute it and/or modify -//it under the terms of the GNU General Public License as published by -//the Free Software Foundation; either version 2 of the License, or -//(at your option) any later version. -// -//This program is distributed in the hope that it will be useful, -//but WITHOUT ANY WARRANTY; without even the implied warranty of -//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -//GNU General Public License for more details. -// -//You should have received a copy of the GNU General Public License -//along with this program; if not, write to the Free Software -//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -package de.anomic.http.io; - -import java.io.IOException; -import java.io.OutputStream; - - -public class BoundedSizeOutputStream extends ByteCountOutputStream { - - protected final long maxSize; - - public BoundedSizeOutputStream(final OutputStream outputStream, final long sizeLimit) { - this(outputStream,0,sizeLimit); - } - - public BoundedSizeOutputStream(final OutputStream outputStream, final long initByteCount, final long sizeLimit) { - super(outputStream,initByteCount,null); - this.maxSize = sizeLimit; - } - - public void write(final byte[] b) throws IOException { - if (this.byteCount + b.length > this.maxSize) { - // write out the rest until we have reached the limit - final long rest = this.maxSize-this.byteCount; - if (rest > 0) this.write(b, 0, (int)rest); - - // throw an exception - throw new LimitExceededException("Limit exceeded",this.maxSize); - } - super.write(b); - } - - public synchronized void write(final byte[] b, final int off, final int len) throws IOException { - if (this.byteCount + len > this.maxSize) { - // write out the rest until we reach the limit - final long rest = this.maxSize-this.byteCount; - if (rest > 0) this.write(b, 0, (int)rest); - - // throw an exception - throw new LimitExceededException("Limit exceeded",this.maxSize); - } - super.write(b, off, len); - } - - public synchronized void write(final int b) throws IOException { - if (this.byteCount + 1 > this.maxSize) { - // throw an exception - throw new LimitExceededException("Limit exceeded",this.maxSize); - } - super.write(b); - } - - public long getSizeLimit() { - return this.maxSize; - } -} diff --git a/source/de/anomic/http/io/LimitExceededException.java b/source/de/anomic/http/io/LimitExceededException.java deleted file mode 100644 index 0d9de1687..000000000 --- a/source/de/anomic/http/io/LimitExceededException.java +++ /dev/null @@ -1,42 +0,0 @@ -//httpdLimitExceededException.java -//----------------------- -//(C) by Michael Peter Christen; mc@yacy.net -//first published on http://www.anomic.de -//Frankfurt, Germany, 2004 -// -// This file is contributed by Martin Thelian -// last major change: $LastChangedDate: 2006-08-16 21:49:31 +0200 (Mi, 16 Aug 2006) $ by $LastChangedBy: orbiter $ -// Revision: $LastChangedRevision: 2414 $ -// -//This program is free software; you can redistribute it and/or modify -//it under the terms of the GNU General Public License as published by -//the Free Software Foundation; either version 2 of the License, or -//(at your option) any later version. -// -//This program is distributed in the hope that it will be useful, -//but WITHOUT ANY WARRANTY; without even the implied warranty of -//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -//GNU General Public License for more details. -// -//You should have received a copy of the GNU General Public License -//along with this program; if not, write to the Free Software -//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -package de.anomic.http.io; - -import java.io.IOException; - -public class LimitExceededException extends IOException { - - private static final long serialVersionUID = 1L; - private final long limit; - - public LimitExceededException(final String errorMsg, final long limit) { - super(errorMsg); - this.limit = limit; - } - - public long getLimit() { - return this.limit; - } -} diff --git a/source/de/anomic/http/io/ChunkedInputStream.java b/source/de/anomic/http/server/ChunkedInputStream.java similarity index 96% rename from source/de/anomic/http/io/ChunkedInputStream.java rename to source/de/anomic/http/server/ChunkedInputStream.java index 93fd7422a..b91bfb55f 100644 --- a/source/de/anomic/http/io/ChunkedInputStream.java +++ b/source/de/anomic/http/server/ChunkedInputStream.java @@ -22,7 +22,7 @@ //along with this program; if not, write to the Free Software //Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.http.io; +package de.anomic.http.server; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -32,7 +32,6 @@ import java.io.InputStreamReader; import net.yacy.kelondro.util.ByteBuffer; -import de.anomic.http.metadata.RequestHeader; /** * Some parts of this class code was copied from Apache httpclient Project. diff --git a/source/de/anomic/http/io/ChunkedOutputStream.java b/source/de/anomic/http/server/ChunkedOutputStream.java similarity index 96% rename from source/de/anomic/http/io/ChunkedOutputStream.java rename to source/de/anomic/http/server/ChunkedOutputStream.java index bb770e25c..f5dc1ed00 100644 --- a/source/de/anomic/http/io/ChunkedOutputStream.java +++ b/source/de/anomic/http/server/ChunkedOutputStream.java @@ -22,7 +22,7 @@ //along with this program; if not, write to the Free Software //Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.http.io; +package de.anomic.http.server; import java.io.FilterOutputStream; import java.io.IOException; diff --git a/source/de/anomic/http/server/HTTPDFileHandler.java b/source/de/anomic/http/server/HTTPDFileHandler.java index 2205844bf..b1b6a4cac 100644 --- a/source/de/anomic/http/server/HTTPDFileHandler.java +++ b/source/de/anomic/http/server/HTTPDFileHandler.java @@ -92,10 +92,6 @@ import de.anomic.document.Classification; import de.anomic.document.parser.htmlParser; import de.anomic.document.parser.html.ContentScraper; import de.anomic.document.parser.html.ScraperInputStream; -import de.anomic.http.io.ChunkedOutputStream; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; -import de.anomic.http.metadata.ResponseHeader; import de.anomic.http.server.servlets.transferURL; import de.anomic.search.Switchboard; import de.anomic.search.SwitchboardConstants; diff --git a/source/de/anomic/http/server/HTTPDProxyHandler.java b/source/de/anomic/http/server/HTTPDProxyHandler.java index 7e5e625aa..019f326be 100644 --- a/source/de/anomic/http/server/HTTPDProxyHandler.java +++ b/source/de/anomic/http/server/HTTPDProxyHandler.java @@ -72,6 +72,7 @@ import java.util.logging.Logger; import java.util.zip.GZIPOutputStream; import net.yacy.kelondro.data.meta.DigestURI; +import net.yacy.kelondro.io.ByteCountOutputStream; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.DateFormatter; import net.yacy.kelondro.util.Domains; @@ -88,12 +89,6 @@ import de.anomic.http.client.MultiOutputStream; import de.anomic.http.client.Client; import de.anomic.http.client.RemoteProxyConfig; import de.anomic.http.client.Cache; -import de.anomic.http.io.ChunkedOutputStream; -import de.anomic.http.io.ByteCountOutputStream; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; -import de.anomic.http.metadata.ResponseContainer; -import de.anomic.http.metadata.ResponseHeader; import de.anomic.search.Switchboard; import de.anomic.search.SwitchboardConstants; import de.anomic.server.serverCore; @@ -283,7 +278,7 @@ public final class HTTPDProxyHandler { * @param conProp a collection of properties about the connection, like URL * @param requestHeader The header lines of the connection from the request * @param respond the OutputStream to the client - * @see de.anomic.http.httpdHandler#doGet(java.util.Properties, de.anomic.http.metadata.HeaderFramework, java.io.OutputStream) + * @see de.anomic.http.httpdHandler#doGet(java.util.Properties, de.anomic.http.server.HeaderFramework, java.io.OutputStream) */ public static void doGet(final Properties conProp, final RequestHeader requestHeader, final OutputStream respond) { ByteCountOutputStream countedRespond = null; diff --git a/source/de/anomic/http/server/HTTPDemon.java b/source/de/anomic/http/server/HTTPDemon.java index ada2237ef..ba8f8843b 100644 --- a/source/de/anomic/http/server/HTTPDemon.java +++ b/source/de/anomic/http/server/HTTPDemon.java @@ -59,6 +59,7 @@ import net.yacy.kelondro.util.DateFormatter; import net.yacy.kelondro.util.Domains; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.MemoryControl; +import net.yacy.kelondro.util.MapTools; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; @@ -72,11 +73,7 @@ import org.apache.commons.httpclient.ContentLengthInputStream; import de.anomic.data.userDB; import de.anomic.document.parser.html.CharacterCoding; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; -import de.anomic.http.metadata.ResponseHeader; import de.anomic.search.Switchboard; -import de.anomic.server.serverCodings; import de.anomic.server.serverCore; import de.anomic.server.serverHandler; import de.anomic.server.serverObjects; @@ -95,7 +92,7 @@ public final class HTTPDemon implements serverHandler, Cloneable { /** *

public static final String ADMIN_ACCOUNT_B64MD5 = "adminAccountBase64MD5"

*

Name of the setting holding the authentification hash for the static admin-account. It is calculated - * by first encoding username:password as Base64 and hashing it using {@link serverCodings#encodeMD5Hex(String)}.

+ * by first encoding username:password as Base64 and hashing it using {@link MapTools#encodeMD5Hex(String)}.

*/ public static final String ADMIN_ACCOUNT_B64MD5 = "adminAccountBase64MD5"; diff --git a/source/de/anomic/http/metadata/HeaderFramework.java b/source/de/anomic/http/server/HeaderFramework.java similarity index 97% rename from source/de/anomic/http/metadata/HeaderFramework.java rename to source/de/anomic/http/server/HeaderFramework.java index 376dad068..89795cf2d 100644 --- a/source/de/anomic/http/metadata/HeaderFramework.java +++ b/source/de/anomic/http/server/HeaderFramework.java @@ -33,7 +33,7 @@ instance of this class. */ -package de.anomic.http.metadata; +package de.anomic.http.server; import java.io.BufferedReader; import java.io.File; @@ -53,7 +53,6 @@ import java.util.Vector; import net.yacy.kelondro.data.meta.DigestURI; import net.yacy.kelondro.util.DateFormatter; -import de.anomic.http.server.HTTPDemon; public class HeaderFramework extends TreeMap implements Map { diff --git a/source/de/anomic/http/metadata/RequestHeader.java b/source/de/anomic/http/server/RequestHeader.java similarity index 99% rename from source/de/anomic/http/metadata/RequestHeader.java rename to source/de/anomic/http/server/RequestHeader.java index 5f38d7836..1676f190f 100755 --- a/source/de/anomic/http/metadata/RequestHeader.java +++ b/source/de/anomic/http/server/RequestHeader.java @@ -21,7 +21,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.http.metadata; +package de.anomic.http.server; import java.io.IOException; import java.net.MalformedURLException; @@ -33,7 +33,6 @@ import java.util.Properties; import net.yacy.kelondro.util.DateFormatter; -import de.anomic.http.server.HTTPDemon; import de.anomic.server.serverCore; public class RequestHeader extends HeaderFramework { diff --git a/source/de/anomic/http/metadata/ResponseContainer.java b/source/de/anomic/http/server/ResponseContainer.java similarity index 98% rename from source/de/anomic/http/metadata/ResponseContainer.java rename to source/de/anomic/http/server/ResponseContainer.java index cfba5610b..d2c4f5554 100644 --- a/source/de/anomic/http/metadata/ResponseContainer.java +++ b/source/de/anomic/http/server/ResponseContainer.java @@ -24,19 +24,19 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.http.metadata; +package de.anomic.http.server; import java.io.IOException; import java.io.InputStream; import java.util.zip.GZIPInputStream; +import net.yacy.kelondro.io.ByteCountInputStream; import net.yacy.kelondro.util.FileUtils; import org.apache.commons.httpclient.Header; import org.apache.commons.httpclient.HttpMethod; import de.anomic.http.client.ConnectionInfo; -import de.anomic.http.io.ByteCountInputStream; /** * container for http-response data diff --git a/source/de/anomic/http/metadata/ResponseHeader.java b/source/de/anomic/http/server/ResponseHeader.java similarity index 99% rename from source/de/anomic/http/metadata/ResponseHeader.java rename to source/de/anomic/http/server/ResponseHeader.java index 7f41831d7..bede38ab1 100755 --- a/source/de/anomic/http/metadata/ResponseHeader.java +++ b/source/de/anomic/http/server/ResponseHeader.java @@ -21,7 +21,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.http.metadata; +package de.anomic.http.server; import java.nio.charset.Charset; import java.nio.charset.IllegalCharsetNameException; diff --git a/source/de/anomic/http/server/ServerSideIncludes.java b/source/de/anomic/http/server/ServerSideIncludes.java index bce88edc3..8bd2f8a7a 100644 --- a/source/de/anomic/http/server/ServerSideIncludes.java +++ b/source/de/anomic/http/server/ServerSideIncludes.java @@ -33,9 +33,6 @@ import java.util.Properties; import net.yacy.kelondro.util.ByteBuffer; -import de.anomic.http.io.ChunkedOutputStream; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; public class ServerSideIncludes { diff --git a/source/de/anomic/http/server/servlets/transferURL.java b/source/de/anomic/http/server/servlets/transferURL.java index c7fc1bd6a..63e0d57cf 100644 --- a/source/de/anomic/http/server/servlets/transferURL.java +++ b/source/de/anomic/http/server/servlets/transferURL.java @@ -11,7 +11,7 @@ import net.yacy.kelondro.util.DateFormatter; import de.anomic.content.RSSMessage; import de.anomic.data.Blacklist; import de.anomic.document.parser.xml.RSSFeed; -import de.anomic.http.metadata.RequestHeader; +import de.anomic.http.server.RequestHeader; import de.anomic.search.Segments; import de.anomic.search.Switchboard; import de.anomic.server.serverCore; diff --git a/source/de/anomic/search/MetadataRepository.java b/source/de/anomic/search/MetadataRepository.java index eb48231dc..b1190e525 100644 --- a/source/de/anomic/search/MetadataRepository.java +++ b/source/de/anomic/search/MetadataRepository.java @@ -54,7 +54,7 @@ import de.anomic.data.Blacklist; import de.anomic.document.parser.html.CharacterCoding; import de.anomic.http.client.Client; import de.anomic.http.client.RemoteProxyConfig; -import de.anomic.http.metadata.ResponseContainer; +import de.anomic.http.server.ResponseContainer; public final class MetadataRepository implements Iterable { diff --git a/source/de/anomic/search/Switchboard.java b/source/de/anomic/search/Switchboard.java index beb904de5..b4acc4712 100644 --- a/source/de/anomic/search/Switchboard.java +++ b/source/de/anomic/search/Switchboard.java @@ -169,10 +169,10 @@ import de.anomic.document.parser.xml.RSSFeed; import de.anomic.http.client.Client; import de.anomic.http.client.RemoteProxyConfig; import de.anomic.http.client.Cache; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; -import de.anomic.http.metadata.ResponseHeader; import de.anomic.http.server.HTTPDemon; +import de.anomic.http.server.HeaderFramework; +import de.anomic.http.server.RequestHeader; +import de.anomic.http.server.ResponseHeader; import de.anomic.http.server.RobotsTxtConfig; import de.anomic.net.UPnP; import de.anomic.search.blockrank.CRDistribution; diff --git a/source/de/anomic/search/TextSnippet.java b/source/de/anomic/search/TextSnippet.java index 17ff121ff..88cadf65d 100644 --- a/source/de/anomic/search/TextSnippet.java +++ b/source/de/anomic/search/TextSnippet.java @@ -50,7 +50,7 @@ import de.anomic.document.Document; import de.anomic.document.ParserException; import de.anomic.document.parser.html.CharacterCoding; import de.anomic.http.client.Cache; -import de.anomic.http.metadata.ResponseHeader; +import de.anomic.http.server.ResponseHeader; import de.anomic.yacy.yacySearch; public class TextSnippet { diff --git a/source/de/anomic/server/servletProperties.java b/source/de/anomic/server/servletProperties.java index 674b113c6..142a62ced 100644 --- a/source/de/anomic/server/servletProperties.java +++ b/source/de/anomic/server/servletProperties.java @@ -21,7 +21,7 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 US package de.anomic.server; -import de.anomic.http.metadata.ResponseHeader; +import de.anomic.http.server.ResponseHeader; public class servletProperties extends serverObjects { diff --git a/source/de/anomic/tools/loaderThreads.java b/source/de/anomic/tools/loaderThreads.java index d0c13447b..134363451 100644 --- a/source/de/anomic/tools/loaderThreads.java +++ b/source/de/anomic/tools/loaderThreads.java @@ -28,8 +28,8 @@ import net.yacy.kelondro.data.meta.DigestURI; import de.anomic.crawler.retrieval.HTTPLoader; import de.anomic.http.client.Client; import de.anomic.http.client.RemoteProxyConfig; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; +import de.anomic.http.server.HeaderFramework; +import de.anomic.http.server.RequestHeader; public class loaderThreads { diff --git a/source/de/anomic/yacy/yacyClient.java b/source/de/anomic/yacy/yacyClient.java index ab978a6c3..44b90d47d 100644 --- a/source/de/anomic/yacy/yacyClient.java +++ b/source/de/anomic/yacy/yacyClient.java @@ -79,9 +79,9 @@ import de.anomic.http.client.DefaultCharsetFilePart; import de.anomic.http.client.DefaultCharsetStringPart; import de.anomic.http.client.Client; import de.anomic.http.client.RemoteProxyConfig; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; -import de.anomic.http.metadata.ResponseContainer; +import de.anomic.http.server.HeaderFramework; +import de.anomic.http.server.RequestHeader; +import de.anomic.http.server.ResponseContainer; import de.anomic.search.RankingProfile; import de.anomic.search.RankingProcess; import de.anomic.search.Segment; diff --git a/source/de/anomic/yacy/yacyNewsDB.java b/source/de/anomic/yacy/yacyNewsDB.java index 8ae28312a..5e2776333 100644 --- a/source/de/anomic/yacy/yacyNewsDB.java +++ b/source/de/anomic/yacy/yacyNewsDB.java @@ -56,8 +56,8 @@ import net.yacy.kelondro.table.Table; import net.yacy.kelondro.util.DateFormatter; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.kelondroException; +import net.yacy.kelondro.util.MapTools; -import de.anomic.server.serverCodings; public class yacyNewsDB { @@ -148,7 +148,7 @@ public class yacyNewsDB { b.getColString(1, "UTF-8"), (b.empty(2)) ? null : DateFormatter.parseShortSecond(b.getColString(2, null), DateFormatter.UTCDiffString()), (int) b.getColLong(3), - serverCodings.string2map(b.getColString(4, "UTF-8"), ",") + MapTools.string2map(b.getColString(4, "UTF-8"), ",") ); } diff --git a/source/de/anomic/yacy/yacyNewsRecord.java b/source/de/anomic/yacy/yacyNewsRecord.java index b0055eeee..519981b71 100644 --- a/source/de/anomic/yacy/yacyNewsRecord.java +++ b/source/de/anomic/yacy/yacyNewsRecord.java @@ -55,8 +55,8 @@ import net.yacy.kelondro.data.word.Word; import net.yacy.kelondro.index.Row; import net.yacy.kelondro.order.NaturalOrder; import net.yacy.kelondro.util.DateFormatter; +import net.yacy.kelondro.util.MapTools; -import de.anomic.server.serverCodings; public class yacyNewsRecord { @@ -130,7 +130,7 @@ public class yacyNewsRecord { } public yacyNewsRecord(final String newsString) { - this.attributes = serverCodings.string2map(newsString, ","); + this.attributes = MapTools.string2map(newsString, ","); if (attributes.toString().length() > attributesMaxLength) throw new IllegalArgumentException("attributes length (" + attributes.toString().length() + ") exceeds maximum (" + attributesMaxLength + ")"); this.category = (attributes.containsKey("cat")) ? attributes.get("cat") : ""; if (category.length() > categoryStringLength) throw new IllegalArgumentException("category length (" + category.length() + ") exceeds maximum (" + categoryStringLength + ")"); diff --git a/source/de/anomic/yacy/yacyPeerActions.java b/source/de/anomic/yacy/yacyPeerActions.java index 127881d70..ed7b60793 100644 --- a/source/de/anomic/yacy/yacyPeerActions.java +++ b/source/de/anomic/yacy/yacyPeerActions.java @@ -29,10 +29,10 @@ import java.util.HashMap; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.DateFormatter; +import net.yacy.kelondro.util.MapTools; import de.anomic.content.RSSMessage; import de.anomic.document.parser.xml.RSSFeed; -import de.anomic.server.serverCodings; public class yacyPeerActions { @@ -231,8 +231,8 @@ public class yacyPeerActions { final yacyNewsRecord record = yacyNewsRecord.newRecord(decodedString); if (record != null) { //System.out.println("### news arrival from peer " + peer.getName() + ", decoded=" + decodedString + ", record=" + recordString + ", news=" + record.toString()); - final String cre1 = serverCodings.string2map(decodedString, ",").get("cre"); - final String cre2 = serverCodings.string2map(record.toString(), ",").get("cre"); + final String cre1 = MapTools.string2map(decodedString, ",").get("cre"); + final String cre2 = MapTools.string2map(record.toString(), ",").get("cre"); if ((cre1 == null) || (cre2 == null) || (!(cre1.equals(cre2)))) { System.out.println("### ERROR - cre are not equal: cre1=" + cre1 + ", cre2=" + cre2); return; diff --git a/source/de/anomic/yacy/yacyRelease.java b/source/de/anomic/yacy/yacyRelease.java index fe6e8869b..6d8806ac9 100644 --- a/source/de/anomic/yacy/yacyRelease.java +++ b/source/de/anomic/yacy/yacyRelease.java @@ -53,9 +53,9 @@ import de.anomic.crawler.CrawlProfile; import de.anomic.crawler.retrieval.HTTPLoader; import de.anomic.document.parser.html.ContentScraper; import de.anomic.http.client.Client; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; -import de.anomic.http.metadata.ResponseContainer; +import de.anomic.http.server.HeaderFramework; +import de.anomic.http.server.RequestHeader; +import de.anomic.http.server.ResponseContainer; import de.anomic.search.Switchboard; import de.anomic.server.serverCharBuffer; import de.anomic.server.serverCore; diff --git a/source/de/anomic/yacy/yacySeed.java b/source/de/anomic/yacy/yacySeed.java index 6458fdfc6..c76dc2c9f 100644 --- a/source/de/anomic/yacy/yacySeed.java +++ b/source/de/anomic/yacy/yacySeed.java @@ -60,9 +60,9 @@ import net.yacy.kelondro.data.word.Word; import net.yacy.kelondro.order.Base64Order; import net.yacy.kelondro.order.Digest; import net.yacy.kelondro.util.DateFormatter; +import net.yacy.kelondro.util.MapTools; import de.anomic.net.natLib; -import de.anomic.server.serverCodings; import de.anomic.tools.bitfield; import de.anomic.tools.crypt; import de.anomic.yacy.dht.FlatWordPartitionScheme; @@ -563,17 +563,17 @@ public class yacySeed implements Cloneable { } public void setPeerTags(final Set keys) { - dna.put(PEERTAGS, serverCodings.set2string(keys, "|", false)); + dna.put(PEERTAGS, MapTools.set2string(keys, "|", false)); } public Set getPeerTags() { - return serverCodings.string2set(get(PEERTAGS, "*"), "|"); + return MapTools.string2set(get(PEERTAGS, "*"), "|"); } public boolean matchPeerTags(final TreeSet searchHashes) { final String peertags = get(PEERTAGS, ""); if (peertags.equals("*")) return true; - final Set tags = serverCodings.string2set(peertags, "|"); + final Set tags = MapTools.string2set(peertags, "|"); final Iterator i = tags.iterator(); while (i.hasNext()) { if (searchHashes.contains(Word.word2hash(i.next()))) return true; @@ -765,7 +765,7 @@ public class yacySeed implements Cloneable { if (seed == null) { return null; } // extract hash - final HashMap dna = serverCodings.string2map(seed, ","); + final HashMap dna = MapTools.string2map(seed, ","); final String hash = dna.remove(yacySeed.HASH); if (hash == null) return null; final yacySeed resultSeed = new yacySeed(hash, dna); @@ -836,7 +836,7 @@ public class yacySeed implements Cloneable { HashMap copymap = new HashMap(); copymap.putAll(this.dna); copymap.put(yacySeed.HASH, this.hash); // set hash into seed code structure - return serverCodings.map2string(copymap, ",", true); // generate string representation + return MapTools.map2string(copymap, ",", true); // generate string representation } public final String genSeedStr(final String key) { diff --git a/source/de/anomic/yacy/yacySeedDB.java b/source/de/anomic/yacy/yacySeedDB.java index ffc896ee1..e2b30fcf5 100644 --- a/source/de/anomic/yacy/yacySeedDB.java +++ b/source/de/anomic/yacy/yacySeedDB.java @@ -50,11 +50,11 @@ import net.yacy.kelondro.util.kelondroException; import de.anomic.crawler.retrieval.HTTPLoader; import de.anomic.http.client.Client; -import de.anomic.http.metadata.HeaderFramework; -import de.anomic.http.metadata.RequestHeader; -import de.anomic.http.metadata.ResponseContainer; import de.anomic.http.server.HTTPDemon; import de.anomic.http.server.AlternativeDomainNames; +import de.anomic.http.server.HeaderFramework; +import de.anomic.http.server.RequestHeader; +import de.anomic.http.server.ResponseContainer; import de.anomic.search.Switchboard; import de.anomic.server.serverCore; import de.anomic.server.serverSwitch; diff --git a/source/net/yacy/kelondro/data/meta/URIMetadataRow.java b/source/net/yacy/kelondro/data/meta/URIMetadataRow.java index 2bdd764a8..e85dfc93a 100644 --- a/source/net/yacy/kelondro/data/meta/URIMetadataRow.java +++ b/source/net/yacy/kelondro/data/meta/URIMetadataRow.java @@ -43,11 +43,11 @@ import net.yacy.kelondro.order.NaturalOrder; import net.yacy.kelondro.util.DateFormatter; import net.yacy.kelondro.util.FileUtils; import net.yacy.kelondro.util.kelondroException; +import net.yacy.kelondro.util.MapTools; import de.anomic.crawler.retrieval.Request; import de.anomic.search.QueryParams; import de.anomic.server.serverCharBuffer; -import de.anomic.server.serverCodings; import de.anomic.tools.crypt; public class URIMetadataRow implements URIMetadata { @@ -295,7 +295,7 @@ public class URIMetadataRow implements URIMetadata { return null; } try { - return new URIMetadataRow(serverCodings.s2p(propStr.substring(1, propStr.length() - 1))); + return new URIMetadataRow(MapTools.s2p(propStr.substring(1, propStr.length() - 1))); } catch (final kelondroException e) { // wrong format return null; diff --git a/source/de/anomic/http/io/ByteCountInputStream.java b/source/net/yacy/kelondro/io/ByteCountInputStream.java similarity index 96% rename from source/de/anomic/http/io/ByteCountInputStream.java rename to source/net/yacy/kelondro/io/ByteCountInputStream.java index 8504c7ce2..c5eba58ce 100644 --- a/source/de/anomic/http/io/ByteCountInputStream.java +++ b/source/net/yacy/kelondro/io/ByteCountInputStream.java @@ -24,7 +24,7 @@ //along with this program; if not, write to the Free Software //Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.http.io; +package net.yacy.kelondro.io; import java.io.FilterInputStream; import java.io.IOException; diff --git a/source/de/anomic/http/io/ByteCountOutputStream.java b/source/net/yacy/kelondro/io/ByteCountOutputStream.java similarity index 96% rename from source/de/anomic/http/io/ByteCountOutputStream.java rename to source/net/yacy/kelondro/io/ByteCountOutputStream.java index b9fe7c0ec..ea17d2cb1 100644 --- a/source/de/anomic/http/io/ByteCountOutputStream.java +++ b/source/net/yacy/kelondro/io/ByteCountOutputStream.java @@ -22,7 +22,7 @@ //along with this program; if not, write to the Free Software //Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.http.io; +package net.yacy.kelondro.io; import java.io.BufferedOutputStream; import java.io.IOException; diff --git a/source/de/anomic/server/serverCodings.java b/source/net/yacy/kelondro/util/MapTools.java similarity index 96% rename from source/de/anomic/server/serverCodings.java rename to source/net/yacy/kelondro/util/MapTools.java index 673d34b4a..058c14f50 100644 --- a/source/de/anomic/server/serverCodings.java +++ b/source/net/yacy/kelondro/util/MapTools.java @@ -23,7 +23,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.server; +package net.yacy.kelondro.util; import java.util.Collections; import java.util.ConcurrentModificationException; @@ -36,7 +36,7 @@ import java.util.Set; import java.util.StringTokenizer; import java.util.Map.Entry; -public final class serverCodings { +public final class MapTools { public static Properties s2p(final String s) { final Properties p = new Properties(); diff --git a/source/yacy.java b/source/yacy.java index f002ca856..d1b2326c0 100644 --- a/source/yacy.java +++ b/source/yacy.java @@ -64,9 +64,9 @@ import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; import de.anomic.data.translator; import de.anomic.http.client.Client; -import de.anomic.http.metadata.RequestHeader; -import de.anomic.http.metadata.ResponseContainer; import de.anomic.http.server.HTTPDemon; +import de.anomic.http.server.RequestHeader; +import de.anomic.http.server.ResponseContainer; import de.anomic.search.MetadataRepository; import de.anomic.search.Segment; import de.anomic.search.Switchboard;