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
This commit is contained in:
orbiter 2009-06-30 14:55:23 +00:00
parent 1f1399e5c5
commit 302a02cec8
50 changed files with 175 additions and 187 deletions

View File

@ -13,27 +13,6 @@
<classpathentry kind="src" path="htroot/api/bookmarks/tags"/> <classpathentry kind="src" path="htroot/api/bookmarks/tags"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <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/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-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-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-io-1.4.jar"/>
@ -44,7 +23,28 @@
<classpathentry kind="lib" path="lib/xerces.jar"/> <classpathentry kind="lib" path="lib/xerces.jar"/>
<classpathentry kind="lib" path="lib/bzip2.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/mysql-connector-java-5.1.7-bin.jar"/>
<classpathentry kind="lib" path="libx/poi-3.2-FINAL-20081019.jar"/> <classpathentry kind="lib" path="lib/activation.jar"/>
<classpathentry kind="lib" path="libx/poi-scratchpad-3.2-FINAL-20081019.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"/> <classpathentry kind="output" path="gen"/>
</classpath> </classpath>

View File

@ -41,7 +41,6 @@
<property name="src" location="source"/> <property name="src" location="source"/>
<property name="data" location="DATA"/> <property name="data" location="DATA"/>
<property name="lib" location="lib"/> <property name="lib" location="lib"/>
<property name="libx" location="libx"/>
<property name="libt" location="libt"/> <property name="libt" location="libt"/>
<property name="libbuild" location="libbuild"/> <property name="libbuild" location="libbuild"/>
<property name="build" location="classes"/> <property name="build" location="classes"/>
@ -184,20 +183,40 @@
<path id="project.class.path"> <path id="project.class.path">
<pathelement location="${build}" /> <pathelement location="${build}" />
<pathelement location="${htroot}" /> <pathelement location="${htroot}" />
<pathelement location="${lib}/FontBox-0.1.0-dev.jar" />
<!-- standard libs --> <pathelement location="${lib}/J7Zip-modified.jar" />
<pathelement location="${lib}/tar.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-fileupload-1.2.1.jar" />
<pathelement location="${lib}/commons-httpclient-3.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}/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="${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> </path>
<!-- compiling yacy.java --> <!-- compiling yacy.java -->
@ -239,8 +258,6 @@
<pathelement location="${build}"/> <pathelement location="${build}"/>
<pathelement location="${htroot}"/> <pathelement location="${htroot}"/>
<!-- libs needed for the yacy thread/object-pools -->
<pathelement location="${lib}/tar.jar" />
<!-- userspecific libs --> <!-- userspecific libs -->
<pathelement location="${htdocsWWW}/lib/*.jar" /> <pathelement location="${htdocsWWW}/lib/*.jar" />
<pathelement location="${htdocsWWW}/" /> <pathelement location="${htdocsWWW}/" />
@ -259,7 +276,6 @@
<property name="src" location="${src}"/> <property name="src" location="${src}"/>
<property name="build" location="${build}"/> <property name="build" location="${build}"/>
<property name="lib" location="${lib}"/> <property name="lib" location="${lib}"/>
<property name="libx" location="${libx}"/>
<property name="release" location="${release_ext}"/> <property name="release" location="${release_ext}"/>
<property name="javacSource" value="${javacSource}"/> <property name="javacSource" value="${javacSource}"/>
<property name="javacTarget" value="${javacTarget}"/> <property name="javacTarget" value="${javacTarget}"/>
@ -273,7 +289,7 @@
<subant target="${extensionTarget}"> <subant target="${extensionTarget}">
<property name="src" location="${src}"/> <property name="src" location="${src}"/>
<property name="build" location="${build}"/> <property name="build" location="${build}"/>
<property name="libx" location="${libx}"/> <property name="lib" location="${lib}"/>
<property name="htroot" value="${htroot}"/> <property name="htroot" value="${htroot}"/>
<property name="release" location="${release_ext}"/> <property name="release" location="${release_ext}"/>
<property name="javacSource" value="${javacSource}"/> <property name="javacSource" value="${javacSource}"/>
@ -362,13 +378,6 @@
<!-- copy yacy.jar (if available) --> <!-- copy yacy.jar (if available) -->
<copy todir="${release_main}" file="yacy.jar" failonerror="false"/> <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 build libs -->
<copy todir="${release_main}/libbuild"> <copy todir="${release_main}/libbuild">
<fileset dir="${libbuild}" <fileset dir="${libbuild}"
@ -544,11 +553,6 @@
<fileset dir="${lib}" <fileset dir="${lib}"
includes="**/*"/> includes="**/*"/>
</copy>
<copy todir="${release_source}/libx">
<fileset dir="${libx}"
includes="**/*"/>
</copy> </copy>
<copy todir="${release_source}/libt"> <copy todir="${release_source}/libt">
<fileset dir="${libt}" <fileset dir="${libt}"
@ -914,17 +918,8 @@
<classpath> <classpath>
<pathelement location="${build}"/> <pathelement location="${build}"/>
<pathelement location="${htroot}"/> <pathelement location="${htroot}"/>
<pathelement location="${lib}/tar.jar" /> <pathelement location="${lib}" />
<pathelement location="${lib}/commons-fileupload-1.2.1.jar" /> <fileset dir="${lib}" includes="**/*.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" />
</classpath> </classpath>
<!--<arg value="-Xrunhprof"/>--> <!--<arg value="-Xrunhprof"/>-->
<arg line="-start"/> <arg line="-start"/>
@ -941,9 +936,8 @@
<classpath> <classpath>
<pathelement location="${build}"/> <pathelement location="${build}"/>
<pathelement location="${htroot}"/> <pathelement location="${htroot}"/>
<pathelement location="${lib}/tar.jar" /> <pathelement location="${lib}" />
<pathelement location="${libx}" /> <fileset dir="${lib}" includes="**/*.jar" />
<fileset dir="${libx}" includes="**/*.jar" />
</classpath> </classpath>
<arg line=""/> <arg line=""/>
</java> </java>
@ -955,9 +949,8 @@
<classpath> <classpath>
<pathelement location="${build}"/> <pathelement location="${build}"/>
<pathelement location="${htroot}"/> <pathelement location="${htroot}"/>
<pathelement location="${libx}" /> <pathelement location="${lib}" />
<fileset dir="${lib}" includes="**/*.jar" /> <fileset dir="${lib}" includes="**/*.jar" />
<fileset dir="${libx}" includes="**/*.jar" />
</classpath> </classpath>
<arg line="-start"/> <arg line="-start"/>
<jvmarg line="-Xdebug"/> <jvmarg line="-Xdebug"/>
@ -973,10 +966,8 @@
<classpath> <classpath>
<pathelement location="${build}"/> <pathelement location="${build}"/>
<pathelement location="${htroot}"/> <pathelement location="${htroot}"/>
<pathelement location="${lib}/tar.jar" /> <pathelement location="${lib}" />
<pathelement location="${libx}" />
<fileset dir="${lib}" includes="**/*.jar" /> <fileset dir="${lib}" includes="**/*.jar" />
<fileset dir="${libx}" includes="**/*.jar" />
</classpath> </classpath>
<arg line="-stop"/> <arg line="-stop"/>
</java> </java>
@ -995,9 +986,6 @@
<fileset dir="${lib}"> <fileset dir="${lib}">
<include name="**/*.jar"/> <include name="**/*.jar"/>
</fileset> </fileset>
<fileset dir="${libx}">
<include name="**/*.jar"/>
</fileset>
<pathelement location="${build}"/> <pathelement location="${build}"/>
</classpath> </classpath>
<fileset dir="source" defaultexcludes="yes"> <fileset dir="source" defaultexcludes="yes">
@ -1053,7 +1041,7 @@
<target name="distWithWinStartExe" depends="makeWinStartExe,dist"> <target name="distWithWinStartExe" depends="makeWinStartExe,dist">
</target> </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}/RPMS/noarch" />
<mkdir dir="${release}/BUILD" /> <mkdir dir="${release}/BUILD" />
<copy file="yacy-svn-4.spec" tofile="${release}/SPECS/yacy-svn.spec" overwrite="true" filtering="true" /> <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" <move file="${release}/RPMS/noarch/yacy-${releaseVersion}_${releaseNr}-3.noarch.rpm"
tofile="${release}/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" <move file="${release}/RPMS/noarch/yacy-lib-${releaseVersion}_${releaseNr}-3.noarch.rpm"
tofile="${release}/yacy-libx-${releaseVersion}_${releaseNr}-3.noarch.rpm" /> tofile="${release}/yacy-lib-${releaseVersion}_${releaseNr}-3.noarch.rpm" />
<delete dir="${release}/SPECS" failonerror="false" /> <delete dir="${release}/SPECS" failonerror="false" />
<delete dir="${release}/RPMS" failonerror="false" /> <delete dir="${release}/RPMS" failonerror="false" />

