From 28779b2bc93d230fed9e3c28a14ef5b7b88c50af Mon Sep 17 00:00:00 2001 From: Erik Brakkee Date: Sun, 30 Apr 2006 21:12:28 +0000 Subject: [PATCH] --- crawler/kiss/build.xml | 2 +- crawler/kiss/conf/kiss/notification.xml | 34 ------------ crawler/kiss/conf/kiss/programs.xml | 14 ----- crawler/kiss/conf/kiss/run.sh | 2 +- crawler/kiss/docs/content/xdocs/index.xml | 52 ++++++++----------- crawler/kiss/src/crawler-standalone.xml | 3 +- .../src/org.wamblee.crawler.notification.xml | 14 ++--- crawler/kissweb/src/beanRefContext.xml | 1 + 8 files changed, 33 insertions(+), 89 deletions(-) delete mode 100644 crawler/kiss/conf/kiss/notification.xml rename crawler/{kissweb => kiss}/src/org.wamblee.crawler.notification.xml (62%) diff --git a/crawler/kiss/build.xml b/crawler/kiss/build.xml index bae9b1e1..0b32f188 100644 --- a/crawler/kiss/build.xml +++ b/crawler/kiss/build.xml @@ -48,7 +48,7 @@ - + diff --git a/crawler/kiss/conf/kiss/notification.xml b/crawler/kiss/conf/kiss/notification.xml deleted file mode 100644 index 29148da6..00000000 --- a/crawler/kiss/conf/kiss/notification.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - falcon - 25 - - - - - - - - - - - - - kiss@brakkee.org - erik@brakkee.org - Recording summary for today - reportToHtml.xsl - reportToText.xsl - - - - \ No newline at end of file diff --git a/crawler/kiss/conf/kiss/programs.xml b/crawler/kiss/conf/kiss/programs.xml index ac87857b..6236688c 100644 --- a/crawler/kiss/conf/kiss/programs.xml +++ b/crawler/kiss/conf/kiss/programs.xml @@ -1,19 +1,5 @@ - - kiss@brakkee.org - erik@brakkee.org - Recording summary for today - - falcon - 25 - - - reportToHtml.xsl - reportToText.xsl - - - horror notify diff --git a/crawler/kiss/conf/kiss/run.sh b/crawler/kiss/conf/kiss/run.sh index f04c0742..e6280b4b 100755 --- a/crawler/kiss/conf/kiss/run.sh +++ b/crawler/kiss/conf/kiss/run.sh @@ -2,7 +2,7 @@ cd $( dirname $0 )/../conf -CP="" +CP="." for i in ../lib/*.jar do CP="$i:$CP" diff --git a/crawler/kiss/docs/content/xdocs/index.xml b/crawler/kiss/docs/content/xdocs/index.xml index d2cc2149..18b1d616 100644 --- a/crawler/kiss/docs/content/xdocs/index.xml +++ b/crawler/kiss/docs/content/xdocs/index.xml @@ -74,9 +74,17 @@ Configuring the crawler

- The crawler comes with two configuration files, namely - crawler.xml and programs.xml. + The crawler comes with three configuration files:

+
    +
  • crawler.xml: basic crawler configuration + tailored to the KiSS electronic programme guide.
    • +
  • programs.xml: containing a description of which + programs must be recorded and which programs are interesting.
    • +
  • org.wamblee.crawler.properties: Containing a configuration of + how to notify users of results.
    • +
+
Crawler configuration <code>crawler.xml</code> @@ -89,33 +97,7 @@ Programme Guide.

- -
- Program configuration: <code>programs.xml</code> - -

- The programs.xml file contains the following - configuration items: -

-
    -
  • Notification configuration: Describing how to - do notification of the results of crawling the site.
    • -
  • Zero or more configurations of interesting programs.
    • -
-
- Notification configuration -

- Notification is configured in the (surprise, surprise!) - notification element. This notification element - is used to configure respectively sender mail address (= reply - address), recipient address, subject of the email, smtp server - host and port and optional username and password. - In addition it contains the names of the stylesheets to - generate the HTML and Text reports. These stylesheets - should not be changed. -

-
- +
Program configuration

@@ -204,11 +186,19 @@

- - + +
+ Notification configuration +

+ Edit the configuration file org.wamblee.crawler.properties. + The properties file is self-explanatory. +

+ + +
Installing and running the crawler diff --git a/crawler/kiss/src/crawler-standalone.xml b/crawler/kiss/src/crawler-standalone.xml index e19c9248..860240bb 100644 --- a/crawler/kiss/src/crawler-standalone.xml +++ b/crawler/kiss/src/crawler-standalone.xml @@ -7,7 +7,8 @@ class="org.springframework.context.support.ClassPathXmlApplicationContext"> - file:notification.xml + org.wamblee.crawler.properties.xml + org.wamblee.crawler.notification.xml diff --git a/crawler/kissweb/src/org.wamblee.crawler.notification.xml b/crawler/kiss/src/org.wamblee.crawler.notification.xml similarity index 62% rename from crawler/kissweb/src/org.wamblee.crawler.notification.xml rename to crawler/kiss/src/org.wamblee.crawler.notification.xml index 29148da6..3b8d58a3 100644 --- a/crawler/kissweb/src/org.wamblee.crawler.notification.xml +++ b/crawler/kiss/src/org.wamblee.crawler.notification.xml @@ -6,10 +6,10 @@ - falcon - 25 - - + ${org.wamblee.crawler.smtp.host} + ${org.wamblee.crawler.smtp.port} + ${org.wamblee.crawler.smtp.username} + ${org.wamblee.crawler.smtp.password} - kiss@brakkee.org - erik@brakkee.org - Recording summary for today + ${org.wamblee.crawler.notification.from} + ${org.wamblee.crawler.notification.to} + ${org.wamblee.crawler.notification.subject} reportToHtml.xsl reportToText.xsl diff --git a/crawler/kissweb/src/beanRefContext.xml b/crawler/kissweb/src/beanRefContext.xml index f1a89bd4..2e139dbc 100644 --- a/crawler/kissweb/src/beanRefContext.xml +++ b/crawler/kissweb/src/beanRefContext.xml @@ -7,6 +7,7 @@ class="org.springframework.context.support.ClassPathXmlApplicationContext"> + org.wamblee.crawler.properties.xml org.wamblee.crawler.notification.xml org.wamblee.crawler.kiss.xml -- 2.31.1