From 302a02cec8d52cb60fc1f151bab979c4b8ac27c4 Mon Sep 17 00:00:00 2001
From: orbiter <orbiter@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Tue, 30 Jun 2009 14:55:23 +0000
Subject: [PATCH] moved all libraries from libx to lib removed libx directory
 all libraries are now in lib, instead the test libraries in libt which are
 not part of releases

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6157 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 .classpath                                    | 100 ++++++++---------
 build.xml                                     | 104 ++++++++----------
 {libx => lib}/FontBox-0.1.0-dev.jar           | Bin
 {libx => lib}/FontBox.License                 |   0
 {libx => lib}/J7Zip-modified.jar              | Bin
 {libx => lib}/J7Zip.License                   |   0
 {libx => lib}/PDFBox-0.7.3.License            |   0
 {libx => lib}/PDFBox-0.7.3.jar                | Bin
 {libx => lib}/activation.jar                  | Bin
 {libx => lib}/bcmail-jdk14-139.jar            | Bin
 {libx => lib}/bcprov-jdk14-139.jar            | Bin
 {libx => lib}/bcprov.License                  |   0
 {libx => lib}/commons-codec-1.3.License       |   0
 {libx => lib}/commons-codec-1.3.jar           | Bin
 {libx => lib}/commons-discovery.jar           | Bin
 {libx => lib}/gnumail.jar                     | Bin
 {libx => lib}/inetlib.jar                     | Bin
 {libx => lib}/jakarta-oro-2.0.7.jar           | Bin
 {libx => lib}/jaxrpc.jar                      | Bin
 {libx => lib}/jmimemagic-0.1.0.jar            | Bin
 {libx => lib}/jmimemagic-0.1.0.license        |   0
 {libx => lib}/jrpm-SNAPSHOT.jar               | Bin
 {libx => lib}/jrpm-head.License               |   0
 {libx => lib}/jrpm-head.jar                   | Bin
 {libx => lib}/jsch-0.1.21.License             |   0
 {libx => lib}/jsch-0.1.21.jar                 | Bin
 {libx => lib}/log4j-1.2.9.jar                 | Bin
 {libx => lib}/odf_utils_05_11_29.jar          | Bin
 {libx => lib}/poi-3.2-FINAL-20081019.jar      | Bin
 .../poi-scratchpad-3.2-FINAL-20081019.jar     | Bin
 {libx => lib}/readme_libx.txt                 |   0
 {libx => lib}/tm-extractors-1.0.License       |   0
 {libx => lib}/tm-extractors-1.0.jar           | Bin
 {libx => lib}/webcat-0.1-swf.License          |   0
 {libx => lib}/webcat-0.1-swf.jar              | Bin
 {libx => lib}/wsdl4j.jar                      | Bin
 source/de/anomic/plasma/parser/bzip/build.xml |  10 +-
 source/de/anomic/plasma/parser/doc/build.xml  |  10 +-
 .../anomic/plasma/parser/mimeType/build.xml   |  16 +--
 source/de/anomic/plasma/parser/odt/build.xml  |  10 +-
 source/de/anomic/plasma/parser/pdf/build.xml  |  20 ++--
 source/de/anomic/plasma/parser/ppt/build.xml  |  12 +-
 source/de/anomic/plasma/parser/rpm/build.xml  |  12 +-
 .../anomic/plasma/parser/sevenzip/build.xml   |  10 +-
 source/de/anomic/plasma/parser/swf/build.xml  |  10 +-
 source/de/anomic/plasma/parser/tar/build.xml  |   4 +-
 source/de/anomic/plasma/parser/vcf/build.xml  |  10 +-
 source/de/anomic/plasma/parser/vsd/build.xml  |  12 +-
 source/de/anomic/plasma/parser/xls/build.xml  |  12 +-
 .../yacy/seedUpload/yacySeedUploadScp.xml     |  10 +-
 50 files changed, 175 insertions(+), 187 deletions(-)
 rename {libx => lib}/FontBox-0.1.0-dev.jar (100%)
 rename {libx => lib}/FontBox.License (100%)
 rename {libx => lib}/J7Zip-modified.jar (100%)
 rename {libx => lib}/J7Zip.License (100%)
 rename {libx => lib}/PDFBox-0.7.3.License (100%)
 rename {libx => lib}/PDFBox-0.7.3.jar (100%)
 rename {libx => lib}/activation.jar (100%)
 rename {libx => lib}/bcmail-jdk14-139.jar (100%)
 rename {libx => lib}/bcprov-jdk14-139.jar (100%)
 rename {libx => lib}/bcprov.License (100%)
 rename {libx => lib}/commons-codec-1.3.License (100%)
 rename {libx => lib}/commons-codec-1.3.jar (100%)
 rename {libx => lib}/commons-discovery.jar (100%)
 rename {libx => lib}/gnumail.jar (100%)
 rename {libx => lib}/inetlib.jar (100%)
 rename {libx => lib}/jakarta-oro-2.0.7.jar (100%)
 rename {libx => lib}/jaxrpc.jar (100%)
 rename {libx => lib}/jmimemagic-0.1.0.jar (100%)
 rename {libx => lib}/jmimemagic-0.1.0.license (100%)
 rename {libx => lib}/jrpm-SNAPSHOT.jar (100%)
 rename {libx => lib}/jrpm-head.License (100%)
 rename {libx => lib}/jrpm-head.jar (100%)
 rename {libx => lib}/jsch-0.1.21.License (100%)
 rename {libx => lib}/jsch-0.1.21.jar (100%)
 rename {libx => lib}/log4j-1.2.9.jar (100%)
 rename {libx => lib}/odf_utils_05_11_29.jar (100%)
 rename {libx => lib}/poi-3.2-FINAL-20081019.jar (100%)
 rename {libx => lib}/poi-scratchpad-3.2-FINAL-20081019.jar (100%)
 rename {libx => lib}/readme_libx.txt (100%)
 rename {libx => lib}/tm-extractors-1.0.License (100%)
 rename {libx => lib}/tm-extractors-1.0.jar (100%)
 rename {libx => lib}/webcat-0.1-swf.License (100%)
 rename {libx => lib}/webcat-0.1-swf.jar (100%)
 rename {libx => lib}/wsdl4j.jar (100%)