View File

@ -14,7 +14,7 @@
<javac srcdir="${src}/de/anomic/plasma/parser/${parserShortName}" destdir="${build}" source="${javacSource}" target="${javacTarget}" debug="true" debuglevel="lines,vars,source"> <javac srcdir="${src}/de/anomic/plasma/parser/${parserShortName}" destdir="${build}" source="${javacSource}" target="${javacTarget}" debug="true" debuglevel="lines,vars,source">
<classpath> <classpath>
<pathelement location="${build}" /> <pathelement location="${build}" />
<pathelement location="${libx}/bzip2.jar" /> <pathelement location="${lib}/bzip2.jar" />
</classpath> </classpath>
</javac> </javac>
</target> </target>
@ -22,9 +22,9 @@
<target name="zip" depends="compile"> <target name="zip" depends="compile">
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${libx}" <tarfileset dir="${lib}"
includes="bzip2.jar" includes="bzip2.jar"
prefix="${releaseFileParentDir}/libx/" prefix="${releaseFileParentDir}/lib/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
@ -37,8 +37,8 @@
<target name="copy" depends="compile"> <target name="copy" depends="compile">
<copy todir="${release}/libx/"> <copy todir="${release}/lib/">
<fileset dir="${libx}" includes="bzip2.jar"/> <fileset dir="${lib}" includes="bzip2.jar"/>
</copy> </copy>
<copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}"> <copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">
<fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/> <fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/>

