diff --git a/.classpath b/.classpath
index 139752929..f945035d7 100644
--- a/.classpath
+++ b/.classpath
@@ -1,97 +1,97 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build.xml b/build.xml
index d5ed8631e..fb2815037 100644
--- a/build.xml
+++ b/build.xml
@@ -176,16 +176,16 @@
-
+
-
-
+
+
-
+
@@ -201,10 +201,10 @@
-
+
-
+
@@ -227,13 +227,13 @@
-
-
+
+
-
+
diff --git a/htroot/suggest.java b/htroot/suggest.java
index 441505299..552b0e601 100644
--- a/htroot/suggest.java
+++ b/htroot/suggest.java
@@ -102,6 +102,16 @@ public class suggest {
prop.putHTML("query", originalquerystring);
}
+ // check for JSONP
+ if ( post.containsKey("callback") ) {
+ final String jsonp = post.get("callback") + "([";
+ prop.put("jsonp-start", jsonp);
+ prop.put("jsonp-end", "])");
+ } else {
+ prop.put("jsonp-start", "");
+ prop.put("jsonp-end", "");
+ }
+
// Adding CORS Access header for xml output
if (xml) {
final ResponseHeader outgoingHeader = new ResponseHeader(200);
diff --git a/htroot/suggest.json b/htroot/suggest.json
index fab9e4743..222c110c3 100644
--- a/htroot/suggest.json
+++ b/htroot/suggest.json
@@ -1 +1 @@
-["#[query]#",[#{suggestions}#"#[text]#"#(eol)#,::#(/eol)##{/suggestions}#]]
+#[jsonp-start]#["#[query]#",[#{suggestions}#"#[text]#"#(eol)#,::#(/eol)##{/suggestions}#]]#[jsonp-end]#
\ No newline at end of file
diff --git a/lib/httpclient-4.4.1.License b/lib/httpclient-4.5.License
similarity index 100%
rename from lib/httpclient-4.4.1.License
rename to lib/httpclient-4.5.License
diff --git a/lib/httpclient-4.4.1.jar b/lib/httpclient-4.5.jar
similarity index 77%
rename from lib/httpclient-4.4.1.jar
rename to lib/httpclient-4.5.jar
index b80d37967..970c9891c 100644
Binary files a/lib/httpclient-4.4.1.jar and b/lib/httpclient-4.5.jar differ
diff --git a/lib/httpmime-4.4.1.License b/lib/httpmime-4.5.License
similarity index 100%
rename from lib/httpmime-4.4.1.License
rename to lib/httpmime-4.5.License
diff --git a/lib/httpmime-4.4.1.jar b/lib/httpmime-4.5.jar
similarity index 65%
rename from lib/httpmime-4.4.1.jar
rename to lib/httpmime-4.5.jar
index e748cbde7..b631ceb4e 100644
Binary files a/lib/httpmime-4.4.1.jar and b/lib/httpmime-4.5.jar differ
diff --git a/lib/icu4j-55_1.jar b/lib/icu4j-55_1.jar
new file mode 100644
index 000000000..e281a87a4
Binary files /dev/null and b/lib/icu4j-55_1.jar differ
diff --git a/lib/icu4j-core.jar b/lib/icu4j-core.jar
deleted file mode 100644
index b62189c04..000000000
Binary files a/lib/icu4j-core.jar and /dev/null differ
diff --git a/lib/jcl-over-slf4j-1.7.12.jar b/lib/jcl-over-slf4j-1.7.12.jar
new file mode 100644
index 000000000..2030a7037
Binary files /dev/null and b/lib/jcl-over-slf4j-1.7.12.jar differ
diff --git a/lib/jcl-over-slf4j-1.7.9.jar b/lib/jcl-over-slf4j-1.7.9.jar
deleted file mode 100644
index 682a46b1f..000000000
Binary files a/lib/jcl-over-slf4j-1.7.9.jar and /dev/null differ
diff --git a/lib/jsch-0.1.52.jar b/lib/jsch-0.1.52.jar
deleted file mode 100644
index 9e50e6742..000000000
Binary files a/lib/jsch-0.1.52.jar and /dev/null differ
diff --git a/lib/jsch-0.1.52.License b/lib/jsch-0.1.53.License
similarity index 94%
rename from lib/jsch-0.1.52.License
rename to lib/jsch-0.1.53.License
index 2cf7a501a..303096bf3 100644
--- a/lib/jsch-0.1.52.License
+++ b/lib/jsch-0.1.53.License
@@ -1,30 +1,30 @@
-JSch 0.0.* was released under the GNU LGPL license. Later, we have switched
-over to a BSD-style license.
-
-------------------------------------------------------------------------------
-Copyright (c) 2002,2003,2004 Atsuhiko Yamanaka, JCraft,Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the distribution.
-
- 3. The names of the authors may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+JSch 0.0.* was released under the GNU LGPL license. Later, we have switched
+over to a BSD-style license.
+
+------------------------------------------------------------------------------
+Copyright (c) 2002-2015 Atsuhiko Yamanaka, JCraft,Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the distribution.
+
+ 3. The names of the authors may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/lib/jsch-0.1.53.jar b/lib/jsch-0.1.53.jar
new file mode 100644
index 000000000..2e4c69d6a
Binary files /dev/null and b/lib/jsch-0.1.53.jar differ
diff --git a/lib/log4j-over-slf4j-1.7.12.jar b/lib/log4j-over-slf4j-1.7.12.jar
new file mode 100644
index 000000000..fd3f48c81
Binary files /dev/null and b/lib/log4j-over-slf4j-1.7.12.jar differ
diff --git a/lib/log4j-over-slf4j-1.7.9.jar b/lib/log4j-over-slf4j-1.7.9.jar
deleted file mode 100644
index c8289369d..000000000
Binary files a/lib/log4j-over-slf4j-1.7.9.jar and /dev/null differ
diff --git a/lib/slf4j-api-1.7.12.jar b/lib/slf4j-api-1.7.12.jar
new file mode 100644
index 000000000..e357ddc7f
Binary files /dev/null and b/lib/slf4j-api-1.7.12.jar differ
diff --git a/lib/slf4j-api-1.7.9.jar b/lib/slf4j-api-1.7.9.jar
deleted file mode 100644
index 3d7274426..000000000
Binary files a/lib/slf4j-api-1.7.9.jar and /dev/null differ
diff --git a/lib/slf4j-jdk14-1.7.12.jar b/lib/slf4j-jdk14-1.7.12.jar
new file mode 100644
index 000000000..cf078f810
Binary files /dev/null and b/lib/slf4j-jdk14-1.7.12.jar differ
diff --git a/lib/slf4j-jdk14-1.7.9.jar b/lib/slf4j-jdk14-1.7.9.jar
deleted file mode 100644
index 750272056..000000000
Binary files a/lib/slf4j-jdk14-1.7.9.jar and /dev/null differ
diff --git a/lib/weupnp-0.1.2.jar b/lib/weupnp-0.1.2.jar
deleted file mode 100644
index 43daf9ff2..000000000
Binary files a/lib/weupnp-0.1.2.jar and /dev/null differ
diff --git a/lib/weupnp-0.1.3.jar b/lib/weupnp-0.1.3.jar
new file mode 100644
index 000000000..b728e879d
Binary files /dev/null and b/lib/weupnp-0.1.3.jar differ
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 813155525..0111dcb53 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -83,7 +83,7 @@
source
htroot
- 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.10.jar;lib/commons-compress-1.9.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.4.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.9.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.4.jar;lib/httpcore-4.4.1.jar;lib/httpmime-4.4.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.9.jar;lib/jempbox-1.8.9.jar;lib/jetty-client-9.2.11.v20150529.jar;lib/jetty-continuation-9.2.11.v20150529.jar;lib/jetty-deploy-9.2.11.v20150529.jar;lib/jetty-http-9.2.11.v20150529.jar;lib/jetty-io-9.2.11.v20150529.jar;lib/jetty-jmx-9.2.11.v20150529.jar;lib/jetty-proxy-9.2.11.v20150529.jar;lib/jetty-security-9.2.11.v20150529.jar;lib/jetty-server-9.2.11.v20150529.jar;lib/jetty-servlet-9.2.11.v20150529.jar;lib/jetty-servlets-9.2.11.v20150529.jar;lib/jetty-util-9.2.11.v20150529.jar;lib/jetty-webapp-9.2.11.v20150529.jar;lib/jetty-xml-9.2.11.v20150529.jar;lib/jsch-0.1.52.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.2.jar;lib/log4j-over-slf4j-1.7.9.jar;lib/lucene-analyzers-common-4.10.3.jar;lib/lucene-analyzers-phonetic-4.10.3.jar;lib/lucene-classification-4.10.3.jar;lib/lucene-codecs-4.10.3.jar;lib/lucene-core-4.10.3.jar;lib/lucene-facet-4.10.3.jar;lib/lucene-grouping-4.10.3.jar;lib/lucene-highlighter-4.10.3.jar;lib/lucene-join-4.10.3.jar;lib/lucene-memory-4.10.3.jar;lib/lucene-misc-4.10.3.jar;lib/lucene-queries-4.10.3.jar;lib/lucene-queryparser-4.10.3.jar;lib/lucene-spatial-4.10.3.jar;lib/lucene-suggest-4.10.3.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.5.jar;lib/org.restlet.jar;lib/pdfbox-1.8.9.jar;lib/poi-3.12-20150511.jar;lib/poi-scratchpad-3.12-20150511.jar;lib/slf4j-api-1.7.9.jar;lib/slf4j-jdk14-1.7.9.jar;lib/solr-core-4.10.3.jar;lib/solr-solrj-4.10.3.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
+ 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.10.jar;lib/commons-compress-1.9.jar;lib/commons-fileupload-1.3.1.jar;lib/commons-io-2.4.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.2.jar;lib/fontbox-1.8.9.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-18.0.jar;lib/htmllexer.jar;lib/httpclient-4.5.jar;lib/httpcore-4.4.1.jar;lib/httpmime-4.5.jar;lib/icu4j-55_1.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.12.jar;lib/jempbox-1.8.9.jar;lib/jetty-client-9.2.11.v20150529.jar;lib/jetty-continuation-9.2.11.v20150529.jar;lib/jetty-deploy-9.2.11.v20150529.jar;lib/jetty-http-9.2.11.v20150529.jar;lib/jetty-io-9.2.11.v20150529.jar;lib/jetty-jmx-9.2.11.v20150529.jar;lib/jetty-proxy-9.2.11.v20150529.jar;lib/jetty-security-9.2.11.v20150529.jar;lib/jetty-server-9.2.11.v20150529.jar;lib/jetty-servlet-9.2.11.v20150529.jar;lib/jetty-servlets-9.2.11.v20150529.jar;lib/jetty-util-9.2.11.v20150529.jar;lib/jetty-webapp-9.2.11.v20150529.jar;lib/jetty-xml-9.2.11.v20150529.jar;lib/jsch-0.1.53.jar;lib/json-simple-1.1.1.jar;lib/jsoup-1.8.2.jar;lib/log4j-over-slf4j-1.7.12.jar;lib/lucene-analyzers-common-5.2.0.jar;lib/lucene-analyzers-phonetic-5.2.0.jar;lib/lucene-backward-codecs-5.2.0.jar;lib/lucene-classification-5.2.0.jar;lib/lucene-codecs-5.2.0.jar;lib/lucene-core-5.2.0.jar;lib/lucene-facet-5.2.0.jar;lib/lucene-grouping-5.2.0.jar;lib/lucene-highlighter-5.2.0.jar;lib/lucene-join-5.2.0.jar;lib/lucene-memory-5.2.0.jar;lib/lucene-misc-5.2.0.jar;lib/lucene-queries-5.2.0.jar;lib/lucene-queryparser-5.2.0.jar;lib/lucene-spatial-5.2.0.jar;lib/lucene-suggest-5.2.0.jar;lib/metadata-extractor-2.8.1.jar;lib/noggit-0.6.jar;lib/org.restlet.jar;lib/pdfbox-1.8.9.jar;lib/poi-3.12-20150511.jar;lib/poi-scratchpad-3.12-20150511.jar;lib/slf4j-api-1.7.12.jar;lib/slf4j-jdk14-1.7.12.jar;lib/solr-core-5.2.0.jar;lib/solr-solrj-5.2.0.jar;lib/spatial4j-0.4.1.jar;lib/stax2-api-3.1.4.jar;lib/webcat-0.1-swf.jar;lib/weupnp-0.1.3.jar;lib/woodstox-core-asl-4.4.1.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
lib/yacycore.jar
1.7
diff --git a/pom.xml b/pom.xml
index 07e035b38..6ff698b1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -386,7 +386,7 @@
org.apache.httpcomponents
httpclient
- 4.4
+ 4.5
org.apache.httpcomponents
@@ -396,12 +396,12 @@
org.apache.httpcomponents
httpmime
- 4.4
+ 4.5
com.ibm.icu
icu4j
- 4.8.1.1
+ 55.1
org
@@ -431,7 +431,7 @@
com.jcraft
jsch
- 0.1.52
+ 0.1.53
com.googlecode.json-simple
@@ -631,7 +631,7 @@
org.bitlet
weupnp
- 0.1.2
+ 0.1.3
org.codehaus.woodstox