diff --git a/.classpath b/.classpath
index de619aa45..760363f31 100644
--- a/.classpath
+++ b/.classpath
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="env/|htdocsdefault/|proxymsg/|yacy/|env/|yacy/user/|yacy/user/|yacy/ui/|processing/domaingraph/applet/|processing/domaingraph/|api/|api/bookmarks/posts/|api/bookmarks/|api/util/|api/bookmarks/xbel/|api/bookmarks/tags/" kind="src" path="htroot"/>
-	<classpathentry excluding="user/|user/|ui/" kind="src" path="htroot/yacy"/>
-	<classpathentry kind="src" path="htroot/env"/>
-	<classpathentry kind="src" path="source"/>
-	<classpathentry kind="src" path="htroot/yacy/ui"/>
-	<classpathentry excluding="bookmarks/posts/|bookmarks/|util/|bookmarks/xbel/|bookmarks/tags/" kind="src" path="htroot/api"/>
-	<classpathentry kind="src" path="htroot/api/bookmarks/posts"/>
-	<classpathentry excluding="posts/|xbel/|tags/" kind="src" path="htroot/api/bookmarks"/>
-	<classpathentry kind="src" path="htroot/api/util"/>
-	<classpathentry kind="src" path="htroot/api/bookmarks/xbel"/>
-	<classpathentry kind="src" path="htroot/api/bookmarks/tags"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="lib" path="lib/tar.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/commons-discovery.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/jakarta-oro-2.0.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/jaxrpc.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/jmimemagic-0.1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/jrpm-head.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/jrpm-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/jsch-0.1.21.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/log4j-1.2.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/odf_utils_05_11_29.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/tm-extractors-1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/wsdl4j.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/inetlib.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/gnumail.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/activation.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/webcat-0.1-swf.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/J7Zip-modified.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/PDFBox-0.7.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/FontBox-0.1.0-dev.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/bcprov-jdk14-139.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/bcmail-jdk14-139.jar"/>
-	<classpathentry exported="true" kind="lib" path="libx/commons-codec-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-httpclient-3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-io-1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-fileupload-1.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/servlet-api.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-jxpath-1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/sbbi-upnplib-1.0.4.jar"/>
-	<classpathentry kind="lib" path="lib/xerces.jar"/>
-	<classpathentry kind="lib" path="lib/bzip2.jar"/>
-	<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.7-bin.jar"/>
-	<classpathentry kind="lib" path="libx/poi-3.2-FINAL-20081019.jar"/>
-	<classpathentry kind="lib" path="libx/poi-scratchpad-3.2-FINAL-20081019.jar"/>
-	<classpathentry kind="output" path="gen"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="env/|htdocsdefault/|proxymsg/|yacy/|env/|yacy/user/|yacy/user/|yacy/ui/|processing/domaingraph/applet/|processing/domaingraph/|api/|api/bookmarks/posts/|api/bookmarks/|api/util/|api/bookmarks/xbel/|api/bookmarks/tags/" kind="src" path="htroot"/>
+	<classpathentry excluding="user/|user/|ui/" kind="src" path="htroot/yacy"/>
+	<classpathentry kind="src" path="htroot/env"/>
+	<classpathentry kind="src" path="source"/>
+	<classpathentry kind="src" path="htroot/yacy/ui"/>
+	<classpathentry excluding="bookmarks/posts/|bookmarks/|util/|bookmarks/xbel/|bookmarks/tags/" kind="src" path="htroot/api"/>
+	<classpathentry kind="src" path="htroot/api/bookmarks/posts"/>
+	<classpathentry excluding="posts/|xbel/|tags/" kind="src" path="htroot/api/bookmarks"/>
+	<classpathentry kind="src" path="htroot/api/util"/>
+	<classpathentry kind="src" path="htroot/api/bookmarks/xbel"/>
+	<classpathentry kind="src" path="htroot/api/bookmarks/tags"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry exported="true" kind="lib" path="lib/tar.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-httpclient-3.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-io-1.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-fileupload-1.2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/servlet-api.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-jxpath-1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/sbbi-upnplib-1.0.4.jar"/>
+	<classpathentry kind="lib" path="lib/xerces.jar"/>
+	<classpathentry kind="lib" path="lib/bzip2.jar"/>
+	<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.7-bin.jar"/>
+	<classpathentry kind="lib" path="lib/activation.jar"/>
+	<classpathentry kind="lib" path="lib/bcmail-jdk14-139.jar"/>
+	<classpathentry kind="lib" path="lib/bcprov-jdk14-139.jar"/>
+	<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
+	<classpathentry kind="lib" path="lib/commons-discovery.jar"/>
+	<classpathentry kind="lib" path="lib/FontBox-0.1.0-dev.jar"/>
+	<classpathentry kind="lib" path="lib/gnumail.jar"/>
+	<classpathentry kind="lib" path="lib/inetlib.jar"/>
+	<classpathentry kind="lib" path="lib/J7Zip-modified.jar"/>
+	<classpathentry kind="lib" path="lib/jakarta-oro-2.0.7.jar"/>
+	<classpathentry kind="lib" path="lib/jaxrpc.jar"/>
+	<classpathentry kind="lib" path="lib/jmimemagic-0.1.0.jar"/>
+	<classpathentry kind="lib" path="lib/jrpm-head.jar"/>
+	<classpathentry kind="lib" path="lib/jrpm-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="lib/jsch-0.1.21.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-1.2.9.jar"/>
+	<classpathentry kind="lib" path="lib/odf_utils_05_11_29.jar"/>
+	<classpathentry kind="lib" path="lib/PDFBox-0.7.3.jar"/>
+	<classpathentry kind="lib" path="lib/poi-3.2-FINAL-20081019.jar"/>
+	<classpathentry kind="lib" path="lib/poi-scratchpad-3.2-FINAL-20081019.jar"/>
+	<classpathentry kind="lib" path="lib/tm-extractors-1.0.jar"/>
+	<classpathentry kind="lib" path="lib/webcat-0.1-swf.jar"/>
+	<classpathentry kind="lib" path="lib/wsdl4j.jar"/>
+	<classpathentry kind="output" path="gen"/>
+</classpath>
diff --git a/build.xml b/build.xml
index 25ed48e76..23097b00e 100644
--- a/build.xml
+++ b/build.xml
@@ -41,7 +41,6 @@
   <property name="src" location="source"/>
   <property name="data" location="DATA"/>
   <property name="lib" location="lib"/>
-  <property name="libx" location="libx"/>
   <property name="libt" location="libt"/>
   <property name="libbuild" location="libbuild"/>
   <property name="build" location="classes"/>
@@ -182,22 +181,42 @@
   <target name="compileMain" depends="init" description="Compiling the yacy sources ...">
     <!-- defining the classpath that should be used for compiling -->
     <path id="project.class.path">