View File

@ -16,7 +16,7 @@
<pathelement location="${build}" /> <pathelement location="${build}" />
<!-- main lib needed to parse doc files --> <!-- main lib needed to parse doc files -->
<pathelement location="${libx}/tm-extractors-1.0.jar" /> <pathelement location="${lib}/tm-extractors-1.0.jar" />
</classpath> </classpath>
</javac> </javac>
</target> </target>
@ -24,9 +24,9 @@
<target name="zip" depends="compile"> <target name="zip" depends="compile">
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${libx}" <tarfileset dir="${lib}"
includes="tm-extractors-1.0.*" includes="tm-extractors-1.0.*"
prefix="${releaseFileParentDir}/libx/" prefix="${releaseFileParentDir}/lib/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
@ -38,8 +38,8 @@
</target> </target>
<target name="copy" depends="compile"> <target name="copy" depends="compile">
<copy todir="${release}/libx/"> <copy todir="${release}/lib/">
<fileset dir="${libx}" includes="tm-extractors-1.0.*"/> <fileset dir="${lib}" includes="tm-extractors-1.0.*"/>
</copy> </copy>
<copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}"> <copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">
<fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/> <fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/>

View File

@ -16,10 +16,10 @@
<pathelement location="${build}" /> <pathelement location="${build}" />
<!-- main lib needed to parse doc files --> <!-- main lib needed to parse doc files -->
<pathelement location="${libx}/jmimemagic-0.1.0.jar" /> <pathelement location="${lib}/jmimemagic-0.1.0.jar" />
<pathelement location="${libx}/jakarta-oro-2.0.7.jar" /> <pathelement location="${lib}/jakarta-oro-2.0.7.jar" />
<pathelement location="${libx}/log4j-1.2.9.jar" /> <pathelement location="${lib}/log4j-1.2.9.jar" />
<pathelement location="${libx}/xerces.jar"/> <pathelement location="${lib}/xerces.jar"/>
</classpath> </classpath>
</javac> </javac>
<!-- copy log4j.properties, to disable logging --> <!-- copy log4j.properties, to disable logging -->
@ -29,9 +29,9 @@
<target name="zip" depends="compile"> <target name="zip" depends="compile">
<tar destfile="${parserArchive}" compression="gzip"> <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" 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"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
@ -43,8 +43,8 @@
</target> </target>
<target name="copy" depends="compile"> <target name="copy" depends="compile">
<copy todir="${release}/libx/"> <copy todir="${release}/lib/">
<fileset dir="${libx}" includes="jmimemagic-0.1.0.jar,jakarta-oro-2.0.7.jar,log4j-1.2.9.jar,xerces.jar"/> <fileset dir="${lib}" includes="jmimemagic-0.1.0.jar,jakarta-oro-2.0.7.jar,log4j-1.2.9.jar,xerces.jar"/>
</copy> </copy>
<copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}"> <copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">
<fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/> <fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/>

