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:30 UTC
svn commit: r201767 - in /lenya/branches/BRANCH_1_2_X/src/webapp/lenya/bin:
crawl_and_index.xml util.xml
Author: gregor
Date: Sat Jun 25 09:54:47 2005
New Revision: 201767
URL: http://svn.apache.org/viewcvs?rev=201767&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/branches/BRANCH_1_2_X/src/webapp/lenya/bin/crawl_and_index.xml
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/bin/util.xml
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/bin/crawl_and_index.xml
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/bin/crawl_and_index.xml?rev=201767&r1=201766&r2=201767&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/bin/crawl_and_index.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/bin/crawl_and_index.xml Sat Jun 25 09:54:47 2005
@@ -19,27 +19,20 @@
<project default="main" basedir=".">
-
-
<target name="main" description="main" depends="init">
<echo>INFO: webapp.dir=${webapp.dir}</echo>
</target>
-
-
-
<target name="init">
- <echo message="INFO: Init"/>
-
<property file="local.search.properties"/>
<property file="search.properties"/>
<!-- Dummy arguments -->
- <property name="crawler.xconf" value="src/webapp/lenya/pubs/oscom/config/search/crawler.xconf"/>
- <property name="lucene.xconf" value="src/webapp/lenya/pubs/oscom/config/search/lucene-cmfsMatrix.xconf"/>
- <property name="htdocs.dump.dir" value="src/webapp/lenya/pubs/oscom/content/live/matrix"/>
- <property name="file" value="src/webapp/lenya/pubs/oscom/content/live/matrix/lenya.xml"/>
- <property name="index.dir" value="src/webapp/lenya/pubs/oscom/work/search/lucene/index/index-cmfsMatrix"/>
+ <property name="crawler.xconf" value="src/webapp/lenya/pubs/default/config/search/crawler.xconf"/>
+ <property name="lucene.xconf" value="src/webapp/lenya/pubs/default/config/search/lucene-cmfsMatrix.xconf"/>
+ <property name="htdocs.dump.dir" value="src/webapp/lenya/pubs/default/content/live"/>
+ <property name="file" value="src/webapp/lenya/pubs/default/content/live/index.xml"/>
+ <property name="index.dir" value="src/webapp/lenya/pubs/default/work/search/lucene/index/index"/>
<property name="search.term" value="Lenya"/>
<!-- /Dummy arguments -->
@@ -47,26 +40,14 @@
<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.1-dev-20041008T0304.jar"/>
- <pathelement path="${web-inf.dir}/lib/log4j-1.2.9.jar"/>
- <pathelement path="${web-inf.dir}/lib/excalibur-io-1.1.jar"/>
- <pathelement path="${web-inf.dir}/lib/lucene-1.4.3.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 (IMPORTANT NOTE: Use an absolute path to specify the crawler.xconf file" depends="init">
<echo>INFO: Crawl and dump hypertext documents (${crawler.xconf})</echo>
@@ -81,7 +62,7 @@
<arg value="${crawler.xconf}"/>
<classpath refid="class.path"/>
</java>
- <echo>INFO: Crawling DONE</echo>
+ <echo>INFO: Crawling finished</echo>
</target>
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/bin/util.xml
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/bin/util.xml?rev=201767&r1=201766&r2=201767&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/bin/util.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/bin/util.xml Sat Jun 25 09:54:47 2005
@@ -15,25 +15,17 @@
limitations under the License.
-->
-<!-- $Id: util.xml,v 1.14 2004/05/12 22:02:38 michi Exp $ -->
+<!-- $Id$ -->
<project default="main" basedir=".">
-
-
<target name="main" description="Says Hi">
<echo>Hi</echo>
</target>
-
-
-
<target name="init">
- <echo message="INFO: Init"/>
-
<property name="lenya.dir" value="../../../.."/>
-
<!-- Dummy arguments -->
<property name="password" value="levi"/>
<property name="jtidy-in.html" value="file:///home/lenya/html/index.html"/>
@@ -43,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>
@@ -60,8 +49,6 @@
<classpath refid="class.path"/>
</java>
</target>
-
-
<target name="ssi" description="Server Side Include" depends="init">
<echo>INFO: Server Side Include</echo>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org