-      <pathelement location="${build}" />
-      <pathelement location="${htroot}" />
-
-      <!-- standard libs -->
-      <pathelement location="${lib}/tar.jar" />
-      <pathelement location="${lib}/commons-fileupload-1.2.1.jar" />
-      <pathelement location="${lib}/commons-httpclient-3.1.jar" />
-      <pathelement location="${lib}/commons-logging-1.1.1.jar" />
-      <pathelement location="${lib}/commons-io-1.4.jar" />
-      <pathelement location="${lib}/servlet-api.jar" />
-      <pathelement location="${lib}/xerces.jar" />
-      <pathelement location="${lib}/bzip2.jar" />
-      <pathelement location="${lib}/mysql-connector-java-5.1.7-bin.jar" />
-      <!-- upnp (+ commons-logging) -->
-      <pathelement location="${lib}/sbbi-upnplib-1.0.4.jar" />
-      <pathelement location="${lib}/commons-jxpath-1.1.jar" />
+        <pathelement location="${build}" />
+        <pathelement location="${htroot}" />
+    	<pathelement location="${lib}/FontBox-0.1.0-dev.jar" />
+    	<pathelement location="${lib}/J7Zip-modified.jar" />
+    	<pathelement location="${lib}/PDFBox-0.7.3.jar" />
+    	<pathelement location="${lib}/activation.jar" />
+    	<pathelement location="${lib}/bcmail-jdk14-139.jar" />
+    	<pathelement location="${lib}/bcprov-jdk14-139.jar" />
+    	<pathelement location="${lib}/bzip2.jar" />
+    	<pathelement location="${lib}/commons-codec-1.3.jar" />
+    	<pathelement location="${lib}/commons-discovery.jar" />
+    	<pathelement location="${lib}/commons-fileupload-1.2.1.jar" />
+    	<pathelement location="${lib}/commons-httpclient-3.1.jar" />
+    	<pathelement location="${lib}/commons-io-1.4.jar" />
+    	<pathelement location="${lib}/commons-jxpath-1.1.jar" />
+    	<pathelement location="${lib}/commons-logging-1.1.1.jar" />
+    	<pathelement location="${lib}/gnumail.jar" />
+    	<pathelement location="${lib}/inetlib.jar" />
+    	<pathelement location="${lib}/jakarta-oro-2.0.7.jar" />
+    	<pathelement location="${lib}/jaxrpc.jar" />
+    	<pathelement location="${lib}/jmimemagic-0.1.0.jar" />
+    	<pathelement location="${lib}/jrpm-SNAPSHOT.jar" />
+    	<pathelement location="${lib}/jrpm-head.jar" />
+    	<pathelement location="${lib}/jsch-0.1.21.jar" />
+    	<pathelement location="${lib}/log4j-1.2.9.jar" />
+    	<pathelement location="${lib}/mysql-connector-java-5.1.7-bin.jar" />
+    	<pathelement location="${lib}/odf_utils_05_11_29.jar" />
+    	<pathelement location="${lib}/poi-3.2-FINAL-20081019.jar" />
+    	<pathelement location="${lib}/poi-scratchpad-3.2-FINAL-20081019.jar" />
+    	<pathelement location="${lib}/sbbi-upnplib-1.0.4.jar" />
+    	<pathelement location="${lib}/servlet-api.jar" />
+    	<pathelement location="${lib}/tar.jar" />
+    	<pathelement location="${lib}/tm-extractors-1.0.jar" />
+    	<pathelement location="${lib}/webcat-0.1-swf.jar" />
+    	<pathelement location="${lib}/wsdl4j.jar" />
+    	<pathelement location="${lib}/xerces.jar" />
     </path>
 
     <!-- compiling yacy.java -->
@@ -239,8 +258,6 @@
       <pathelement location="${build}"/>
       <pathelement location="${htroot}"/>
 
-      <!-- libs needed for the yacy thread/object-pools -->
-      <pathelement location="${lib}/tar.jar" />
       <!-- userspecific libs -->
       <pathelement location="${htdocsWWW}/lib/*.jar" />
       <pathelement location="${htdocsWWW}/" />
@@ -259,7 +276,6 @@
       <property name="src" location="${src}"/>
       <property name="build" location="${build}"/>
       <property name="lib" location="${lib}"/>
-      <property name="libx" location="${libx}"/>
       <property name="release" location="${release_ext}"/>
       <property name="javacSource" value="${javacSource}"/>
       <property name="javacTarget" value="${javacTarget}"/>
@@ -273,7 +289,7 @@
     <subant target="${extensionTarget}">
       <property name="src" location="${src}"/>
       <property name="build" location="${build}"/>
-      <property name="libx" location="${libx}"/>
+      <property name="lib" location="${lib}"/>
       <property name="htroot" value="${htroot}"/>
       <property name="release" location="${release_ext}"/>
       <property name="javacSource" value="${javacSource}"/>
@@ -362,13 +378,6 @@
     <!-- copy yacy.jar (if available) -->
     <copy todir="${release_main}" file="yacy.jar" failonerror="false"/>
 
-    <!-- copy libs -->
-    <copy todir="${release_main}/lib">
-      <fileset dir="${lib}" 
-               includes="**/*"/>
-               
-    </copy>
-
     <!-- copy build libs -->
     <copy todir="${release_main}/libbuild">
       <fileset dir="${libbuild}" 
@@ -544,11 +553,6 @@
       <fileset dir="${lib}" 
                includes="**/*"/>
                
-    </copy>
-    <copy todir="${release_source}/libx">
-      <fileset dir="${libx}" 
-               includes="**/*"/>
-               
     </copy>
     <copy todir="${release_source}/libt">
       <fileset dir="${libt}" 
@@ -914,17 +918,8 @@
       <classpath>
         <pathelement location="${build}"/>
         <pathelement location="${htroot}"/>
-        <pathelement location="${lib}/tar.jar" />
-        <pathelement location="${lib}/commons-fileupload-1.2.1.jar" />
-        <pathelement location="${lib}/commons-httpclient-3.1.jar" />
-        <pathelement location="${lib}/commons-logging-1.1.1.jar" />
-        <pathelement location="${lib}/commons-io-1.4.jar" />
-        <pathelement location="${lib}/servlet-api.jar" />
-        <pathelement location="${lib}/sbbi-upnplib-1.0.4.jar" />
-        <pathelement location="${lib}/commons-jxpath-1.1.jar" />
-        <pathelement location="${lib}/mysql-connector-java-5.1.7-bin.jar" />
-        <pathelement location="${libx}" />
-        <fileset dir="${libx}" includes="**/*.jar" />
+        <pathelement location="${lib}" />
+        <fileset dir="${lib}" includes="**/*.jar" />
       </classpath>
       <!--<arg value="-Xrunhprof"/>-->
       <arg line="-start"/>
@@ -941,9 +936,8 @@
       <classpath>
         <pathelement location="${build}"/>
         <pathelement location="${htroot}"/>
-        <pathelement location="${lib}/tar.jar" />
-        <pathelement location="${libx}" />
-        <fileset dir="${libx}" includes="**/*.jar" />
+        <pathelement location="${lib}" />
+        <fileset dir="${lib}" includes="**/*.jar" />
       </classpath>
       <arg line=""/>
     </java>
@@ -955,9 +949,8 @@
       <classpath>
         <pathelement location="${build}"/>
         <pathelement location="${htroot}"/>
-        <pathelement location="${libx}" />
+        <pathelement location="${lib}" />
         <fileset dir="${lib}" includes="**/*.jar" />
-        <fileset dir="${libx}" includes="**/*.jar" />
       </classpath>
       <arg line="-start"/>
       <jvmarg line="-Xdebug"/>
@@ -973,10 +966,8 @@
       <classpath>
         <pathelement location="${build}"/>
         <pathelement location="${htroot}"/>
-        <pathelement location="${lib}/tar.jar" />
-        <pathelement location="${libx}" />
+        <pathelement location="${lib}" />
         <fileset dir="${lib}" includes="**/*.jar" />
-        <fileset dir="${libx}" includes="**/*.jar" />
       </classpath>
       <arg line="-stop"/>
     </java>
@@ -995,9 +986,6 @@
         <fileset dir="${lib}">
           <include name="**/*.jar"/>
         </fileset>
