update to Jetty 9.2.6

19 files changed, 43 insertions, 43 deletions

diff --git a/.classpath b/.classpath
index c60ff0b66..9cdb37038 100644
--- a/.classpath
+++ b/.classpath
@@ -74,20 +74,20 @@
 	<classpathentry kind="lib" path="lib/icu4j-core.jar"/>

 	<classpathentry kind="lib" path="lib/htmllexer.jar"/>

 	<classpathentry kind="lib" path="lib/jsoup-1.8.1.jar"/>

-	<classpathentry kind="lib" path="lib/jetty-client-9.2.4.v20141103.jar"/>

-	<classpathentry kind="lib" path="lib/jetty-continuation-9.2.4.v20141103.jar"/>

-	<classpathentry kind="lib" path="lib/jetty-deploy-9.2.4.v20141103.jar"/>

-	<classpathentry kind="lib" path="lib/jetty-http-9.2.4.v20141103.jar"/>

-	<classpathentry kind="lib" path="lib/jetty-io-9.2.4.v20141103.jar"/>

-	<classpathentry kind="lib" path="lib/jetty-jmx-9.2.4.v20141103.jar"/>

-	<classpathentry kind="lib" path="lib/jetty-proxy-9.2.4.v20141103.jar"/>

-	<classpathentry kind="lib" path="lib/jetty-security-9.2.4.v20141103.jar"/>

-	<classpathentry kind="lib" path="lib/jetty-server-9.2.4.v20141103.jar"/>

-	<classpathentry kind="lib" path="lib/jetty-servlet-9.2.4.v20141103.jar"/>

-	<classpathentry kind="lib" path="lib/jetty-servlets-9.2.4.v20141103.jar"/>

-	<classpathentry kind="lib" path="lib/jetty-util-9.2.4.v20141103.jar"/>

-	<classpathentry kind="lib" path="lib/jetty-webapp-9.2.4.v20141103.jar"/>

-	<classpathentry kind="lib" path="lib/jetty-xml-9.2.4.v20141103.jar"/>

+	<classpathentry kind="lib" path="lib/jetty-client-9.2.6.v20141205.jar"/>

+	<classpathentry kind="lib" path="lib/jetty-continuation-9.2.6.v20141205.jar"/>

+	<classpathentry kind="lib" path="lib/jetty-deploy-9.2.6.v20141205.jar"/>

+	<classpathentry kind="lib" path="lib/jetty-http-9.2.6.v20141205.jar"/>

+	<classpathentry kind="lib" path="lib/jetty-io-9.2.6.v20141205.jar"/>

+	<classpathentry kind="lib" path="lib/jetty-jmx-9.2.6.v20141205.jar"/>

+	<classpathentry kind="lib" path="lib/jetty-proxy-9.2.6.v20141205.jar"/>

+	<classpathentry kind="lib" path="lib/jetty-security-9.2.6.v20141205.jar"/>

+	<classpathentry kind="lib" path="lib/jetty-server-9.2.6.v20141205.jar"/>

+	<classpathentry kind="lib" path="lib/jetty-servlet-9.2.6.v20141205.jar"/>

+	<classpathentry kind="lib" path="lib/jetty-servlets-9.2.6.v20141205.jar"/>

+	<classpathentry kind="lib" path="lib/jetty-util-9.2.6.v20141205.jar"/>

+	<classpathentry kind="lib" path="lib/jetty-webapp-9.2.6.v20141205.jar"/>

+	<classpathentry kind="lib" path="lib/jetty-xml-9.2.6.v20141205.jar"/>

 	<classpathentry kind="lib" path="lib/javax.servlet-api-3.1.0.jar"/>

 	<classpathentry kind="lib" path="lib/weupnp-0.1.2.jar"/>

 	<classpathentry kind="output" path="gen"/>

diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist
index a60eeeeb2..6b1d7be98 100644
--- a/addon/YaCy.app/Contents/Info.plist
+++ b/addon/YaCy.app/Contents/Info.plist
@@ -63,20 +63,20 @@
 			<string>$JAVAROOT/lib/jcl-over-slf4j-1.7.2.jar</string>
 			<string>$JAVAROOT/lib/jempbox-1.8.8.jar</string>
 			<string>$JAVAROOT/lib/javax.servlet-api-3.1.0.jar</string>
