27 files changed, 55 insertions, 55 deletions

diff --git a/.classpath b/.classpath
index 1e42ce759..a26f288eb 100644
--- a/.classpath
+++ b/.classpath
@@ -25,7 +25,6 @@
 	<classpathentry kind="lib" path="lib/jsch-0.1.42.jar"/>
 	<classpathentry kind="lib" path="lib/jakarta-oro-2.0.8.jar"/>
 	<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.12-bin.jar"/>
-	<classpathentry kind="lib" path="lib/jcifs-1.3.15.jar"/>
 	<classpathentry kind="lib" path="lib/apache-mime4j-0.6.jar"/>
 	<classpathentry kind="lib" path="lib/commons-fileupload-1.2.2.jar"/>
 	<classpathentry kind="lib" path="lib/json-simple-1.1.jar"/>
@@ -52,25 +51,26 @@
 	<classpathentry kind="lib" path="lib/httpclient-4.2.5.jar"/>
 	<classpathentry kind="lib" path="lib/httpcore-4.2.4.jar"/>
 	<classpathentry kind="lib" path="lib/httpmime-4.2.5.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-analyzers-common-4.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-classification-4.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-codecs-4.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-core-4.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-facet-4.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-grouping-4.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-highlighter-4.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-join-4.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-memory-4.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-misc-4.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-queries-4.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-queryparser-4.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-spatial-4.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-suggest-4.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/solr-core-4.3.0.jar"/>
-	<classpathentry kind="lib" path="lib/solr-solrj-4.3.0.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/lucene-analyzers-common-4.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-analyzers-phonetic-4.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-classification-4.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-codecs-4.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-core-4.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-facet-4.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-grouping-4.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-highlighter-4.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-join-4.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-memory-4.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-misc-4.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-queries-4.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-queryparser-4.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-spatial-4.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-suggest-4.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/solr-core-4.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/solr-solrj-4.4.0.jar"/>
+	<classpathentry kind="lib" path="lib/jcifs-1.3.17.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/icu4j-core.jar"/>
 	<classpathentry kind="lib" path="lib/htmllexer.jar"/>
diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist
index 47d3bb6c7..284f1506e 100644
--- a/addon/YaCy.app/Contents/Info.plist
+++ b/addon/YaCy.app/Contents/Info.plist
@@ -61,28 +61,28 @@
 			<string>$JAVAROOT/lib/J7Zip-modified.jar</string>
 			<string>$JAVAROOT/lib/jakarta-oro-2.0.8.jar</string>
 			<string>$JAVAROOT/lib/jaudiotagger-2.0.4-20111207.115108-15.jar</string>
-			<string>$JAVAROOT/lib/jcifs-1.3.15.jar</string>
+			<string>$JAVAROOT/lib/jcifs-1.3.17.jar</string>
 			<string>$JAVAROOT/lib/jcl-over-slf4j-1.7.2.jar</string>
 			<string>$JAVAROOT/lib/jempbox-1.8.1.jar</string>
 			<string>$JAVAROOT/lib/jena-2.6.4.jar</string>
 			<string>$JAVAROOT/lib/jsch-0.1.42.jar</string>
 			<string>$JAVAROOT/lib/json-simple-1.1.jar</string>
 			<string>$JAVAROOT/lib/log4j-over-slf4j-1.7.2.jar</string>
-			<string>$JAVAROOT/lib/lucene-analyzers-common-4.3.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.3.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-classification-4.3.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-codecs-4.3.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-core-4.3.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-facet-4.3.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-grouping-4.3.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-highlighter-4.3.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-join-4.3.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-memory-4.3.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-misc-4.3.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-queries-4.3.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-queryparser-4.3.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-spatial-4.3.0.jar</string>
-			<string>$JAVAROOT/lib/lucene-suggest-4.3.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-analyzers-common-4.4.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-analyzers-phonetic-4.4.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-classification-4.4.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-codecs-4.4.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-core-4.4.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-facet-4.4.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-grouping-4.4.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-highlighter-4.4.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-join-4.4.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-memory-4.4.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-misc-4.4.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-queries-4.4.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-queryparser-4.4.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-spatial-4.4.0.jar</string>
+			<string>$JAVAROOT/lib/lucene-suggest-4.4.0.jar</string>
 			<string>$JAVAROOT/lib/metadata-extractor-2.6.2.jar</string>
 			<string>$JAVAROOT/lib/mysql-connector-java-5.1.12-bin.jar</string>
 			<string>$JAVAROOT/lib/noggit-0.5.jar</string>