View File

@ -14,7 +14,7 @@
<javac srcdir="${src}/de/anomic/plasma/parser/${parserShortName}" destdir="${build}" source="${javacSource}" target="${javacTarget}" debug="true" debuglevel="lines,vars,source"> <javac srcdir="${src}/de/anomic/plasma/parser/${parserShortName}" destdir="${build}" source="${javacSource}" target="${javacTarget}" debug="true" debuglevel="lines,vars,source">
<classpath> <classpath>
<pathelement location="${build}" /> <pathelement location="${build}" />
<pathelement location="${libx}/odf_utils_05_11_29.jar" /> <pathelement location="${lib}/odf_utils_05_11_29.jar" />
</classpath> </classpath>
</javac> </javac>
</target> </target>
@ -22,9 +22,9 @@
<target name="zip" depends="compile"> <target name="zip" depends="compile">
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${libx}" <tarfileset dir="${lib}"
includes="odf_utils_05_11_29.*" includes="odf_utils_05_11_29.*"
prefix="${releaseFileParentDir}/libx/" prefix="${releaseFileParentDir}/lib/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
@ -36,8 +36,8 @@
</target> </target>
<target name="copy" depends="compile"> <target name="copy" depends="compile">
<copy todir="${release}/libx/"> <copy todir="${release}/lib/">
<fileset dir="${libx}" includes="odf_utils_05_11_29.*"/> <fileset dir="${lib}" includes="odf_utils_05_11_29.*"/>
</copy> </copy>
<copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}"> <copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">
<fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/> <fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/>

View File

@ -15,29 +15,29 @@
<classpath> <classpath>
<pathelement location="${build}" /> <pathelement location="${build}" />
<!-- main lib needed to parse pdf files --> <!-- 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 --> <!-- additional fontparsing lib, part of PDFBox -->
<pathelement location="${libx}/FontBox-0.1.0-dev.jar" /> <pathelement location="${lib}/FontBox-0.1.0-dev.jar" />
<pathelement location="${libx}/bcprov-jdk14-139.jar" /> <pathelement location="${lib}/bcprov-jdk14-139.jar" />
<pathelement location="${libx}/bcmail-jdk14-139.jar" /> <pathelement location="${lib}/bcmail-jdk14-139.jar" />
</classpath> </classpath>
</javac> </javac>
</target> </target>
<target name="zip" depends="compile"> <target name="zip" depends="compile">
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${libx}" includes="PDFBox-0.7.3.*" prefix="${releaseFileParentDir}/libx/" dirmode="755" mode="644" /> <tarfileset dir="${lib}" includes="PDFBox-0.7.3.*" prefix="${releaseFileParentDir}/lib/" dirmode="755" mode="644" />
<tarfileset dir="${libx}" includes="FontBox*" prefix="${releaseFileParentDir}/libx/" dirmode="755" mode="644" /> <tarfileset dir="${lib}" includes="FontBox*" prefix="${releaseFileParentDir}/lib/" dirmode="755" mode="644" />
<tarfileset dir="${libx}" includes="bcprov*" prefix="${releaseFileParentDir}/libx/" dirmode="755" mode="644" /> <tarfileset dir="${lib}" includes="bcprov*" prefix="${releaseFileParentDir}/lib/" dirmode="755" mode="644" />
<tarfileset dir="${libx}" includes="bcmail*" prefix="${releaseFileParentDir}/libx/" 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="${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" /> <tarfileset dir="${build}/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/classes/de/anomic/plasma/parser/${parserShortName}" dirmode="755" mode="644" />
</tar> </tar>
</target> </target>
<target name="copy" depends="compile"> <target name="copy" depends="compile">
<copy todir="${release}/libx/"> <copy todir="${release}/lib/">
<fileset dir="${libx}" includes="PDFBox-0.7.3.*,FontBox*,bcprov*,bcmail*" /> <fileset dir="${lib}" includes="PDFBox-0.7.3.*,FontBox*,bcprov*,bcmail*" />
</copy> </copy>
<copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}"> <copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">
<fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*" /> <fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*" />

View File