-        <fileset dir="${libx}">
-          <include name="**/*.jar"/>
-        </fileset>
         <pathelement location="${build}"/>
       </classpath>
       <fileset dir="source" defaultexcludes="yes">
@@ -1053,7 +1041,7 @@
   <target name="distWithWinStartExe" depends="makeWinStartExe,dist">
   </target>
 
-  <target name="rpm" depends="all" description="Creates the main rpm-package and another for libx">
+  <target name="rpm" depends="all" description="Creates the main rpm-package and another for lib">
     <mkdir dir="${release}/RPMS/noarch" />
     <mkdir dir="${release}/BUILD" />
     <copy file="yacy-svn-4.spec" tofile="${release}/SPECS/yacy-svn.spec" overwrite="true" filtering="true" />
@@ -1062,8 +1050,8 @@
 
     <move file="${release}/RPMS/noarch/yacy-${releaseVersion}_${releaseNr}-3.noarch.rpm"
           tofile="${release}/yacy-${releaseVersion}_${releaseNr}-3.noarch.rpm" />
-    <move file="${release}/RPMS/noarch/yacy-libx-${releaseVersion}_${releaseNr}-3.noarch.rpm"
-          tofile="${release}/yacy-libx-${releaseVersion}_${releaseNr}-3.noarch.rpm" />
+    <move file="${release}/RPMS/noarch/yacy-lib-${releaseVersion}_${releaseNr}-3.noarch.rpm"
+          tofile="${release}/yacy-lib-${releaseVersion}_${releaseNr}-3.noarch.rpm" />
 
     <delete dir="${release}/SPECS" failonerror="false" />
     <delete dir="${release}/RPMS" failonerror="false" />
diff --git a/libx/FontBox-0.1.0-dev.jar b/lib/FontBox-0.1.0-dev.jar
similarity index 100%
rename from libx/FontBox-0.1.0-dev.jar
rename to lib/FontBox-0.1.0-dev.jar
diff --git a/libx/FontBox.License b/lib/FontBox.License
similarity index 100%
rename from libx/FontBox.License
rename to lib/FontBox.License
diff --git a/libx/J7Zip-modified.jar b/lib/J7Zip-modified.jar
similarity index 100%
rename from libx/J7Zip-modified.jar
rename to lib/J7Zip-modified.jar
diff --git a/libx/J7Zip.License b/lib/J7Zip.License
similarity index 100%
rename from libx/J7Zip.License
rename to lib/J7Zip.License
diff --git a/libx/PDFBox-0.7.3.License b/lib/PDFBox-0.7.3.License
similarity index 100%
rename from libx/PDFBox-0.7.3.License
rename to lib/PDFBox-0.7.3.License
diff --git a/libx/PDFBox-0.7.3.jar b/lib/PDFBox-0.7.3.jar
similarity index 100%
rename from libx/PDFBox-0.7.3.jar
rename to lib/PDFBox-0.7.3.jar
diff --git a/libx/activation.jar b/lib/activation.jar
similarity index 100%
rename from libx/activation.jar
rename to lib/activation.jar
diff --git a/libx/bcmail-jdk14-139.jar b/lib/bcmail-jdk14-139.jar
similarity index 100%
rename from libx/bcmail-jdk14-139.jar
rename to lib/bcmail-jdk14-139.jar
diff --git a/libx/bcprov-jdk14-139.jar b/lib/bcprov-jdk14-139.jar
similarity index 100%
rename from libx/bcprov-jdk14-139.jar
rename to lib/bcprov-jdk14-139.jar
diff --git a/libx/bcprov.License b/lib/bcprov.License
similarity index 100%
rename from libx/bcprov.License
rename to lib/bcprov.License
diff --git a/libx/commons-codec-1.3.License b/lib/commons-codec-1.3.License
similarity index 100%
rename from libx/commons-codec-1.3.License
rename to lib/commons-codec-1.3.License
diff --git a/libx/commons-codec-1.3.jar b/lib/commons-codec-1.3.jar
similarity index 100%
rename from libx/commons-codec-1.3.jar
rename to lib/commons-codec-1.3.jar
diff --git a/libx/commons-discovery.jar b/lib/commons-discovery.jar
similarity index 100%
rename from libx/commons-discovery.jar
rename to lib/commons-discovery.jar
diff --git a/libx/gnumail.jar b/lib/gnumail.jar
similarity index 100%
rename from libx/gnumail.jar
rename to lib/gnumail.jar
diff --git a/libx/inetlib.jar b/lib/inetlib.jar
similarity index 100%
rename from libx/inetlib.jar
rename to lib/inetlib.jar
diff --git a/libx/jakarta-oro-2.0.7.jar b/lib/jakarta-oro-2.0.7.jar
similarity index 100%
rename from libx/jakarta-oro-2.0.7.jar
rename to lib/jakarta-oro-2.0.7.jar
diff --git a/libx/jaxrpc.jar b/lib/jaxrpc.jar
similarity index 100%
rename from libx/jaxrpc.jar
rename to lib/jaxrpc.jar
diff --git a/libx/jmimemagic-0.1.0.jar b/lib/jmimemagic-0.1.0.jar
similarity index 100%
rename from libx/jmimemagic-0.1.0.jar
rename to lib/jmimemagic-0.1.0.jar
diff --git a/libx/jmimemagic-0.1.0.license b/lib/jmimemagic-0.1.0.license
similarity index 100%
rename from libx/jmimemagic-0.1.0.license
rename to lib/jmimemagic-0.1.0.license
diff --git a/libx/jrpm-SNAPSHOT.jar b/lib/jrpm-SNAPSHOT.jar
similarity index 100%
rename from libx/jrpm-SNAPSHOT.jar
rename to lib/jrpm-SNAPSHOT.jar
diff --git a/libx/jrpm-head.License b/lib/jrpm-head.License
similarity index 100%
rename from libx/jrpm-head.License
rename to lib/jrpm-head.License
diff --git a/libx/jrpm-head.jar b/lib/jrpm-head.jar
similarity index 100%
rename from libx/jrpm-head.jar
rename to lib/jrpm-head.jar
diff --git a/libx/jsch-0.1.21.License b/lib/jsch-0.1.21.License
similarity index 100%
rename from libx/jsch-0.1.21.License
rename to lib/jsch-0.1.21.License
diff --git a/libx/jsch-0.1.21.jar b/lib/jsch-0.1.21.jar
similarity index 100%
rename from libx/jsch-0.1.21.jar
rename to lib/jsch-0.1.21.jar
diff --git a/libx/log4j-1.2.9.jar b/lib/log4j-1.2.9.jar
similarity index 100%
rename from libx/log4j-1.2.9.jar
rename to lib/log4j-1.2.9.jar
diff --git a/libx/odf_utils_05_11_29.jar b/lib/odf_utils_05_11_29.jar
similarity index 100%
rename from libx/odf_utils_05_11_29.jar
rename to lib/odf_utils_05_11_29.jar
diff --git a/libx/poi-3.2-FINAL-20081019.jar b/lib/poi-3.2-FINAL-20081019.jar
similarity index 100%
rename from libx/poi-3.2-FINAL-20081019.jar
rename to lib/poi-3.2-FINAL-20081019.jar
diff --git a/libx/poi-scratchpad-3.2-FINAL-20081019.jar b/lib/poi-scratchpad-3.2-FINAL-20081019.jar
similarity index 100%
rename from libx/poi-scratchpad-3.2-FINAL-20081019.jar
rename to lib/poi-scratchpad-3.2-FINAL-20081019.jar
diff --git a/libx/readme_libx.txt b/lib/readme_libx.txt
similarity index 100%
rename from libx/readme_libx.txt
rename to lib/readme_libx.txt
diff --git a/libx/tm-extractors-1.0.License b/lib/tm-extractors-1.0.License
similarity index 100%
rename from libx/tm-extractors-1.0.License
rename to lib/tm-extractors-1.0.License
diff --git a/libx/tm-extractors-1.0.jar b/lib/tm-extractors-1.0.jar
similarity index 100%
rename from libx/tm-extractors-1.0.jar
rename to lib/tm-extractors-1.0.jar
diff --git a/libx/webcat-0.1-swf.License b/lib/webcat-0.1-swf.License
similarity index 100%
rename from libx/webcat-0.1-swf.License
rename to lib/webcat-0.1-swf.License
diff --git a/libx/webcat-0.1-swf.jar b/lib/webcat-0.1-swf.jar
similarity index 100%
rename from libx/webcat-0.1-swf.jar
rename to lib/webcat-0.1-swf.jar
diff --git a/libx/wsdl4j.jar b/lib/wsdl4j.jar
similarity index 100%
rename from libx/wsdl4j.jar
rename to lib/wsdl4j.jar
diff --git a/source/de/anomic/plasma/parser/bzip/build.xml b/source/de/anomic/plasma/parser/bzip/build.xml
index f3a24e3ad..f97b92be0 100644
--- a/source/de/anomic/plasma/parser/bzip/build.xml
+++ b/source/de/anomic/plasma/parser/bzip/build.xml
@@ -14,7 +14,7 @@
   	  <javac srcdir="${src}/de/anomic/plasma/parser/${parserShortName}" destdir="${build}" source="${javacSource}" target="${javacTarget}" debug="true" debuglevel="lines,vars,source">
   	  	<classpath>
   	  	  <pathelement location="${build}" />	