@@ -93,8 +93,8 @@
 			<string>$JAVAROOT/lib/servlet-api-2.5-20081211.jar</string>
 			<string>$JAVAROOT/lib/slf4j-api-1.7.2.jar</string>
 			<string>$JAVAROOT/lib/slf4j-jdk14-1.7.2.jar</string>
-			<string>$JAVAROOT/lib/solr-core-4.3.0.jar</string>
-			<string>$JAVAROOT/lib/solr-solrj-4.3.0.jar</string>
+			<string>$JAVAROOT/lib/solr-core-4.4.0.jar</string>
+			<string>$JAVAROOT/lib/solr-solrj-4.4.0.jar</string>
 			<string>$JAVAROOT/lib/spatial4j-0.3.jar</string>
 			<string>$JAVAROOT/lib/webcat-0.1-swf.jar</string>
 			<string>$JAVAROOT/lib/wstx-asl-3.2.9.jar</string>
diff --git a/build.xml b/build.xml
index c0e01449a..8c2904048 100644
--- a/build.xml
+++ b/build.xml
@@ -179,7 +179,7 @@
         <pathelement location="${lib}/J7Zip-modified.jar" />
         <pathelement location="${lib}/jakarta-oro-2.0.8.jar" />
     	<pathelement location="${lib}/jaudiotagger-2.0.4-20111207.115108-15.jar" />
-    	<pathelement location="${lib}/jcifs-1.3.15.jar" />
+    	<pathelement location="${lib}/jcifs-1.3.17.jar" />
     	<pathelement location="${lib}/jcl-over-slf4j-1.7.2.jar" />
     	<pathelement location="${lib}/jempbox-1.8.1" />
     	<pathelement location="${lib}/jena-2.6.4.jar" />
@@ -187,21 +187,21 @@
     	<pathelement location="${lib}/json-simple-1.1.jar" />
     	<pathelement location="${lib}/jsoup-1.6.3.jar" />
     	<pathelement location="${lib}/log4j-over-slf4j-1.7.2.jar" />
-    	<pathelement location="${lib}/lucene-analyzers-common-4.3.0.jar" />
-    	<pathelement location="${lib}/lucene-analyzers-phonetic-4.3.0.jar" />
-    	<pathelement location="${lib}/lucene-classification-4.3.0.jar" />
-    	<pathelement location="${lib}/lucene-codecs-4.3.0.jar" />
-    	<pathelement location="${lib}/lucene-core-4.3.0.jar" />
-    	<pathelement location="${lib}/lucene-facet-4.3.0.jar" />
-    	<pathelement location="${lib}/lucene-grouping-4.3.0.jar" />
-    	<pathelement location="${lib}/lucene-highlighter-4.3.0.jar" />
-    	<pathelement location="${lib}/lucene-join-4.3.0.jar" />
-    	<pathelement location="${lib}/lucene-memory-4.3.0.jar" />
-    	<pathelement location="${lib}/lucene-misc-4.3.0.jar" />
-    	<pathelement location="${lib}/lucene-queries-4.3.0.jar" />
-    	<pathelement location="${lib}/lucene-queryparser-4.3.0.jar" />
-    	<pathelement location="${lib}/lucene-spatial-4.3.0.jar" />
-    	<pathelement location="${lib}/lucene-suggest-4.3.0.jar" />
+    	<pathelement location="${lib}/lucene-analyzers-common-4.4.0.jar" />
+    	<pathelement location="${lib}/lucene-analyzers-phonetic-4.4.0.jar" />
+    	<pathelement location="${lib}/lucene-classification-4.4.0.jar" />
+    	<pathelement location="${lib}/lucene-codecs-4.4.0.jar" />
+    	<pathelement location="${lib}/lucene-core-4.4.0.jar" />
+    	<pathelement location="${lib}/lucene-facet-4.4.0.jar" />
+    	<pathelement location="${lib}/lucene-grouping-4.4.0.jar" />
+    	<pathelement location="${lib}/lucene-highlighter-4.4.0.jar" />
+    	<pathelement location="${lib}/lucene-join-4.4.0.jar" />
+    	<pathelement location="${lib}/lucene-memory-4.4.0.jar" />
+    	<pathelement location="${lib}/lucene-misc-4.4.0.jar" />
+    	<pathelement location="${lib}/lucene-queries-4.4.0.jar" />
+    	<pathelement location="${lib}/lucene-queryparser-4.4.0.jar" />
+    	<pathelement location="${lib}/lucene-spatial-4.4.0.jar" />
+    	<pathelement location="${lib}/lucene-suggest-4.4.0.jar" />
     	<pathelement location="${lib}/metadata-extractor-2.6.2.jar" />
     	<pathelement location="${lib}/mysql-connector-java-5.1.12-bin.jar" />
     	<pathelement location="${lib}/noggit-0.5.jar" />
