*) Fixed broken compile process.

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3650 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · May 4, 2007 · e12e934 · e12e934
1 parent d6811ac
commit e12e934
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 47 deletions.
diff --git a/.classpath b/.classpath
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="source"/>
-	<classpathentry excluding="htdocsdefault/|locale/|proxymsg/|yacy/|env/|env/" kind="src" output="htroot" path="htroot"/>
-	<classpathentry kind="src" path="htroot/htdocsdefault"/>
-	<classpathentry kind="src" path="htroot/yacy"/>
-	<classpathentry kind="src" path="htroot/env"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/commons-collections.jar"/>
-	<classpathentry kind="lib" path="lib/commons-pool.jar"/>
-	<classpathentry kind="lib" path="libx/axis-ant.jar"/>
-	<classpathentry kind="lib" path="libx/axis.jar"/>
-	<classpathentry kind="lib" path="libx/bzip2.jar"/>
-	<classpathentry kind="lib" path="libx/commons-codec-1.3.jar"/>
-	<classpathentry kind="lib" path="libx/commons-discovery.jar"/>
-	<classpathentry kind="lib" path="libx/commons-jxpath-1.1.jar"/>
-	<classpathentry kind="lib" path="libx/commons-logging.jar"/>
-	<classpathentry kind="lib" path="libx/informa-0.6.0.jar"/>
-	<classpathentry kind="lib" path="libx/jakarta-oro-2.0.7.jar"/>
-	<classpathentry kind="lib" path="libx/jaxrpc.jar"/>
-	<classpathentry kind="lib" path="libx/jdom.jar"/>
-	<classpathentry kind="lib" path="libx/jmimemagic-0.1.0.jar"/>
-	<classpathentry kind="lib" path="libx/jrpm-head.jar"/>
-	<classpathentry kind="lib" path="libx/jrpm-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="libx/jsch-0.1.21.jar"/>
-	<classpathentry kind="lib" path="libx/log4j-1.2.9.jar"/>
-	<classpathentry kind="lib" path="libx/odf_utils_05_11_29.jar"/>
-	<classpathentry kind="lib" path="libx/PDFBox-0.7.2.jar"/>
-	<classpathentry kind="lib" path="libx/saaj.jar"/>
-	<classpathentry kind="lib" path="libx/sbbi-upnplib-1.0.3.jar"/>
-	<classpathentry kind="lib" path="libx/tar.jar"/>
-	<classpathentry kind="lib" path="libx/tm-extractors-0.4.jar"/>
-	<classpathentry kind="lib" path="libx/wsdl4j.jar"/>
-	<classpathentry kind="lib" path="libx/xerces.jar"/>
-	<classpathentry kind="lib" path="libx/poi-3.0-alpha2-20060616.jar"/>
-	<classpathentry kind="lib" path="libx/poi-scratchpad-3.0-alpha2-20060616.jar"/>
-	<classpathentry kind="lib" path="libx/inetlib.jar"/>
-	<classpathentry kind="lib" path="libx/gnumail.jar"/>
-	<classpathentry kind="lib" path="libx/activation.jar"/>
-	<classpathentry kind="lib" path="libx/webcat-0.1-swf.jar"/>
-	<classpathentry kind="output" path="gen"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="source"/>
+	<classpathentry excluding="htdocsdefault/|locale/|proxymsg/|yacy/|env/|env/" kind="src" output="htroot" path="htroot"/>
+	<classpathentry kind="src" path="htroot/htdocsdefault"/>
+	<classpathentry kind="src" path="htroot/yacy"/>
+	<classpathentry kind="src" path="htroot/env"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/commons-collections.jar"/>
+	<classpathentry kind="lib" path="lib/commons-pool.jar"/>
+	<classpathentry kind="lib" path="lib/tar.jar"/>
+	<classpathentry kind="lib" path="libx/axis-ant.jar"/>
+	<classpathentry kind="lib" path="libx/axis.jar"/>
+	<classpathentry kind="lib" path="libx/bzip2.jar"/>
+	<classpathentry kind="lib" path="libx/commons-codec-1.3.jar"/>
+	<classpathentry kind="lib" path="libx/commons-discovery.jar"/>
+	<classpathentry kind="lib" path="libx/commons-jxpath-1.1.jar"/>
+	<classpathentry kind="lib" path="libx/commons-logging.jar"/>
+	<classpathentry kind="lib" path="libx/informa-0.6.0.jar"/>
+	<classpathentry kind="lib" path="libx/jakarta-oro-2.0.7.jar"/>
+	<classpathentry kind="lib" path="libx/jaxrpc.jar"/>
+	<classpathentry kind="lib" path="libx/jdom.jar"/>
+	<classpathentry kind="lib" path="libx/jmimemagic-0.1.0.jar"/>
+	<classpathentry kind="lib" path="libx/jrpm-head.jar"/>
+	<classpathentry kind="lib" path="libx/jrpm-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="libx/jsch-0.1.21.jar"/>
+	<classpathentry kind="lib" path="libx/log4j-1.2.9.jar"/>
+	<classpathentry kind="lib" path="libx/odf_utils_05_11_29.jar"/>
+	<classpathentry kind="lib" path="libx/PDFBox-0.7.2.jar"/>
+	<classpathentry kind="lib" path="libx/saaj.jar"/>
+	<classpathentry kind="lib" path="libx/sbbi-upnplib-1.0.3.jar"/>
+	<classpathentry kind="lib" path="libx/tm-extractors-0.4.jar"/>
+	<classpathentry kind="lib" path="libx/wsdl4j.jar"/>
+	<classpathentry kind="lib" path="libx/xerces.jar"/>
+	<classpathentry kind="lib" path="libx/poi-3.0-alpha2-20060616.jar"/>
+	<classpathentry kind="lib" path="libx/poi-scratchpad-3.0-alpha2-20060616.jar"/>
+	<classpathentry kind="lib" path="libx/inetlib.jar"/>
+	<classpathentry kind="lib" path="libx/gnumail.jar"/>
+	<classpathentry kind="lib" path="libx/activation.jar"/>
+	<classpathentry kind="lib" path="libx/webcat-0.1-swf.jar"/>
+	<classpathentry kind="output" path="gen"/>
+</classpath>
diff --git a/build.xml b/build.xml
@@ -206,6 +206,7 @@
     <!-- libs needed for the yacy thread/object-pools -->
     <pathelement location="${lib}/commons-collections.jar" />
     <pathelement location="${lib}/commons-pool.jar" />    