-			<string>$JAVAROOT/lib/jetty-client-9.2.4.v20141103.jar</string>
-			<string>$JAVAROOT/lib/jetty-continuation-9.2.4.v20141103.jar</string>
-			<string>$JAVAROOT/lib/jetty-deploy-9.2.4.v20141103.jar</string>
-			<string>$JAVAROOT/lib/jetty-http-9.2.4.v20141103.jar</string>
-			<string>$JAVAROOT/lib/jetty-io-9.2.4.v20141103.jar</string>
-			<string>$JAVAROOT/lib/jetty-jmx-9.2.4.v20141103.jar</string>
-			<string>$JAVAROOT/lib/jetty-proxy-9.2.4.v20141103.jar</string>
-			<string>$JAVAROOT/lib/jetty-security-9.2.4.v20141103.jar</string>
-			<string>$JAVAROOT/lib/jetty-server-9.2.4.v20141103.jar</string>
-			<string>$JAVAROOT/lib/jetty-servlet-9.2.4.v20141103.jar</string>
-			<string>$JAVAROOT/lib/jetty-servlets-9.2.4.v20141103.jar</string>
-			<string>$JAVAROOT/lib/jetty-util-9.2.4.v20141103.jar</string>
-			<string>$JAVAROOT/lib/jetty-webapp-9.2.4.v20141103.jar</string>
-			<string>$JAVAROOT/lib/jetty-xml-9.2.4.v20141103.jar</string>			                      
+			<string>$JAVAROOT/lib/jetty-client-9.2.6.v20141205.jar</string>
+			<string>$JAVAROOT/lib/jetty-continuation-9.2.6.v20141205.jar</string>
+			<string>$JAVAROOT/lib/jetty-deploy-9.2.6.v20141205.jar</string>
+			<string>$JAVAROOT/lib/jetty-http-9.2.6.v20141205.jar</string>
+			<string>$JAVAROOT/lib/jetty-io-9.2.6.v20141205.jar</string>
+			<string>$JAVAROOT/lib/jetty-jmx-9.2.6.v20141205.jar</string>
+			<string>$JAVAROOT/lib/jetty-proxy-9.2.6.v20141205.jar</string>
+			<string>$JAVAROOT/lib/jetty-security-9.2.6.v20141205.jar</string>
+			<string>$JAVAROOT/lib/jetty-server-9.2.6.v20141205.jar</string>
+			<string>$JAVAROOT/lib/jetty-servlet-9.2.6.v20141205.jar</string>
+			<string>$JAVAROOT/lib/jetty-servlets-9.2.6.v20141205.jar</string>
+			<string>$JAVAROOT/lib/jetty-util-9.2.6.v20141205.jar</string>
+			<string>$JAVAROOT/lib/jetty-webapp-9.2.6.v20141205.jar</string>
+			<string>$JAVAROOT/lib/jetty-xml-9.2.6.v20141205.jar</string>			                      
 			<string>$JAVAROOT/lib/jsch-0.1.51.jar</string>
 			<string>$JAVAROOT/lib/json-simple-1.1.1.jar</string>
 			<string>$JAVAROOT/lib/jsoup-1.8.1.jar</string>
diff --git a/build.xml b/build.xml
index 551535587..076a02df5 100644
--- a/build.xml
+++ b/build.xml
@@ -187,20 +187,20 @@
     	<pathelement location="${lib}/jcl-over-slf4j-1.7.2.jar" />
     	<pathelement location="${lib}/jempbox-1.8.8" />
         <pathelement location="${lib}/javax.servlet-api-3.1.0.jar" />
