You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/06/26 11:57:29 UTC

svn commit: r201766 - in /lenya/trunk/src/webapp/lenya/bin: crawl_and_index.xml util.xml

Author: gregor
Date: Sat Jun 25 09:54:42 2005
New Revision: 201766

URL: http://svn.apache.org/viewcvs?rev=201766&view=rev
Log:
No longer hardcode jars in the ant classpath. This resolves the constant breakage as new versions of these jars are added.

Modified:
    lenya/trunk/src/webapp/lenya/bin/crawl_and_index.xml
    lenya/trunk/src/webapp/lenya/bin/util.xml

Modified: lenya/trunk/src/webapp/lenya/bin/crawl_and_index.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/bin/crawl_and_index.xml?rev=201766&r1=201765&r2=201766&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/bin/crawl_and_index.xml (original)
+++ lenya/trunk/src/webapp/lenya/bin/crawl_and_index.xml Sat Jun 25 09:54:42 2005
@@ -29,8 +29,7 @@
 
 
 <target name="init">
-  <echo message="INFO: Init"/>
-
+  <property file="local.search.properties"/>
   <property file="search.properties"/>
 
   <!-- Dummy arguments -->
@@ -46,42 +45,24 @@
 
   <path id="class.path">
     <pathelement path="${web-inf.dir}/classes"/>
-    <pathelement path="${web-inf.dir}/lib/xercesImpl-2.6.2.jar"/>
-    <pathelement path="${web-inf.dir}/lib/xml-apis.jar"/>
-    <pathelement path="${web-inf.dir}/lib/xalan-2.6.0.jar"/>
-    <pathelement path="${web-inf.dir}/lib/log4j-1.2.8.jar"/>
-    <pathelement path="${web-inf.dir}/lib/excalibur-io-1.1.jar"/>
-    <pathelement path="${web-inf.dir}/lib/lucene-1.4.1.jar"/>
-    <pathelement path="${web-inf.dir}/lib/websphinx-0.5.jar"/>
-    <pathelement path="${web-inf.dir}/lib/xml-commons-resolver-1.1.jar"/>
+    <fileset dir="${web-inf.dir}/lib">
+      <include name="**/*.jar"/>
+    </fileset>   
   </path>
 
-<!--
-  <property environment="env"/>
-  <property name="javaexe" value="${env.JAVA_HOME}/bin/java"/>
--->
-
   <chmod file="${webapp.dir}/lenya/bin/crawl_and_index.sh" perm="755"/>
 </target>
 
-<target name="crawl" description="Crawl and dump hypertext documents. Usage: -Dcrawler.xconf=/foo/bar/crawler.xconf" depends="init">
+<target name="crawl" description="Crawl and dump hypertext documents. Usage: -Dcrawler.xconf=/foo/bar/crawler.xconf (IMPORTANT NOTE: Use an absolute path to specify the crawler.xconf file" depends="init">
   <echo>INFO: Crawl and dump hypertext documents (${crawler.xconf})</echo>
 
-<!--
-  <exec executable="${webapp.dir}/lenya/bin/crawl_and_index.sh">
-    <arg value="crawl"/>
-    <arg value="${crawler.xconf}"/>
-  </exec>
--->
-
-<!-- TODO: Linkage problem -->
   <echo>INFO: Show configuration</echo>
   <java classname="org.apache.lenya.search.crawler.CrawlerConfiguration">
     <arg value="${crawler.xconf}"/>
     <classpath refid="class.path"/>
   </java>
 
-  <echo>INFO: Start crawling ...</echo>
+  <echo>INFO: START crawling ...</echo>
   <java classname="org.apache.lenya.search.crawler.IterativeHTMLCrawler">
     <arg value="${crawler.xconf}"/>
     <classpath refid="class.path"/>

Modified: lenya/trunk/src/webapp/lenya/bin/util.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/bin/util.xml?rev=201766&r1=201765&r2=201766&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/bin/util.xml (original)
+++ lenya/trunk/src/webapp/lenya/bin/util.xml Sat Jun 25 09:54:42 2005
@@ -35,12 +35,9 @@
 
   <path id="class.path">
     <pathelement path="${lenya.dir.web-inf}/classes"/>
-    <pathelement path="${lenya.dir.web-inf}/lib/xercesImpl-2.1.0.jar"/>
-    <pathelement path="${lenya.dir.web-inf}/lib/xml-apis.jar"/>
-    <pathelement path="${lenya.dir.web-inf}/lib/xalan-2.4.1.jar"/>
-    <pathelement path="${lenya.dir.web-inf}/lib/log4j-1.2.8.jar"/>
-    <pathelement path="${lenya.dir.web-inf}/lib/excalibur-io-1.1.jar"/>
-    <pathelement path="${lenya.dir.web-inf}/lib/jtidy-04aug2000r7-dev.jar"/>
+    <fileset dir="${lenya.dir.web-inf}/lib">
+      <include name="**/*.jar"/>
+    </fileset>   
   </path>
 </target>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org