-          <pathelement location="${libx}/bzip2.jar" />              
+          <pathelement location="${lib}/bzip2.jar" />              
   	  	</classpath>
   	  </javac>    	
     </target>
@@ -22,9 +22,9 @@
 
     <target name="zip" depends="compile">
   	  <tar destfile="${parserArchive}" compression="gzip">
-        <tarfileset dir="${libx}" 
+        <tarfileset dir="${lib}" 
                     includes="bzip2.jar" 
-                    prefix="${releaseFileParentDir}/libx/"
+                    prefix="${releaseFileParentDir}/lib/"
                     dirmode="755" mode="644"/>        
   	  	<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" 
   	  				prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
@@ -37,8 +37,8 @@
 
     
     <target name="copy" depends="compile">
-        <copy todir="${release}/libx/">
-             <fileset dir="${libx}" includes="bzip2.jar"/> 
+        <copy todir="${release}/lib/">
+             <fileset dir="${lib}" includes="bzip2.jar"/> 
         </copy>
         <copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">
              <fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/> 
diff --git a/source/de/anomic/plasma/parser/doc/build.xml b/source/de/anomic/plasma/parser/doc/build.xml
index edf987490..ceee3d803 100644
--- a/source/de/anomic/plasma/parser/doc/build.xml
+++ b/source/de/anomic/plasma/parser/doc/build.xml
@@ -16,7 +16,7 @@
   	  	  <pathelement location="${build}" />	
   	  	
 		  <!-- main lib needed to parse doc files -->  	  	
-  		  <pathelement location="${libx}/tm-extractors-1.0.jar" />        	
+  		  <pathelement location="${lib}/tm-extractors-1.0.jar" />        	
   	  	</classpath>
   	  </javac>    	
     </target>
@@ -24,9 +24,9 @@
 
     <target name="zip" depends="compile">
   	  <tar destfile="${parserArchive}" compression="gzip">
-  	  	<tarfileset dir="${libx}" 
+  	  	<tarfileset dir="${lib}" 
   	  				includes="tm-extractors-1.0.*" 
-  	  				prefix="${releaseFileParentDir}/libx/"
+  	  				prefix="${releaseFileParentDir}/lib/"
 			  	  	dirmode="755" mode="644"/>
   	  	<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" 
   	  				prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
@@ -38,8 +38,8 @@
     </target>	
 
     <target name="copy" depends="compile">
-        <copy todir="${release}/libx/">
-             <fileset dir="${libx}" includes="tm-extractors-1.0.*"/> 
+        <copy todir="${release}/lib/">
+             <fileset dir="${lib}" includes="tm-extractors-1.0.*"/> 
         </copy>
         <copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">
              <fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/> 
diff --git a/source/de/anomic/plasma/parser/mimeType/build.xml b/source/de/anomic/plasma/parser/mimeType/build.xml
index be0836095..02e8eb09e 100644
--- a/source/de/anomic/plasma/parser/mimeType/build.xml
+++ b/source/de/anomic/plasma/parser/mimeType/build.xml
@@ -16,10 +16,10 @@
   	  	  <pathelement location="${build}" />	
   	  	
 		  <!-- main lib needed to parse doc files -->  	  	
-  		  <pathelement location="${libx}/jmimemagic-0.1.0.jar" /> 
-          <pathelement location="${libx}/jakarta-oro-2.0.7.jar" />                          
-          <pathelement location="${libx}/log4j-1.2.9.jar" /> 
-          <pathelement location="${libx}/xerces.jar"/>     
+  		  <pathelement location="${lib}/jmimemagic-0.1.0.jar" /> 
+          <pathelement location="${lib}/jakarta-oro-2.0.7.jar" />                          
+          <pathelement location="${lib}/log4j-1.2.9.jar" /> 
+          <pathelement location="${lib}/xerces.jar"/>     
   	  	</classpath>
   	  </javac> 
 	  <!-- copy log4j.properties, to disable logging -->
@@ -29,9 +29,9 @@
 
     <target name="zip" depends="compile">
   	  <tar destfile="${parserArchive}" compression="gzip">
-  	  	<tarfileset dir="${libx}" 
+  	  	<tarfileset dir="${lib}" 
   	  				includes="jmimemagic-0.1.0.jar,jakarta-oro-2.0.7.jar,log4j-1.2.9.jar,xerces.jar" 
-  	  				prefix="${releaseFileParentDir}/libx/"
+  	  				prefix="${releaseFileParentDir}/lib/"
 			  	  	dirmode="755" mode="644"/>
   	  	<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" 
   	  				prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
@@ -43,8 +43,8 @@
     </target>	
 
     <target name="copy" depends="compile">