@@ -212,8 +212,8 @@
         <pathelement location="${lib}/servlet-api-2.5-20081211.jar" />
         <pathelement location="${lib}/slf4j-api-1.7.2.jar" />
         <pathelement location="${lib}/slf4j-jdk14-1.7.2.jar" />
-        <pathelement location="${lib}/solr-core-4.3.0.jar" />
-        <pathelement location="${lib}/solr-solrj-4.3.0.jar" />
+        <pathelement location="${lib}/solr-core-4.4.0.jar" />
+        <pathelement location="${lib}/solr-solrj-4.4.0.jar" />
     	<pathelement location="${lib}/spatial4j-0.3.jar" />
     	<pathelement location="${lib}/webcat-0.1-swf.jar" />
     	<pathelement location="${lib}/wstx-asl-3.2.9.jar" />
diff --git a/lib/jcifs-1.3.15.jar b/lib/jcifs-1.3.15.jar
deleted file mode 100644
index dddb1bfb6..000000000
--- a/lib/jcifs-1.3.15.jar
+++ /dev/null
diff --git a/lib/jcifs-1.3.15-LICENSE.txt b/lib/jcifs-1.3.17-LICENSE.txt
index c4be8701e..c4be8701e 100644
--- a/lib/jcifs-1.3.15-LICENSE.txt
+++ b/lib/jcifs-1.3.17-LICENSE.txt
diff --git a/lib/jcifs-1.3.17.jar b/lib/jcifs-1.3.17.jar
new file mode 100644
index 000000000..ae4c8d86b
--- /dev/null
+++ b/lib/jcifs-1.3.17.jar
diff --git a/lib/lucene-analyzers-common-4.3.0.jar b/lib/lucene-analyzers-common-4.4.0.jar
index f75c9f143..1784e5704 100644
--- a/lib/lucene-analyzers-common-4.3.0.jar
+++ b/lib/lucene-analyzers-common-4.4.0.jar
diff --git a/lib/lucene-analyzers-phonetic-4.3.0.jar b/lib/lucene-analyzers-phonetic-4.4.0.jar
index a19bde23a..dacf818a1 100644
--- a/lib/lucene-analyzers-phonetic-4.3.0.jar
+++ b/lib/lucene-analyzers-phonetic-4.4.0.jar
diff --git a/lib/lucene-classification-4.3.0.jar b/lib/lucene-classification-4.4.0.jar
index cbb852b80..5aa7e6982 100644
--- a/lib/lucene-classification-4.3.0.jar
+++ b/lib/lucene-classification-4.4.0.jar
diff --git a/lib/lucene-codecs-4.3.0.jar b/lib/lucene-codecs-4.4.0.jar
index c987ea0e5..844444167 100644
--- a/lib/lucene-codecs-4.3.0.jar
+++ b/lib/lucene-codecs-4.4.0.jar
diff --git a/lib/lucene-core-4.3.0.jar b/lib/lucene-core-4.4.0.jar
index cf67a6ffc..df4eae6da 100644
--- a/lib/lucene-core-4.3.0.jar
+++ b/lib/lucene-core-4.4.0.jar
diff --git a/lib/lucene-facet-4.3.0.jar b/lib/lucene-facet-4.4.0.jar
index 2e5e0841e..17ac873fd 100644
--- a/lib/lucene-facet-4.3.0.jar
+++ b/lib/lucene-facet-4.4.0.jar
diff --git a/lib/lucene-grouping-4.3.0.jar b/lib/lucene-grouping-4.4.0.jar
index a0e077eeb..de433151b 100644
--- a/lib/lucene-grouping-4.3.0.jar
+++ b/lib/lucene-grouping-4.4.0.jar
diff --git a/lib/lucene-highlighter-4.3.0.jar b/lib/lucene-highlighter-4.4.0.jar
index 5490be70c..69d342337 100644
--- a/lib/lucene-highlighter-4.3.0.jar
+++ b/lib/lucene-highlighter-4.4.0.jar
diff --git a/lib/lucene-join-4.3.0.jar b/lib/lucene-join-4.3.0.jar
deleted file mode 100644
index 08919dd4d..000000000
--- a/lib/lucene-join-4.3.0.jar
+++ /dev/null
diff --git a/lib/lucene-join-4.4.0.jar b/lib/lucene-join-4.4.0.jar
new file mode 100644
index 000000000..aed5e4b03
--- /dev/null
+++ b/lib/lucene-join-4.4.0.jar
diff --git a/lib/lucene-memory-4.3.0.jar b/lib/lucene-memory-4.3.0.jar
deleted file mode 100644
index 05065b77a..000000000
--- a/lib/lucene-memory-4.3.0.jar
+++ /dev/null
diff --git a/lib/lucene-memory-4.4.0.jar b/lib/lucene-memory-4.4.0.jar
new file mode 100644
index 000000000..74b547eea
--- /dev/null
+++ b/lib/lucene-memory-4.4.0.jar
diff --git a/lib/lucene-misc-4.3.0.jar b/lib/lucene-misc-4.4.0.jar
index b9587c6e8..874a5f0f9 100644
--- a/lib/lucene-misc-4.3.0.jar
+++ b/lib/lucene-misc-4.4.0.jar
diff --git a/lib/lucene-queries-4.3.0.jar b/lib/lucene-queries-4.4.0.jar
index 5712bffa6..07f36be02 100644
--- a/lib/lucene-queries-4.3.0.jar
+++ b/lib/lucene-queries-4.4.0.jar
diff --git a/lib/lucene-queryparser-4.3.0.jar b/lib/lucene-queryparser-4.4.0.jar
index 454b73cef..b28364806 100644
--- a/lib/lucene-queryparser-4.3.0.jar
+++ b/lib/lucene-queryparser-4.4.0.jar
diff --git a/lib/lucene-spatial-4.3.0.jar b/lib/lucene-spatial-4.4.0.jar
index c272f0f7a..b49473634 100644
--- a/lib/lucene-spatial-4.3.0.jar
+++ b/lib/lucene-spatial-4.4.0.jar
diff --git a/lib/lucene-suggest-4.3.0.jar b/lib/lucene-suggest-4.4.0.jar
index c8b6853f2..1f4a9cf50 100644
--- a/lib/lucene-suggest-4.3.0.jar
+++ b/lib/lucene-suggest-4.4.0.jar
diff --git a/lib/solr-core-4.3.0.jar b/lib/solr-core-4.4.0.jar
index bfcf9ad7f..54ae931d9 100644
--- a/lib/solr-core-4.3.0.jar
+++ b/lib/solr-core-4.4.0.jar
diff --git a/lib/solr-solrj-4.3.0.License b/lib/solr-solrj-4.4.0.License
index 8f21d8b38..8f21d8b38 100644
--- a/lib/solr-solrj-4.3.0.License
+++ b/lib/solr-solrj-4.4.0.License
diff --git a/lib/solr-solrj-4.3.0.jar b/lib/solr-solrj-4.4.0.jar
index e4ae546fd..e8bc1e45e 100644
--- a/lib/solr-solrj-4.3.0.jar
+++ b/lib/solr-solrj-4.4.0.jar
diff --git a/source/net/yacy/cora/federate/solr/instance/EmbeddedInstance.java b/source/net/yacy/cora/federate/solr/instance/EmbeddedInstance.java
index 04baa2649..897a4c640 100644
--- a/source/net/yacy/cora/federate/solr/instance/EmbeddedInstance.java
+++ b/source/net/yacy/cora/federate/solr/instance/EmbeddedInstance.java
@@ -79,7 +79,7 @@ public class EmbeddedInstance implements SolrInstance {
         // initialize the coreContainer
         String containerDir = this.containerPath.getAbsolutePath(); // the home directory of all resources.
         File configFile = new File(solr_config, "solr.xml"); //  the configuration file for all cores
-        this.coreContainer = new CoreContainer(containerDir, configFile); // this may take indefinitely long if solr files are broken
+        this.coreContainer = CoreContainer.createAndLoad(containerDir, configFile); // this may take indefinitely long if solr files are broken
         if (this.coreContainer == null) throw new IOException("cannot create core container dir = " + containerDir + ", configFile = " + configFile);
 
         // get the default core from the coreContainer