-        <pathelement location="${lib}/jetty-client-9.2.4.v20141103.jar" />
-        <pathelement location="${lib}/jetty-continuation-9.2.4.v20141103.jar" />
-        <pathelement location="${lib}/jetty-deploy-9.2.4.v20141103.jar" />
-        <pathelement location="${lib}/jetty-http-9.2.4.v20141103.jar" />
-        <pathelement location="${lib}/jetty-io-9.2.4.v20141103.jar" />
-        <pathelement location="${lib}/jetty-jmx-9.2.4.v20141103.jar" />
-        <pathelement location="${lib}/jetty-proxy-9.2.4.v20141103.jar" />
-        <pathelement location="${lib}/jetty-security-9.2.4.v20141103.jar" />
-        <pathelement location="${lib}/jetty-server-9.2.4.v20141103.jar" />
-        <pathelement location="${lib}/jetty-servlet-9.2.4.v20141103.jar" />
-        <pathelement location="${lib}/jetty-servlets-9.2.4.v20141103.jar" />
-        <pathelement location="${lib}/jetty-util-9.2.4.v20141103.jar" />
-        <pathelement location="${lib}/jetty-webapp-9.2.4.v20141103.jar" />
-        <pathelement location="${lib}/jetty-xml-9.2.4.v20141103.jar" />
+        <pathelement location="${lib}/jetty-client-9.2.6.v20141205.jar" />
+        <pathelement location="${lib}/jetty-continuation-9.2.6.v20141205.jar" />
+        <pathelement location="${lib}/jetty-deploy-9.2.6.v20141205.jar" />
+        <pathelement location="${lib}/jetty-http-9.2.6.v20141205.jar" />
+        <pathelement location="${lib}/jetty-io-9.2.6.v20141205.jar" />
+        <pathelement location="${lib}/jetty-jmx-9.2.6.v20141205.jar" />
+        <pathelement location="${lib}/jetty-proxy-9.2.6.v20141205.jar" />
+        <pathelement location="${lib}/jetty-security-9.2.6.v20141205.jar" />
+        <pathelement location="${lib}/jetty-server-9.2.6.v20141205.jar" />
+        <pathelement location="${lib}/jetty-servlet-9.2.6.v20141205.jar" />
+        <pathelement location="${lib}/jetty-servlets-9.2.6.v20141205.jar" />
+        <pathelement location="${lib}/jetty-util-9.2.6.v20141205.jar" />
+        <pathelement location="${lib}/jetty-webapp-9.2.6.v20141205.jar" />
+        <pathelement location="${lib}/jetty-xml-9.2.6.v20141205.jar" />
     	<pathelement location="${lib}/jsch-0.1.51.jar" />
     	<pathelement location="${lib}/json-simple-1.1.1.jar" />
     	<pathelement location="${lib}/jsoup-1.8.1.jar" />