-        <copy todir="${release}/libx/">
-             <fileset dir="${libx}" includes="jmimemagic-0.1.0.jar,jakarta-oro-2.0.7.jar,log4j-1.2.9.jar,xerces.jar"/> 
+        <copy todir="${release}/lib/">
+             <fileset dir="${lib}" includes="jmimemagic-0.1.0.jar,jakarta-oro-2.0.7.jar,log4j-1.2.9.jar,xerces.jar"/> 
         </copy>
         <copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">
              <fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/> 
diff --git a/source/de/anomic/plasma/parser/odt/build.xml b/source/de/anomic/plasma/parser/odt/build.xml
index f25838523..b2ee44f58 100644
--- a/source/de/anomic/plasma/parser/odt/build.xml
+++ b/source/de/anomic/plasma/parser/odt/build.xml
@@ -14,7 +14,7 @@
   	  <javac srcdir="${src}/de/anomic/plasma/parser/${parserShortName}" destdir="${build}" source="${javacSource}" target="${javacTarget}" debug="true" debuglevel="lines,vars,source">
   	  	<classpath>
   	  	  <pathelement location="${build}" />
-   	  	  <pathelement location="${libx}/odf_utils_05_11_29.jar" />
+   	  	  <pathelement location="${lib}/odf_utils_05_11_29.jar" />
   	  	</classpath>
   	  </javac>    	
     </target>
@@ -22,9 +22,9 @@
 
     <target name="zip" depends="compile">
   	  <tar destfile="${parserArchive}" compression="gzip">
-  	  	<tarfileset dir="${libx}" 
+  	  	<tarfileset dir="${lib}" 
   	  				includes="odf_utils_05_11_29.*" 
-  	  				prefix="${releaseFileParentDir}/libx/"
+  	  				prefix="${releaseFileParentDir}/lib/"
 			  	  	dirmode="755" mode="644"/>    	  	
   	  	<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" 
   	  				prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
@@ -36,8 +36,8 @@
     </target>	
 
     <target name="copy" depends="compile">
-        <copy todir="${release}/libx/">
-             <fileset dir="${libx}" includes="odf_utils_05_11_29.*"/> 
+        <copy todir="${release}/lib/">
+             <fileset dir="${lib}" includes="odf_utils_05_11_29.*"/> 
         </copy> 
         <copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">
              <fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/> 
diff --git a/source/de/anomic/plasma/parser/pdf/build.xml b/source/de/anomic/plasma/parser/pdf/build.xml
index b480e4ed5..28be0b577 100644
--- a/source/de/anomic/plasma/parser/pdf/build.xml
+++ b/source/de/anomic/plasma/parser/pdf/build.xml
@@ -15,29 +15,29 @@
 			<classpath>
 				<pathelement location="${build}" />
 				<!-- main lib needed to parse pdf files -->
-				<pathelement location="${libx}/PDFBox-0.7.3.jar" />
+				<pathelement location="${lib}/PDFBox-0.7.3.jar" />
 				<!-- additional fontparsing lib, part of PDFBox -->
-				<pathelement location="${libx}/FontBox-0.1.0-dev.jar" />
-				<pathelement location="${libx}/bcprov-jdk14-139.jar" />
-				<pathelement location="${libx}/bcmail-jdk14-139.jar" />
+				<pathelement location="${lib}/FontBox-0.1.0-dev.jar" />
+				<pathelement location="${lib}/bcprov-jdk14-139.jar" />
+				<pathelement location="${lib}/bcmail-jdk14-139.jar" />
 			</classpath>
 		</javac>
 	</target>
 
 	<target name="zip" depends="compile">
 		<tar destfile="${parserArchive}" compression="gzip">
-			<tarfileset dir="${libx}" includes="PDFBox-0.7.3.*" prefix="${releaseFileParentDir}/libx/" dirmode="755" mode="644" />
-			<tarfileset dir="${libx}" includes="FontBox*" prefix="${releaseFileParentDir}/libx/" dirmode="755" mode="644" />
-			<tarfileset dir="${libx}" includes="bcprov*" prefix="${releaseFileParentDir}/libx/" dirmode="755" mode="644" />
-			<tarfileset dir="${libx}" includes="bcmail*" prefix="${releaseFileParentDir}/libx/" dirmode="755" mode="644" />
+			<tarfileset dir="${lib}" includes="PDFBox-0.7.3.*" prefix="${releaseFileParentDir}/lib/" dirmode="755" mode="644" />
+			<tarfileset dir="${lib}" includes="FontBox*" prefix="${releaseFileParentDir}/lib/" dirmode="755" mode="644" />
+			<tarfileset dir="${lib}" includes="bcprov*" prefix="${releaseFileParentDir}/lib/" dirmode="755" mode="644" />
+			<tarfileset dir="${lib}" includes="bcmail*" prefix="${releaseFileParentDir}/lib/" dirmode="755" mode="644" />
 			<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}" dirmode="755" mode="644" />
 			<tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/classes/de/anomic/plasma/parser/${parserShortName}" dirmode="755" mode="644" />
 		</tar>
 	</target>
 
 	<target name="copy" depends="compile">
-		<copy todir="${release}/libx/">
-			<fileset dir="${libx}" includes="PDFBox-0.7.3.*,FontBox*,bcprov*,bcmail*" />
+		<copy todir="${release}/lib/">
+			<fileset dir="${lib}" includes="PDFBox-0.7.3.*,FontBox*,bcprov*,bcmail*" />
 		</copy>
 		<copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">
 			<fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*" />
diff --git a/source/de/anomic/plasma/parser/ppt/build.xml b/source/de/anomic/plasma/parser/ppt/build.xml
index 29962ed14..8c0372430 100644
--- a/source/de/anomic/plasma/parser/ppt/build.xml
+++ b/source/de/anomic/plasma/parser/ppt/build.xml
@@ -18,8 +18,8 @@
   	  	  <pathelement location="${build}" />	
   	  	  
   	  	  	<!-- libraries needed by this parser -->
-            <pathelement location="${libx}/poi-3.2-FINAL-20081019.jar" />
-	  	  	<pathelement location="${libx}/poi-scratchpad-3.2-FINAL-20081019.jar" />
+            <pathelement location="${lib}/poi-3.2-FINAL-20081019.jar" />
+	  	  	<pathelement location="${lib}/poi-scratchpad-3.2-FINAL-20081019.jar" />
   	  	</classpath>
   	  </javac>    	
     </target>
@@ -28,9 +28,9 @@
     <target name="zip" depends="compile">
   	  <tar destfile="${parserArchive}" compression="gzip">
   	  	<!-- needed libraries and license files of these libs -->
-  	  	<tarfileset dir="${libx}" 
+  	  	<tarfileset dir="${lib}" 
   	  				includes="poi-*.*" 
-  	  				prefix="${releaseFileParentDir}/libx/"
+  	  				prefix="${releaseFileParentDir}/lib/"
 			  	  	dirmode="755" mode="644"/>  	  	
 		<!-- source files of this parser -->
   	  	<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" 
@@ -46,8 +46,8 @@
     <!-- just copy all parts of this parser into the release directory -->
     <target name="copy" depends="compile">
         <!-- copy needed libs -->