+	<pathelement location="${lib}/tar.jar" />
   </path>
 
   <!-- compiling yacy.java -->   
@@ -250,7 +251,7 @@
 	    <!-- libs needed for the yacy thread/object-pools -->
 	    <pathelement location="${lib}/commons-collections.jar" />
 	    <pathelement location="${lib}/commons-pool.jar" />  
-
+	  	<pathelement location="${lib}/tar.jar" />
 	  	<!-- userspecific libs -->
 		<pathelement location="${htdocsWWW}/lib/*.jar" />
 	  	<pathelement location="${htdocsWWW}/" />
@@ -643,6 +644,7 @@
       <pathelement location="${htroot}"/>
       <pathelement location="${lib}/commons-collections.jar" />
       <pathelement location="${lib}/commons-pool.jar" />        
+      <pathelement location="${lib}/tar.jar" />
       <pathelement location="${libx}" />                 
       <fileset dir="${libx}" includes="**/*.jar" />
     </classpath>
@@ -663,6 +665,7 @@
       <pathelement location="${htroot}"/>
       <pathelement location="${lib}/commons-collections.jar" />
       <pathelement location="${lib}/commons-pool.jar" />        
+      <pathelement location="${lib}/tar.jar" />
       <pathelement location="${libx}" />                 
       <fileset dir="${libx}" includes="**/*.jar" />
     </classpath>
@@ -678,6 +681,7 @@
       <pathelement location="${htroot}"/>
       <pathelement location="${lib}/commons-collections.jar" />
       <pathelement location="${lib}/commons-pool.jar" />        
+      <pathelement location="${lib}/tar.jar" />
       <pathelement location="${libx}" />                 
       <fileset dir="${libx}" includes="**/*.jar" />
     </classpath>
@@ -697,6 +701,7 @@
       <pathelement location="${htroot}"/>
       <pathelement location="${lib}/commons-collections.jar" />
       <pathelement location="${lib}/commons-pool.jar" />        
+      <pathelement location="${lib}/tar.jar" />
       <pathelement location="${libx}" />                 
       <fileset dir="${libx}" includes="**/*.jar" />
     </classpath>

diff --git a/source/de/anomic/plasma/parser/tar/build.xml b/source/de/anomic/plasma/parser/tar/build.xml
@@ -15,15 +15,15 @@
   	  	<classpath>
   	  	  <pathelement location="${build}" />	
 
-  		  <pathelement location="${libx}/tar.jar" />        	  
+  		  <pathelement location="${lib}/tar.jar" />        	  
   	  	</classpath>
   	  </javac>    	
     </target>
 
 
     <target name="zip" depends="compile">
   	  <tar destfile="${parserArchive}" compression="gzip">
-  	  	<tarfileset dir="${libx}" 
+  	  	<tarfileset dir="${lib}" 
   	  				includes="tar.jar" 
   	  				prefix="${releaseFileParentDir}/libx/"
 			  	  	dirmode="755" mode="644"/>
@@ -38,7 +38,7 @@
 
     <target name="copy" depends="compile">
         <copy todir="${release}/libx/">
-             <fileset dir="${libx}" includes="tar.jar"/> 
+             <fileset dir="${lib}" includes="tar.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/tar/tarParser.java b/source/de/anomic/plasma/parser/tar/tarParser.java
@@ -85,7 +85,7 @@ public class tarParser extends AbstractParser implements Parser {
      * @see Parser#getLibxDependences()
      */
     private static final String[] LIBX_DEPENDENCIES = new String[] {
-        "tar.jar"
+//        "tar.jar"
     };    
 
     public tarParser() {