diff --git a/lib/jetty-9.2.4.v20141103.License b/lib/jetty-9.2.6.v20141205.License
index d64569567..d64569567 100644
--- a/lib/jetty-9.2.4.v20141103.License
+++ b/lib/jetty-9.2.6.v20141205.License
diff --git a/lib/jetty-client-9.2.4.v20141103.jar b/lib/jetty-client-9.2.6.v20141205.jar
index 9d789f29b..27739e5b0 100644
--- a/lib/jetty-client-9.2.4.v20141103.jar
+++ b/lib/jetty-client-9.2.6.v20141205.jar
diff --git a/lib/jetty-continuation-9.2.4.v20141103.jar b/lib/jetty-continuation-9.2.6.v20141205.jar
index 3dd18c398..48736d767 100644
--- a/lib/jetty-continuation-9.2.4.v20141103.jar
+++ b/lib/jetty-continuation-9.2.6.v20141205.jar
diff --git a/lib/jetty-deploy-9.2.4.v20141103.jar b/lib/jetty-deploy-9.2.6.v20141205.jar
index 4f00da62b..a9d6ebb86 100644
--- a/lib/jetty-deploy-9.2.4.v20141103.jar
+++ b/lib/jetty-deploy-9.2.6.v20141205.jar
diff --git a/lib/jetty-http-9.2.4.v20141103.jar b/lib/jetty-http-9.2.6.v20141205.jar
index 39e8e28eb..f1738417c 100644
--- a/lib/jetty-http-9.2.4.v20141103.jar
+++ b/lib/jetty-http-9.2.6.v20141205.jar
diff --git a/lib/jetty-io-9.2.4.v20141103.jar b/lib/jetty-io-9.2.6.v20141205.jar
index b819e7491..8ec3a5346 100644
--- a/lib/jetty-io-9.2.4.v20141103.jar
+++ b/lib/jetty-io-9.2.6.v20141205.jar
diff --git a/lib/jetty-jmx-9.2.4.v20141103.jar b/lib/jetty-jmx-9.2.6.v20141205.jar
index 696d965d8..0957e415b 100644
--- a/lib/jetty-jmx-9.2.4.v20141103.jar
+++ b/lib/jetty-jmx-9.2.6.v20141205.jar
diff --git a/lib/jetty-proxy-9.2.4.v20141103.jar b/lib/jetty-proxy-9.2.6.v20141205.jar
index 923a4a0c5..593964ba6 100644
--- a/lib/jetty-proxy-9.2.4.v20141103.jar
+++ b/lib/jetty-proxy-9.2.6.v20141205.jar
diff --git a/lib/jetty-security-9.2.4.v20141103.jar b/lib/jetty-security-9.2.6.v20141205.jar
index 7bd789f6e..b2afbea18 100644
--- a/lib/jetty-security-9.2.4.v20141103.jar
+++ b/lib/jetty-security-9.2.6.v20141205.jar
diff --git a/lib/jetty-server-9.2.4.v20141103.jar b/lib/jetty-server-9.2.6.v20141205.jar
index de0556588..857f16d3d 100644
--- a/lib/jetty-server-9.2.4.v20141103.jar
+++ b/lib/jetty-server-9.2.6.v20141205.jar
diff --git a/lib/jetty-servlet-9.2.4.v20141103.jar b/lib/jetty-servlet-9.2.6.v20141205.jar
index cc5501e84..8175280e0 100644
--- a/lib/jetty-servlet-9.2.4.v20141103.jar
+++ b/lib/jetty-servlet-9.2.6.v20141205.jar
diff --git a/lib/jetty-servlets-9.2.4.v20141103.jar b/lib/jetty-servlets-9.2.6.v20141205.jar
index f37551dfb..8fdb3eb69 100644
--- a/lib/jetty-servlets-9.2.4.v20141103.jar
+++ b/lib/jetty-servlets-9.2.6.v20141205.jar
diff --git a/lib/jetty-util-9.2.4.v20141103.jar b/lib/jetty-util-9.2.6.v20141205.jar
index 8d89ec13d..a530b929c 100644
--- a/lib/jetty-util-9.2.4.v20141103.jar
+++ b/lib/jetty-util-9.2.6.v20141205.jar
diff --git a/lib/jetty-webapp-9.2.4.v20141103.jar b/lib/jetty-webapp-9.2.6.v20141205.jar
index f2c266877..abf19357e 100644
--- a/lib/jetty-webapp-9.2.4.v20141103.jar
+++ b/lib/jetty-webapp-9.2.6.v20141205.jar
diff --git a/lib/jetty-xml-9.2.4.v20141103.jar b/lib/jetty-xml-9.2.6.v20141205.jar
index dc6b67d75..ef822b94d 100644
--- a/lib/jetty-xml-9.2.4.v20141103.jar
+++ b/lib/jetty-xml-9.2.6.v20141205.jar
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 04a619904..d665ccb7e 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -83,7 +83,7 @@
             <compilation-unit>

                 <package-root>source</package-root>

                 <package-root>htroot</package-root>

-                <classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/commons-codec-1.9.jar;lib/commons-compress-1.8.1.jar;lib/commons-fileupload-1.2.2.jar;lib/commons-io-2.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.8.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.3.6.jar;lib/httpcore-4.3.3.jar;lib/httpmime-4.3.6.jar;lib/icu4j-core.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.2.jar;lib/jempbox-1.8.8.jar;lib/jetty-client-9.2.4.v20141103.jar;lib/jetty-continuation-9.2.4.v20141103.jar;lib/jetty-deploy-9.2.4.v20141103.jar;lib/jetty-http-9.2.4.v20141103.jar;lib/jetty-io-9.2.4.v20141103.jar;lib/jetty-jmx-9.2.4.v20141103.jar;lib/jetty-proxy-9.2.4.v20141103.jar;lib/jetty-security-9.2.4.v20141103.jar;lib/jetty-server-9.2.4.v20141103.jar;lib/jetty-servlet-9.2.4.v20141103.jar;lib/jetty-servlets-9.2.4.v20141103.jar;lib/jetty-util-9.2.4.v20141103.jar;lib/jetty-webapp-9.2.4.v20141103.jar;lib/jetty-xml-9.2.4.v20141103.jar;lib/jsch-0.1.51.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.1.jar;lib/log4j-over-slf4j-1.7.2.jar;lib/lucene-analyzers-common-4.10.2.jar;lib/lucene-analyzers-phonetic-4.10.2.jar;lib/lucene-classification-4.10.2.jar;lib/lucene-codecs-4.10.2.jar;lib/lucene-core-4.10.2.jar;lib/lucene-facet-4.10.2.jar;lib/lucene-grouping-4.10.2.jar;lib/lucene-highlighter-4.10.2.jar;lib/lucene-join-4.10.2.jar;lib/lucene-memory-4.10.2.jar;lib/lucene-misc-4.10.2.jar;lib/lucene-queries-4.10.2.jar;lib/lucene-queryparser-4.10.2.jar;lib/lucene-spatial-4.10.2.jar;lib/lucene-suggest-4.10.2.jar;lib/metadata-extractor-2.7.0.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.8.jar;lib/poi-3.10.1.jar;lib/poi-scratchpad-3.10.1.jar;lib/slf4j-api-1.7.6.jar;lib/slf4j-jdk14-1.7.2.jar;lib/solr-core-4.10.2.jar;lib/solr-solrj-4.10.2.jar;lib/spatial4j-0.4.1.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.2.jar;lib/wstx-asl-3.2.9.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>