-        <copy todir="${release}/libx/">
-             <fileset dir="${libx}" includes="poi-*.*"/> 
+        <copy todir="${release}/lib/">
+             <fileset dir="${lib}" includes="poi-*.*"/> 
         </copy>  
 	
         <!-- copy source code files -->
diff --git a/source/de/anomic/plasma/parser/rpm/build.xml b/source/de/anomic/plasma/parser/rpm/build.xml
index 5ef220e10..1927ec70c 100644
--- a/source/de/anomic/plasma/parser/rpm/build.xml
+++ b/source/de/anomic/plasma/parser/rpm/build.xml
@@ -14,8 +14,8 @@
   	  <javac srcdir="${src}/de/anomic/plasma/parser/${parserShortName}" destdir="${build}" source="${javacSource}" target="${javacTarget}" debug="true" debuglevel="lines,vars,source">
   	  	<classpath>
   	  	  <pathelement location="${build}" />	
-    	  <pathelement location="${libx}/jrpm-head.jar" />
-  	  	  <pathelement location="${libx}/log4j-1.2.9.jar"/>
+    	  <pathelement location="${lib}/jrpm-head.jar" />
+  	  	  <pathelement location="${lib}/log4j-1.2.9.jar"/>
   	  	</classpath>
   	  </javac>    	
     </target>
@@ -23,9 +23,9 @@
 
     <target name="zip" depends="compile">
   	  <tar destfile="${parserArchive}" compression="gzip">
-  	  	<tarfileset dir="${libx}" 
+  	  	<tarfileset dir="${lib}" 
   	  				includes="jrpm-head.*,log4j-1.2.9.jar" 
-  	  				prefix="${releaseFileParentDir}/libx/"
+  	  				prefix="${releaseFileParentDir}/lib/"
 			  	  	dirmode="755" mode="644"/>  	  	
   	  	<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" 
   	  				prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
@@ -37,8 +37,8 @@
     </target>	
 
     <target name="copy" depends="compile">
-        <copy todir="${release}/libx/">
-             <fileset dir="${libx}" includes="jrpm-head.*,log4j-1.2.9.jar"/> 
+        <copy todir="${release}/lib/">
+             <fileset dir="${lib}" includes="jrpm-head.*,log4j-1.2.9.jar"/> 
         </copy>    	
         <copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">
              <fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/> 
diff --git a/source/de/anomic/plasma/parser/sevenzip/build.xml b/source/de/anomic/plasma/parser/sevenzip/build.xml
index 6a7232ab7..548d1ead5 100644
--- a/source/de/anomic/plasma/parser/sevenzip/build.xml
+++ b/source/de/anomic/plasma/parser/sevenzip/build.xml
@@ -17,7 +17,7 @@
   	  	<classpath>
   	  	  <pathelement location="${build}" />	
   	  	
-  		  <pathelement location="${libx}/J7Zip-modified.jar" />        	  
+  		  <pathelement location="${lib}/J7Zip-modified.jar" />        	  
   	  	</classpath>
   	  </javac>    	
     </target>
@@ -25,9 +25,9 @@
 
     <target name="zip" depends="compile">
   	  <tar destfile="${parserArchive}" compression="gzip">
-  	  	<tarfileset dir="${libx}" 
+  	  	<tarfileset dir="${lib}" 
   	  				includes="J7Zip-modified.jar" 
-  	  				prefix="${releaseFileParentDir}/libx/"
+  	  				prefix="${releaseFileParentDir}/lib/"
 			  	  	dirmode="755" mode="644"/>
   	  	<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" 
   	  				prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
@@ -39,8 +39,8 @@
     </target>	
 
     <target name="copy" depends="compile">
-        <copy todir="${release}/libx/">
-             <fileset dir="${libx}" includes="J7Zip-modified.jar"/> 
+        <copy todir="${release}/lib/">
+             <fileset dir="${lib}" includes="J7Zip-modified.jar"/> 
         </copy>
         <copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">
              <fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/> 
diff --git a/source/de/anomic/plasma/parser/swf/build.xml b/source/de/anomic/plasma/parser/swf/build.xml
index e98a14775..a10252b11 100644
--- a/source/de/anomic/plasma/parser/swf/build.xml
+++ b/source/de/anomic/plasma/parser/swf/build.xml
@@ -16,7 +16,7 @@
   	  	  <pathelement location="${build}" />	
   	  	
 		  <!-- main lib needed to parse swf files -->  	  	
-          <pathelement location="${libx}/webcat-0.1-swf.jar" />
+          <pathelement location="${lib}/webcat-0.1-swf.jar" />
   	  	</classpath>
   	  </javac>    	
     </target>
@@ -24,9 +24,9 @@
 
     <target name="zip" depends="compile">
   	  <tar destfile="${parserArchive}" compression="gzip">
-  	  	<tarfileset dir="${libx}" 
+  	  	<tarfileset dir="${lib}" 
                     includes="webcat-0.1-swf.*" 
-  	  				prefix="${releaseFileParentDir}/libx/"
+  	  				prefix="${releaseFileParentDir}/lib/"
 			  	  	dirmode="755" mode="644"/>
   	  	<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" 
   	  				prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
@@ -38,8 +38,8 @@
     </target>	
 
     <target name="copy" depends="compile">
-        <copy todir="${release}/libx/">
-          <fileset dir="${libx}" includes="webcat-0.1-swf.*"/> 
+        <copy todir="${release}/lib/">
+          <fileset dir="${lib}" includes="webcat-0.1-swf.*"/> 
         </copy>
         <copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">
              <fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/> 
diff --git a/source/de/anomic/plasma/parser/tar/build.xml b/source/de/anomic/plasma/parser/tar/build.xml
index adcd9fc9f..9477cce08 100644
--- a/source/de/anomic/plasma/parser/tar/build.xml
+++ b/source/de/anomic/plasma/parser/tar/build.xml
@@ -25,7 +25,7 @@
   	  <tar destfile="${parserArchive}" compression="gzip">
   	  	<tarfileset dir="${lib}" 
   	  				includes="tar.jar" 
-  	  				prefix="${releaseFileParentDir}/libx/"
+  	  				prefix="${releaseFileParentDir}/lib/"
 			  	  	dirmode="755" mode="644"/>
   	  	<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" 
   	  				prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
@@ -37,7 +37,7 @@
     </target>	
 
     <target name="copy" depends="compile">
-        <copy todir="${release}/libx/">
+        <copy todir="${release}/lib/">
              <fileset dir="${lib}" includes="tar.jar"/> 
         </copy>
         <copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">
diff --git a/source/de/anomic/plasma/parser/vcf/build.xml b/source/de/anomic/plasma/parser/vcf/build.xml
index 6f1e4df85..f31ca5e76 100644
--- a/source/de/anomic/plasma/parser/vcf/build.xml
+++ b/source/de/anomic/plasma/parser/vcf/build.xml
@@ -14,7 +14,7 @@
   	  	  <pathelement location="${build}" />	
   	  	  
   	  	  <!-- libraries needed by this parser -->