@ -18,8 +18,8 @@
<pathelement location="${build}" /> <pathelement location="${build}" />
<!-- libraries needed by this parser --> <!-- libraries needed by this parser -->
<pathelement location="${libx}/poi-3.2-FINAL-20081019.jar" /> <pathelement location="${lib}/poi-3.2-FINAL-20081019.jar" />
<pathelement location="${libx}/poi-scratchpad-3.2-FINAL-20081019.jar" /> <pathelement location="${lib}/poi-scratchpad-3.2-FINAL-20081019.jar" />
</classpath> </classpath>
</javac> </javac>
</target> </target>
@ -28,9 +28,9 @@
<target name="zip" depends="compile"> <target name="zip" depends="compile">
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<!-- needed libraries and license files of these libs --> <!-- needed libraries and license files of these libs -->
<tarfileset dir="${libx}" <tarfileset dir="${lib}"
includes="poi-*.*" includes="poi-*.*"
prefix="${releaseFileParentDir}/libx/" prefix="${releaseFileParentDir}/lib/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<!-- source files of this parser --> <!-- source files of this parser -->
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
@ -46,8 +46,8 @@
<!-- just copy all parts of this parser into the release directory --> <!-- just copy all parts of this parser into the release directory -->
<target name="copy" depends="compile"> <target name="copy" depends="compile">
<!-- copy needed libs --> <!-- copy needed libs -->
<copy todir="${release}/libx/"> <copy todir="${release}/lib/">
<fileset dir="${libx}" includes="poi-*.*"/> <fileset dir="${lib}" includes="poi-*.*"/>
</copy> </copy>
<!-- copy source code files --> <!-- copy source code files -->

View File

@ -14,8 +14,8 @@
<javac srcdir="${src}/de/anomic/plasma/parser/${parserShortName}" destdir="${build}" source="${javacSource}" target="${javacTarget}" debug="true" debuglevel="lines,vars,source"> <javac srcdir="${src}/de/anomic/plasma/parser/${parserShortName}" destdir="${build}" source="${javacSource}" target="${javacTarget}" debug="true" debuglevel="lines,vars,source">
<classpath> <classpath>
<pathelement location="${build}" /> <pathelement location="${build}" />
<pathelement location="${libx}/jrpm-head.jar" /> <pathelement location="${lib}/jrpm-head.jar" />
<pathelement location="${libx}/log4j-1.2.9.jar"/> <pathelement location="${lib}/log4j-1.2.9.jar"/>
</classpath> </classpath>
</javac> </javac>
</target> </target>
@ -23,9 +23,9 @@
<target name="zip" depends="compile"> <target name="zip" depends="compile">
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${libx}" <tarfileset dir="${lib}"
includes="jrpm-head.*,log4j-1.2.9.jar" includes="jrpm-head.*,log4j-1.2.9.jar"
prefix="${releaseFileParentDir}/libx/" prefix="${releaseFileParentDir}/lib/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
@ -37,8 +37,8 @@
</target> </target>
<target name="copy" depends="compile"> <target name="copy" depends="compile">
<copy todir="${release}/libx/"> <copy todir="${release}/lib/">
<fileset dir="${libx}" includes="jrpm-head.*,log4j-1.2.9.jar"/> <fileset dir="${lib}" includes="jrpm-head.*,log4j-1.2.9.jar"/>
</copy> </copy>
<copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}"> <copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">
<fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/> <fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/>

View File

@ -17,7 +17,7 @@
<classpath> <classpath>
<pathelement location="${build}" /> <pathelement location="${build}" />
<pathelement location="${libx}/J7Zip-modified.jar" /> <pathelement location="${lib}/J7Zip-modified.jar" />
</classpath> </classpath>
</javac> </javac>
</target> </target>
@ -25,9 +25,9 @@
<target name="zip" depends="compile"> <target name="zip" depends="compile">
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${libx}" <tarfileset dir="${lib}"
includes="J7Zip-modified.jar" includes="J7Zip-modified.jar"
prefix="${releaseFileParentDir}/libx/" prefix="${releaseFileParentDir}/lib/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
@ -39,8 +39,8 @@
</target> </target>
<target name="copy" depends="compile"> <target name="copy" depends="compile">
<copy todir="${release}/libx/"> <copy todir="${release}/lib/">
<fileset dir="${libx}" includes="J7Zip-modified.jar"/> <fileset dir="${lib}" includes="J7Zip-modified.jar"/>
</copy> </copy>
<copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}"> <copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">
<fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/> <fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/>

