(no commit message)

diff --git a/crawler/kiss/conf/kiss/run.bat b/crawler/kiss/conf/kiss/run.bat
index bd42fdda03ab018d2f4ec4e6fdd762d2f252d199..e1394d9fc976fca6d127e829ae0a7df623773554 100755 (executable)
--- a/crawler/kiss/conf/kiss/run.bat
+++ b/crawler/kiss/conf/kiss/run.bat
@@ -4,12 +4,8 @@
 cd ../conf\r
 \r
 \r
-set CP=../lib/wamblee-crawler-kiss.jar;../lib/activation.jar;../lib/comons-beanutils-1.7.0.jar;../lib/commons-codec-1.3.jar\r
-set CP=%CP%;../lib/commons-email-1.0.jar;../lib/commons-httpclient-3.0.jar;../lib/commons-logging-1.0.2.jar;\r
-set CP=%CP%;../lib/dom4j-1.6.jar;../lib/jaxen-1.1-beta-4.jar;../lib/jtidy-4aug2000r7-dev.jar;log4j-1.2.9.jar;\r
-set CP=%CP%;../lib/mail.jar;../lib/spring-1.2.5.jar;../lib/wamblee-crawler-basic.jar;../lib/wamblee-crawler-kiss.jar;\r
-set CP=%CP%;../lib/wamblee-support.jar;../lib/xerces-2.4.0.jar\r
+set CP=.;../lib/support-0.2-SNAPSHOT.jar;../lib/crawler-kiss-0.2-SNAPSHOT.jar\r
 \r
 \r
-java -classpath %CP% org.wamblee.crawler.kiss.main.KissCrawler config.xml programs.xml
-
+java -classpath %CP% org.wamblee.crawler.kiss.main.KissCrawlerBootstrapper ../lib config.xml programs.xml\r
+\r

diff --git a/crawler/kiss/conf/kiss/run.sh b/crawler/kiss/conf/kiss/run.sh
index e6280b4bc32df31036e5d2a824cd396a9aab836e..af3e8c2f64724d011c8441901085628792d71d82 100755 (executable)
--- a/crawler/kiss/conf/kiss/run.sh
+++ b/crawler/kiss/conf/kiss/run.sh
@@ -2,13 +2,9 @@
 
 cd $( dirname $0 )/../conf
 
-CP="."
-for i in ../lib/*.jar
-do
-  CP="$i:$CP"
-done
+CP=.:../lib/support-0.2-SNAPSHOT.jar:../lib/crawler-kiss-0.2-SNAPSHOT.jar
 
 set -x 
-java -classpath $CP org.wamblee.crawler.kiss.main.KissCrawler \
-  config.xml programs.xml
+java -classpath $CP org.wamblee.crawler.kiss.main.KissCrawlerBootstrapper \
+  ../lib  config.xml programs.xml
 

diff --git a/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/KissCrawler.java b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/KissCrawler.java
index 3300e1299e71b6c4268d9ba9447b65d6df17fe8f..e8232332c8a05abf8d5a5952b659cf2b13bcc526 100644 (file)
--- a/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/KissCrawler.java
+++ b/crawler/kiss/src/main/java/org/wamblee/crawler/kiss/main/KissCrawler.java
@@ -49,6 +49,7 @@ import org.wamblee.crawler.kiss.guide.TimeInterval;
 import org.wamblee.crawler.kiss.notification.NotificationException;
 import org.wamblee.crawler.kiss.notification.Notifier;
 import org.wamblee.general.BeanFactory;
+import org.wamblee.general.ClassPathHacker;
 import org.wamblee.xml.ClasspathUriResolver;
 import org.wamblee.xml.XslTransformer;
 
@@ -85,7 +86,8 @@ public class KissCrawler {
      * Runs the KiSS crawler.
      * 
      * @param aArgs
-     *            Arguments, currently all ignored because they are hardcoded.
+     *            Arguments: First argument is the crawler configuration file,
+     *            and second is the program configuration file. 
      * @throws Exception
      *             In case of problems.
      */