-    	  <pathelement location="${libx}/commons-codec-1.3.jar" />
+    	  <pathelement location="${lib}/commons-codec-1.3.jar" />
   	  	</classpath>
   	  </javac>    	
     </target>
@@ -23,9 +23,9 @@
     <target name="zip" depends="compile">
   	  <tar destfile="${parserArchive}" compression="gzip">
   	  	<!-- needed libraries -->
-  	  	<tarfileset dir="${libx}" 
+  	  	<tarfileset dir="${lib}" 
   	  				includes="commons-codec-1.3.*" 
-  	  				prefix="${releaseFileParentDir}/libx/"
+  	  				prefix="${releaseFileParentDir}/lib/"
 			  	  	dirmode="755" mode="644"/>  	  	
 		<!-- source files of this parser -->
   	  	<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" 
@@ -41,8 +41,8 @@
 	<!-- just copy all parts of this parser into the release directory -->
     <target name="copy" depends="compile">
 		<!-- copy needed libs -->
-        <copy todir="${release}/libx/">
-             <fileset dir="${libx}" includes="commons-codec-1.3.*"/> 
+        <copy todir="${release}/lib/">
+             <fileset dir="${lib}" includes="commons-codec-1.3.*"/> 
         </copy>  
 	
 		<!-- copy source code files -->
diff --git a/source/de/anomic/plasma/parser/vsd/build.xml b/source/de/anomic/plasma/parser/vsd/build.xml
index bcbeb2b59..a45143601 100644
--- a/source/de/anomic/plasma/parser/vsd/build.xml
+++ b/source/de/anomic/plasma/parser/vsd/build.xml
@@ -18,8 +18,8 @@
   	  	  <pathelement location="${build}" />
 
   	  	  	<!-- libraries needed by this parser -->
-            <pathelement location="${libx}/poi-3.2-FINAL-20081019.jar" />
-	  	  	<pathelement location="${libx}/poi-scratchpad-3.2-FINAL-20081019.jar" />
+            <pathelement location="${lib}/poi-3.2-FINAL-20081019.jar" />
+	  	  	<pathelement location="${lib}/poi-scratchpad-3.2-FINAL-20081019.jar" />
   	  	</classpath>
   	  </javac>
     </target>
@@ -28,9 +28,9 @@
     <target name="zip" depends="compile">
   	  <tar destfile="${parserArchive}" compression="gzip">
   	  	<!-- needed libraries and license files of these libs -->
-  	  	<tarfileset dir="${libx}"
+  	  	<tarfileset dir="${lib}"
   	  				includes="poi-*.*"
-  	  				prefix="${releaseFileParentDir}/libx/"
+  	  				prefix="${releaseFileParentDir}/lib/"
 			  	  	dirmode="755" mode="644"/>
 		<!-- source files of this parser -->
   	  	<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
@@ -46,8 +46,8 @@
     <!-- just copy all parts of this parser into the release directory -->
     <target name="copy" depends="compile">
         <!-- copy needed libs -->
-        <copy todir="${release}/libx/">
-             <fileset dir="${libx}" includes="poi-*.*"/>
+        <copy todir="${release}/lib/">
+             <fileset dir="${lib}" includes="poi-*.*"/>
         </copy>
 
         <!-- copy source code files -->
diff --git a/source/de/anomic/plasma/parser/xls/build.xml b/source/de/anomic/plasma/parser/xls/build.xml
index 4efabd610..86d7a6952 100644
--- a/source/de/anomic/plasma/parser/xls/build.xml
+++ b/source/de/anomic/plasma/parser/xls/build.xml
@@ -18,8 +18,8 @@
   	  	  <pathelement location="${build}" />	
 
   	  	  	<!-- libraries needed by this parser -->
-            <pathelement location="${libx}/poi-3.2-FINAL-20081019.jar" />
-	  	  	<pathelement location="${libx}/poi-scratchpad-3.2-FINAL-20081019.jar" />
+            <pathelement location="${lib}/poi-3.2-FINAL-20081019.jar" />
+	  	  	<pathelement location="${lib}/poi-scratchpad-3.2-FINAL-20081019.jar" />
   	  	</classpath>
   	  </javac>    	
     </target>
@@ -28,9 +28,9 @@
     <target name="zip" depends="compile">
   	  <tar destfile="${parserArchive}" compression="gzip">
   	  	<!-- needed libraries and license files of these libs -->
-  	  	<tarfileset dir="${libx}" 
+  	  	<tarfileset dir="${lib}" 
   	  				includes="poi-*.*" 
-  	  				prefix="${releaseFileParentDir}/libx/"
+  	  				prefix="${releaseFileParentDir}/lib/"
 			  	  	dirmode="755" mode="644"/>  	  	
 		<!-- source files of this parser -->
   	  	<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" 
@@ -46,8 +46,8 @@
     <!-- just copy all parts of this parser into the release directory -->
     <target name="copy" depends="compile">
         <!-- copy needed libs -->
-        <copy todir="${release}/libx/">
-             <fileset dir="${libx}" includes="poi-*.*"/> 
+        <copy todir="${release}/lib/">
+             <fileset dir="${lib}" includes="poi-*.*"/> 
         </copy>  
 	
         <!-- copy source code files -->
diff --git a/source/de/anomic/yacy/seedUpload/yacySeedUploadScp.xml b/source/de/anomic/yacy/seedUpload/yacySeedUploadScp.xml
index cc8e4ac38..fd73528fa 100644
--- a/source/de/anomic/yacy/seedUpload/yacySeedUploadScp.xml
+++ b/source/de/anomic/yacy/seedUpload/yacySeedUploadScp.xml
@@ -17,7 +17,7 @@
   	  	  <pathelement location="${build}" />	
   	  	
 		  <!-- main lib needed to parse rss/atom feed files -->  	
-   		  <pathelement location="${libx}/jsch-0.1.21.jar" />  	  		    	
+   		  <pathelement location="${lib}/jsch-0.1.21.jar" />  	  		    	
   	  	</classpath>
   	  </javac>    	
     </target>
@@ -25,9 +25,9 @@
 
     <target name="zip" depends="compile">
   	  <tar destfile="${parserArchive}" compression="gzip">
-  	  	<tarfileset dir="${libx}" 
+  	  	<tarfileset dir="${lib}" 
   	  				includes="jsch-0.1.21.*" 
-  	  				prefix="${releaseDir}/libx/"
+  	  				prefix="${releaseDir}/lib/"
 			  		dirmode="755" mode="644"/>
   	  	<tarfileset dir="${src}/de/anomic/yacy/seedUpload/" 
   	  			    includes="yacySeedUpload${addonShortName}.java"
@@ -46,8 +46,8 @@
 
 
     <target name="copy" depends="compile">
-        <copy todir="${release}/libx/">
-             <fileset dir="${libx}" includes="jsch-0.1.21.*"/> 
+        <copy todir="${release}/lib/">
+             <fileset dir="${lib}" includes="jsch-0.1.21.*"/> 
         </copy>
         <copy todir="${release}/source/de/anomic/yacy/seedUpload/">
              <fileset dir="${src}/de/anomic/yacy/seedUpload/">