View File

@ -16,7 +16,7 @@
<pathelement location="${build}" /> <pathelement location="${build}" />
<!-- main lib needed to parse swf files --> <!-- main lib needed to parse swf files -->
<pathelement location="${libx}/webcat-0.1-swf.jar" /> <pathelement location="${lib}/webcat-0.1-swf.jar" />
</classpath> </classpath>
</javac> </javac>
</target> </target>
@ -24,9 +24,9 @@
<target name="zip" depends="compile"> <target name="zip" depends="compile">
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${libx}" <tarfileset dir="${lib}"
includes="webcat-0.1-swf.*" includes="webcat-0.1-swf.*"
prefix="${releaseFileParentDir}/libx/" prefix="${releaseFileParentDir}/lib/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
@ -38,8 +38,8 @@
</target> </target>
<target name="copy" depends="compile"> <target name="copy" depends="compile">
<copy todir="${release}/libx/"> <copy todir="${release}/lib/">
<fileset dir="${libx}" includes="webcat-0.1-swf.*"/> <fileset dir="${lib}" includes="webcat-0.1-swf.*"/>
</copy> </copy>
<copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}"> <copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">
<fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/> <fileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" includes="**/*"/>

View File

@ -25,7 +25,7 @@
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${lib}" <tarfileset dir="${lib}"
includes="tar.jar" includes="tar.jar"
prefix="${releaseFileParentDir}/libx/" prefix="${releaseFileParentDir}/lib/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}" prefix="${releaseFileParentDir}/source/de/anomic/plasma/parser/${parserShortName}"
@ -37,7 +37,7 @@
</target> </target>
<target name="copy" depends="compile"> <target name="copy" depends="compile">
<copy todir="${release}/libx/"> <copy todir="${release}/lib/">
<fileset dir="${lib}" includes="tar.jar"/> <fileset dir="${lib}" includes="tar.jar"/>
</copy> </copy>
<copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}"> <copy todir="${release}/source/de/anomic/plasma/parser/${parserShortName}">

View File

@ -14,7 +14,7 @@
<pathelement location="${build}" /> <pathelement location="${build}" />
<!-- libraries needed by this parser --> <!-- libraries needed by this parser -->
<pathelement location="${libx}/commons-codec-1.3.jar" /> <pathelement location="${lib}/commons-codec-1.3.jar" />
</classpath> </classpath>
</javac> </javac>
</target> </target>
@ -23,9 +23,9 @@
<target name="zip" depends="compile"> <target name="zip" depends="compile">
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<!-- needed libraries --> <!-- needed libraries -->
<tarfileset dir="${libx}" <tarfileset dir="${lib}"
includes="commons-codec-1.3.*" includes="commons-codec-1.3.*"
prefix="${releaseFileParentDir}/libx/" prefix="${releaseFileParentDir}/lib/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<!-- source files of this parser --> <!-- source files of this parser -->
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
@ -41,8 +41,8 @@
<!-- just copy all parts of this parser into the release directory --> <!-- just copy all parts of this parser into the release directory -->
<target name="copy" depends="compile"> <target name="copy" depends="compile">
<!-- copy needed libs --> <!-- copy needed libs -->
<copy todir="${release}/libx/"> <copy todir="${release}/lib/">
<fileset dir="${libx}" includes="commons-codec-1.3.*"/> <fileset dir="${lib}" includes="commons-codec-1.3.*"/>
</copy> </copy>
<!-- copy source code files --> <!-- copy source code files -->

View File

@ -18,8 +18,8 @@
<pathelement location="${build}" /> <pathelement location="${build}" />
<!-- libraries needed by this parser --> <!-- libraries needed by this parser -->
<pathelement location="${libx}/poi-3.2-FINAL-20081019.jar" /> <pathelement location="${lib}/poi-3.2-FINAL-20081019.jar" />
<pathelement location="${libx}/poi-scratchpad-3.2-FINAL-20081019.jar" /> <pathelement location="${lib}/poi-scratchpad-3.2-FINAL-20081019.jar" />
</classpath> </classpath>
</javac> </javac>
</target> </target>
@ -28,9 +28,9 @@
<target name="zip" depends="compile"> <target name="zip" depends="compile">
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<!-- needed libraries and license files of these libs --> <!-- needed libraries and license files of these libs -->
<tarfileset dir="${libx}" <tarfileset dir="${lib}"
includes="poi-*.*" includes="poi-*.*"
prefix="${releaseFileParentDir}/libx/" prefix="${releaseFileParentDir}/lib/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<!-- source files of this parser --> <!-- source files of this parser -->
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
@ -46,8 +46,8 @@
<!-- just copy all parts of this parser into the release directory --> <!-- just copy all parts of this parser into the release directory -->
<target name="copy" depends="compile"> <target name="copy" depends="compile">
<!-- copy needed libs --> <!-- copy needed libs -->
<copy todir="${release}/libx/"> <copy todir="${release}/lib/">
<fileset dir="${libx}" includes="poi-*.*"/> <fileset dir="${lib}" includes="poi-*.*"/>
</copy> </copy>
<!-- copy source code files --> <!-- copy source code files -->

View File

@ -18,8 +18,8 @@
<pathelement location="${build}" /> <pathelement location="${build}" />
<!-- libraries needed by this parser --> <!-- libraries needed by this parser -->
<pathelement location="${libx}/poi-3.2-FINAL-20081019.jar" /> <pathelement location="${lib}/poi-3.2-FINAL-20081019.jar" />
<pathelement location="${libx}/poi-scratchpad-3.2-FINAL-20081019.jar" /> <pathelement location="${lib}/poi-scratchpad-3.2-FINAL-20081019.jar" />
</classpath> </classpath>
</javac> </javac>
</target> </target>
@ -28,9 +28,9 @@
<target name="zip" depends="compile"> <target name="zip" depends="compile">
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<!-- needed libraries and license files of these libs --> <!-- needed libraries and license files of these libs -->
<tarfileset dir="${libx}" <tarfileset dir="${lib}"
includes="poi-*.*" includes="poi-*.*"
prefix="${releaseFileParentDir}/libx/" prefix="${releaseFileParentDir}/lib/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<!-- source files of this parser --> <!-- source files of this parser -->
<tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}" <tarfileset dir="${src}/de/anomic/plasma/parser/${parserShortName}"
@ -46,8 +46,8 @@
<!-- just copy all parts of this parser into the release directory --> <!-- just copy all parts of this parser into the release directory -->
<target name="copy" depends="compile"> <target name="copy" depends="compile">
<!-- copy needed libs --> <!-- copy needed libs -->
<copy todir="${release}/libx/"> <copy todir="${release}/lib/">
<fileset dir="${libx}" includes="poi-*.*"/> <fileset dir="${lib}" includes="poi-*.*"/>
</copy> </copy>
<!-- copy source code files --> <!-- copy source code files -->

View File

@ -17,7 +17,7 @@
<pathelement location="${build}" /> <pathelement location="${build}" />
<!-- main lib needed to parse rss/atom feed files --> <!-- 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> </classpath>
</javac> </javac>
</target> </target>
@ -25,9 +25,9 @@
<target name="zip" depends="compile"> <target name="zip" depends="compile">
<tar destfile="${parserArchive}" compression="gzip"> <tar destfile="${parserArchive}" compression="gzip">
<tarfileset dir="${libx}" <tarfileset dir="${lib}"
includes="jsch-0.1.21.*" includes="jsch-0.1.21.*"
prefix="${releaseDir}/libx/" prefix="${releaseDir}/lib/"
dirmode="755" mode="644"/> dirmode="755" mode="644"/>
<tarfileset dir="${src}/de/anomic/yacy/seedUpload/" <tarfileset dir="${src}/de/anomic/yacy/seedUpload/"
includes="yacySeedUpload${addonShortName}.java" includes="yacySeedUpload${addonShortName}.java"
@ -46,8 +46,8 @@
<target name="copy" depends="compile"> <target name="copy" depends="compile">
<copy todir="${release}/libx/"> <copy todir="${release}/lib/">
<fileset dir="${libx}" includes="jsch-0.1.21.*"/> <fileset dir="${lib}" includes="jsch-0.1.21.*"/>
</copy> </copy>
<copy todir="${release}/source/de/anomic/yacy/seedUpload/"> <copy todir="${release}/source/de/anomic/yacy/seedUpload/">
<fileset dir="${src}/de/anomic/yacy/seedUpload/"> <fileset dir="${src}/de/anomic/yacy/seedUpload/">