From 07a20e82530e91625387332ab54df257fb85d1aa Mon Sep 17 00:00:00 2001 From: orbiter Date: Sat, 2 Feb 2013 10:52:39 +0100 Subject: [PATCH 1/3] removed unused import --- source/net/yacy/yacy.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/net/yacy/yacy.java b/source/net/yacy/yacy.java index 1cd4c85cc..05bf7d7d9 100644 --- a/source/net/yacy/yacy.java +++ b/source/net/yacy/yacy.java @@ -40,8 +40,6 @@ import java.nio.channels.FileLock; import java.util.Properties; import java.util.concurrent.Semaphore; -import sun.security.action.GetBooleanAction; - import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.lod.JenaTripleStore; import net.yacy.cora.protocol.ClientIdentification; From 160ce568b39195bf4ee0dbefd89ce345ffd6cb46 Mon Sep 17 00:00:00 2001 From: reger Date: Sun, 3 Feb 2013 22:32:38 +0100 Subject: [PATCH 2/3] move testing SolrServlet.main to test, making include of jetty*.jar in distribution and classpath obsolete - move jetty*.jar to test library - move SolrServlet.main as is to test, add also a junit test simulating main - add build.xml cleanup for EmbeddedSolrConnectorTest created test/DATA - adjust some test compile errors --- addon/YaCy.app/Contents/Info.plist | 2 - build.xml | 11 +- .../jetty-6.1.26-patched-JETTY-1340.jar | Bin {lib => libt}/jetty-LICENSE-ASL.txt | 0 .../jetty-util-6.1.26-patched-JETTY-1340.jar | Bin {lib => libt}/jetty-util-LICENSE-ASL.txt | 0 .../yacy/cora/federate/solr/SolrServlet.java | 36 ---- .../solr/connector/EmbeddedSolrConnector.java | 38 ---- test/de/anomic/document/ParserTest.java | 4 +- test/de/anomic/yacy/yacyURLTest.java | 12 +- .../cora/document/MultiProtocolURITest.java | 2 +- .../connector/EmbeddedSolrConnectorTest.java | 184 ++++++++++++++++++ 12 files changed, 200 insertions(+), 89 deletions(-) rename {lib => libt}/jetty-6.1.26-patched-JETTY-1340.jar (100%) rename {lib => libt}/jetty-LICENSE-ASL.txt (100%) rename {lib => libt}/jetty-util-6.1.26-patched-JETTY-1340.jar (100%) rename {lib => libt}/jetty-util-LICENSE-ASL.txt (100%) create mode 100644 test/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnectorTest.java diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist index 159b876e9..e7d3ba5e3 100644 --- a/addon/YaCy.app/Contents/Info.plist +++ b/addon/YaCy.app/Contents/Info.plist @@ -68,8 +68,6 @@ $JAVAROOT/lib/jcl-over-slf4j-1.7.2.jar $JAVAROOT/lib/jempbox-1.7.1.jar $JAVAROOT/lib/jena-2.6.4.jar - $JAVAROOT/lib/jetty-6.1.26-patched-JETTY-1340.jar - $JAVAROOT/lib/jetty-util-6.1.26-patched-JETTY-1340.jar $JAVAROOT/lib/jsch-0.1.42.jar $JAVAROOT/lib/json-simple-1.1.jar $JAVAROOT/lib/log4j-1.2.17.jar diff --git a/build.xml b/build.xml index ce7df8ccf..fbab83bb0 100644 --- a/build.xml +++ b/build.xml @@ -187,8 +187,6 @@ - - @@ -433,7 +431,7 @@ - + @@ -441,7 +439,7 @@ - + @@ -452,7 +450,7 @@ - + @@ -508,7 +506,7 @@ - + @@ -518,6 +516,7 @@ + diff --git a/lib/jetty-6.1.26-patched-JETTY-1340.jar b/libt/jetty-6.1.26-patched-JETTY-1340.jar similarity index 100% rename from lib/jetty-6.1.26-patched-JETTY-1340.jar rename to libt/jetty-6.1.26-patched-JETTY-1340.jar diff --git a/lib/jetty-LICENSE-ASL.txt b/libt/jetty-LICENSE-ASL.txt similarity index 100% rename from lib/jetty-LICENSE-ASL.txt rename to libt/jetty-LICENSE-ASL.txt diff --git a/lib/jetty-util-6.1.26-patched-JETTY-1340.jar b/libt/jetty-util-6.1.26-patched-JETTY-1340.jar similarity index 100% rename from lib/jetty-util-6.1.26-patched-JETTY-1340.jar rename to libt/jetty-util-6.1.26-patched-JETTY-1340.jar diff --git a/lib/jetty-util-LICENSE-ASL.txt b/libt/jetty-util-LICENSE-ASL.txt similarity index 100% rename from lib/jetty-util-LICENSE-ASL.txt rename to libt/jetty-util-LICENSE-ASL.txt diff --git a/source/net/yacy/cora/federate/solr/SolrServlet.java b/source/net/yacy/cora/federate/solr/SolrServlet.java index f6f661bfd..2bd75ad66 100644 --- a/source/net/yacy/cora/federate/solr/SolrServlet.java +++ b/source/net/yacy/cora/federate/solr/SolrServlet.java @@ -58,10 +58,6 @@ import org.apache.solr.search.SolrIndexSearcher; import org.apache.solr.servlet.cache.HttpCacheHeaderUtil; import org.apache.solr.servlet.cache.Method; import org.apache.solr.util.FastWriter; -import org.mortbay.jetty.Handler; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.servlet.FilterHolder; public class SolrServlet implements Filter { @@ -194,38 +190,6 @@ public class SolrServlet implements Filter { hresponse.sendError((code < 100) ? 500 : code, ex.getMessage() + "\n\n" + sw.toString()); } - /** - * from org.apache.solr.client.solrj.embedded.JettySolrRunner - */ - public static Server startServer(String context, int port, EmbeddedSolrConnector c) { - //this.context = context; - Server server = new Server(port); - /* - SocketConnector connector = new SocketConnector(); - connector.setPort(port); - connector.setReuseAddress(true); - this.server.setConnectors(new Connector[] { connector }); - this.server.setSessionIdManager(new HashSessionIdManager(new Random())); - */ - server.setStopAtShutdown(true); - Context root = new Context(server, context, Context.SESSIONS); - root.addServlet(Servlet404.class, "/*"); - - // attach org.apache.solr.response.XMLWriter to search requests - SolrServlet.initCore(c); - FilterHolder dispatchFilter = root.addFilter(SolrServlet.class, "*", Handler.REQUEST); - - if (!server.isRunning()) { - try { - server.start(); - waitForSolr(context, port); - } catch (Exception e) { - e.printStackTrace(); - } - } - return server; - } - public static void waitForSolr(String context, int port) throws Exception { // A raw term query type doesn't check the schema URL url = new URL("http://127.0.0.1:" + port + context + "/select?q={!raw+f=test_query}ping"); diff --git a/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java b/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java index 6a204f4c5..fd3b65535 100644 --- a/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java +++ b/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java @@ -26,18 +26,13 @@ import java.io.IOException; import javax.xml.parsers.ParserConfigurationException; -import net.yacy.cora.federate.solr.SolrServlet; -import net.yacy.cora.federate.solr.YaCySchema; import net.yacy.kelondro.logging.Log; import net.yacy.kelondro.util.MemoryControl; import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer; import org.apache.solr.client.solrj.response.QueryResponse; -import org.apache.solr.common.SolrDocument; -import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.SolrException; -import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; @@ -207,37 +202,4 @@ public class EmbeddedSolrConnector extends SolrServerConnector implements SolrCo } } - public static void main(String[] args) { - File solr_config = new File("defaults/solr"); - File storage = new File("DATA/INDEX/webportal/SEGMENTS/text/solr/"); - storage.mkdirs(); - try { - EmbeddedSolrConnector solr = new EmbeddedSolrConnector(storage, solr_config); - SolrInputDocument doc = new SolrInputDocument(); - doc.addField(YaCySchema.id.name(), "ABCD0000abcd"); - doc.addField(YaCySchema.title.name(), "Lorem ipsum"); - doc.addField(YaCySchema.host_s.name(), "yacy.net"); - doc.addField(YaCySchema.text_t.name(), "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."); - solr.add(doc); - - // start a server - SolrServlet.startServer("/solr", 8091, solr); // try http://localhost:8091/solr/select?q=*:* - - // do a normal query - SolrDocumentList select = solr.query(YaCySchema.text_t.name() + ":tempor", 0, 10); - for (SolrDocument d : select) System.out.println("***TEST SELECT*** " + d.toString()); - - // do a facet query - select = solr.query(YaCySchema.text_t.name() + ":tempor", 0, 10); - for (SolrDocument d : select) System.out.println("***TEST SELECT*** " + d.toString()); - - - // try http://127.0.0.1:8091/solr/select?q=ping - try {Thread.sleep(1000 * 1000);} catch (InterruptedException e) {} - solr.close(); - } catch (IOException e) { - e.printStackTrace(); - } - - } } diff --git a/test/de/anomic/document/ParserTest.java b/test/de/anomic/document/ParserTest.java index b26529b53..7316c07e2 100644 --- a/test/de/anomic/document/ParserTest.java +++ b/test/de/anomic/document/ParserTest.java @@ -41,9 +41,9 @@ public class ParserTest { final String mimetype = testFile[1]; final DigestURI url = new DigestURI("http://localhost/"+filename); - final Document[] docs = TextParser.parseSource(url, mimetype, null, file.length(), new FileInputStream(file), true); + final Document[] docs = TextParser.parseSource(url, mimetype, null, file.length(), new FileInputStream(file)); for (final Document doc: docs) { - final Reader content = new InputStreamReader(doc.getText(), doc.getCharset()); + final Reader content = new InputStreamReader(doc.getTextStream(), doc.getCharset()); final StringBuilder str = new StringBuilder(); int c; while( (c = content.read()) != -1 ) diff --git a/test/de/anomic/yacy/yacyURLTest.java b/test/de/anomic/yacy/yacyURLTest.java index 66d3995c4..69c924b08 100644 --- a/test/de/anomic/yacy/yacyURLTest.java +++ b/test/de/anomic/yacy/yacyURLTest.java @@ -23,15 +23,19 @@ public class yacyURLTest extends TestCase { new String[]{"/test/test2/../hallo/","/test/hallo/"}, new String[]{"/home/..test/../hallo/../","/home/"} }; - + String testhost = "http://localhost"; for (int i=0; i < testStrings.length; i++) { // desired conversion result System.out.print("testResolveBackpath: " + testStrings[i][0]); - String shouldBe = testStrings[i][1]; + String shouldBe = testhost + testStrings[i][1]; // conversion result - String resolvedURL = MultiProtocolURI.resolveBackpath(testStrings[i][0]); - + String resolvedURL=""; + try { + resolvedURL = (new MultiProtocolURI(testhost + testStrings[i][0])).toString(); + } catch (MalformedURLException ex) { + fail ("malformed URL"); + } // test if equal assertEquals(shouldBe,resolvedURL); System.out.println(" -> " + resolvedURL); diff --git a/test/net/yacy/cora/document/MultiProtocolURITest.java b/test/net/yacy/cora/document/MultiProtocolURITest.java index 3f18c5309..f69098727 100644 --- a/test/net/yacy/cora/document/MultiProtocolURITest.java +++ b/test/net/yacy/cora/document/MultiProtocolURITest.java @@ -28,7 +28,7 @@ public class MultiProtocolURITest { for (int i=0; i Date: Sun, 3 Feb 2013 23:24:19 +0100 Subject: [PATCH 3/3] remove jetty from classpath - as it was moved last commit --- .classpath | 2 -- 1 file changed, 2 deletions(-) diff --git a/.classpath b/.classpath index 32b306c38..c32646cfc 100644 --- a/.classpath +++ b/.classpath @@ -43,8 +43,6 @@ - -