+                <classpath mode="compile">lib/J7Zip-modified.jar;lib/apache-mime4j-0.6.jar;lib/bcmail-jdk15-1.46.jar;lib/bcprov-jdk15-1.46.jar;lib/chardet.jar;lib/commons-codec-1.9.jar;lib/commons-compress-1.8.1.jar;lib/commons-fileupload-1.2.2.jar;lib/commons-io-2.3.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.8.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.3.6.jar;lib/httpcore-4.3.3.jar;lib/httpmime-4.3.6.jar;lib/icu4j-core.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/javax.servlet-api-3.1.0.jar;lib/jcifs-1.3.17.jar;lib/jcl-over-slf4j-1.7.2.jar;lib/jempbox-1.8.8.jar;lib/jetty-client-9.2.6.v20141205.jar;lib/jetty-continuation-9.2.6.v20141205.jar;lib/jetty-deploy-9.2.6.v20141205.jar;lib/jetty-http-9.2.6.v20141205.jar;lib/jetty-io-9.2.6.v20141205.jar;lib/jetty-jmx-9.2.6.v20141205.jar;lib/jetty-proxy-9.2.6.v20141205.jar;lib/jetty-security-9.2.6.v20141205.jar;lib/jetty-server-9.2.6.v20141205.jar;lib/jetty-servlet-9.2.6.v20141205.jar;lib/jetty-servlets-9.2.6.v20141205.jar;lib/jetty-util-9.2.6.v20141205.jar;lib/jetty-webapp-9.2.6.v20141205.jar;lib/jetty-xml-9.2.6.v20141205.jar;lib/jsch-0.1.51.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.1.jar;lib/log4j-over-slf4j-1.7.2.jar;lib/lucene-analyzers-common-4.10.2.jar;lib/lucene-analyzers-phonetic-4.10.2.jar;lib/lucene-classification-4.10.2.jar;lib/lucene-codecs-4.10.2.jar;lib/lucene-core-4.10.2.jar;lib/lucene-facet-4.10.2.jar;lib/lucene-grouping-4.10.2.jar;lib/lucene-highlighter-4.10.2.jar;lib/lucene-join-4.10.2.jar;lib/lucene-memory-4.10.2.jar;lib/lucene-misc-4.10.2.jar;lib/lucene-queries-4.10.2.jar;lib/lucene-queryparser-4.10.2.jar;lib/lucene-spatial-4.10.2.jar;lib/lucene-suggest-4.10.2.jar;lib/metadata-extractor-2.7.0.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.8.jar;lib/poi-3.10.1.jar;lib/poi-scratchpad-3.10.1.jar;lib/slf4j-api-1.7.6.jar;lib/slf4j-jdk14-1.7.2.jar;lib/solr-core-4.10.2.jar;lib/solr-solrj-4.10.2.jar;lib/spatial4j-0.4.1.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.2.jar;lib/wstx-asl-3.2.9.jar;lib/xercesImpl.jar;lib/xml-apis.jar;lib/xmpcore-5.1.2.jar;lib/zookeeper-3.4.6.jar</classpath>

                 <built-to>lib/yacycore.jar</built-to>

                 <source-level>1.7</source-level>

             </compilation-unit>