Merge branch 'master' of ssh://gitorious.org/yacy/rc1

pull/1/head
Michael Peter Christen 12 years ago
commit 4b100f8b48

@ -44,9 +44,6 @@
<classpathentry kind="lib" path="lib/jaudiotagger-2.0.4-20111207.115108-15.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
<classpathentry kind="lib" path="lib/spatial4j-0.3.jar"/>
<classpathentry kind="lib" path="lib/pdfbox-1.7.1.jar"/>
<classpathentry kind="lib" path="lib/fontbox-1.7.1.jar"/>
<classpathentry kind="lib" path="lib/jempbox-1.7.1.jar"/>
<classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.2.jar"/>
<classpathentry kind="lib" path="lib/zookeeper-3.4.5.jar"/>
@ -71,6 +68,9 @@
<classpathentry kind="lib" path="lib/solr-core-4.2.1.jar" sourcepath="/Volumes/Raptor/Development/sourcecode/solr-4.2.1/src/java"/>
<classpathentry kind="lib" path="lib/solr-solrj-4.2.1.jar" sourcepath="/Volumes/Raptor/Development/sourcecode/solr-4.2.1/src/java"/>
<classpathentry kind="lib" path="lib/lucene-codecs-4.2.1.jar"/>
<classpathentry kind="lib" path="lib/pdfbox-1.8.1.jar"/>
<classpathentry kind="lib" path="lib/jempbox-1.8.1.jar"/>
<classpathentry kind="lib" path="lib/fontbox-1.8.1.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"/>

@ -50,7 +50,7 @@
<string>$JAVAROOT/lib/commons-jxpath-1.3.jar</string>
<string>$JAVAROOT/lib/commons-lang-2.6.jar</string>
<string>$JAVAROOT/lib/commons-logging-1.1.1.jar</string>
<string>$JAVAROOT/lib/fontbox-1.7.1.jar</string>
<string>$JAVAROOT/lib/fontbox-1.8.1.jar</string>
<string>$JAVAROOT/lib/geronimo-stax-api_1.0_spec-1.0.1.jar</string>
<string>$JAVAROOT/lib/guava-13.0.1.jar</string>
<string>$JAVAROOT/lib/htmllexer.jar</string>
@ -64,7 +64,7 @@
<string>$JAVAROOT/lib/jaudiotagger-2.0.4-20111207.115108-15.jar</string>
<string>$JAVAROOT/lib/jcifs-1.3.15.jar</string>
<string>$JAVAROOT/lib/jcl-over-slf4j-1.7.2.jar</string>
<string>$JAVAROOT/lib/jempbox-1.7.1.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>
@ -86,7 +86,7 @@
<string>$JAVAROOT/lib/lucene-suggest-4.2.1.jar</string>
<string>$JAVAROOT/lib/metadata-extractor-2.4.0-beta-1.jar</string>
<string>$JAVAROOT/lib/mysql-connector-java-5.1.12-bin.jar</string>
<string>$JAVAROOT/lib/pdfbox-1.7.1.jar</string>
<string>$JAVAROOT/lib/pdfbox-1.8.1.jar</string>
<string>$JAVAROOT/lib/poi-3.6-20091214.jar</string>
<string>$JAVAROOT/lib/poi-scratchpad-3.6-20091214.jar</string>
<string>$JAVAROOT/lib/sax-2.0.1.jar</string>

@ -169,7 +169,7 @@
<pathelement location="${lib}/commons-jxpath-1.3.jar" />
<pathelement location="${lib}/commons-lang-2.6.jar" />
<pathelement location="${lib}/commons-logging-1.1.1.jar" />
<pathelement location="${lib}/fontbox-1.7.1.jar" />
<pathelement location="${lib}/fontbox-1.8.1.jar" />
<pathelement location="${lib}/geronimo-stax-api_1.0_spec-1.0.1.jar" />
<pathelement location="${lib}/guava-13.0.1.jar" />
<pathelement location="${lib}/htmllexer.jar" />
@ -183,7 +183,7 @@
<pathelement location="${lib}/jaudiotagger-2.0.4-20111207.115108-15.jar" />
<pathelement location="${lib}/jcifs-1.3.15.jar" />
<pathelement location="${lib}/jcl-over-slf4j-1.7.2.jar" />
<pathelement location="${lib}/jempbox-1.7.1" />
<pathelement location="${lib}/jempbox-1.8.1" />
<pathelement location="${lib}/jena-2.6.4.jar" />
<pathelement location="${lib}/jsch-0.1.42.jar" />
<pathelement location="${lib}/json-simple-1.1.jar" />
@ -206,7 +206,7 @@
<pathelement location="${lib}/lucene-suggest-4.2.1.jar" />
<pathelement location="${lib}/metadata-extractor-2.4.0-beta-1.jar" />
<pathelement location="${lib}/mysql-connector-java-5.1.12-bin.jar" />
<pathelement location="${lib}/pdfbox-1.7.1.jar" />
<pathelement location="${lib}/pdfbox-1.8.1.jar" />
<pathelement location="${lib}/poi-3.6-20091214.jar" />
<pathelement location="${lib}/poi-scratchpad-3.6-20091214.jar" />
<pathelement location="${lib}/sax-2.0.1.jar" />

Binary file not shown.

Binary file not shown.

@ -99,6 +99,7 @@ public class HeapModifier extends HeapReader implements BLOB {
*/
@Override
public void delete(byte[] key) throws IOException {
if (this.index == null) return;
key = normalizeKey(key);
// pre-check before synchronization

@ -2701,7 +2701,7 @@ public final class Switchboard extends serverSwitch {
condenser,
searchEvent,
sourceName,
getConfigBool(SwitchboardConstants.DHT_ENABLED, false) && !isRobinsonMode());
getConfigBool(SwitchboardConstants.DHT_ENABLED, false));
final RSSFeed feed =
EventChannel.channels(queueEntry.initiator() == null
? EventChannel.PROXY

Loading…
Cancel
Save