(no commit message)

diff --git a/.classpath b/.classpath
index 212157082d6932411e71d8e393d935c6c29a0a69..8c50115a6b0492e35b444cd294edcdd5a55fd015 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry output="crawler/basic/build/bin" kind="src" path="crawler/basic/src"/>
-       <classpathentry output="crawler/basic/build/testbin" kind="src" path="crawler/basic/test"/>
-       <classpathentry output="crawler/kiss/build/bin" kind="src" path="crawler/kiss/src"/>
-       <classpathentry output="support/build/bin" kind="src" path="support/src"/>
-       <classpathentry output="support/build/testbin" kind="src" path="support/test"/>
+       <classpathentry output="crawler/kissweb/WebRoot/WEB-INF/classes" kind="src" path="crawler/basic/src"/>
+       <classpathentry output="crawler/kissweb/WebRoot/WEB-INF/classes" kind="src" path="crawler/kissweb/test"/>
+       <classpathentry output="crawler/kissweb/WebRoot/WEB-INF/classes" kind="src" path="crawler/kissweb/src"/>
+       <classpathentry output="crawler/kissweb/WebRoot/WEB-INF/classes" kind="src" path="crawler/basic/test"/>
+       <classpathentry output="crawler/kissweb/WebRoot/WEB-INF/classes" kind="src" path="crawler/kiss/src"/>
+       <classpathentry output="crawler/kissweb/WebRoot/WEB-INF/classes" kind="src" path="support/src"/>
+       <classpathentry output="crawler/kissweb/WebRoot/WEB-INF/classes" kind="src" path="support/test"/>
        <classpathentry kind="lib" path="crawler/basic/lib/external/jtidy-4aug2000r7-dev.jar"/>
        <classpathentry kind="lib" path="crawler/basic/lib/test/dbunit-2.1.jar"/>
        <classpathentry kind="lib" path="crawler/basic/lib/test/jmock-1.0.1.jar"/>
@@ -17,7 +19,6 @@
        <classpathentry kind="lib" path="support/lib/external/dom4j-1.6.jar"/>
        <classpathentry kind="lib" path="support/lib/external/ehcache-1.1.jar"/>
        <classpathentry kind="lib" path="support/lib/external/log4j-1.2.9.jar"/>
-       <classpathentry sourcepath="/usr/java/spring-framework-1.2.5/src" kind="lib" path="support/lib/external/spring-1.2.5.jar"/>
        <classpathentry kind="lib" path="support/lib/test/antlr-2.7.5H3.jar"/>
        <classpathentry kind="lib" path="support/lib/test/asm.jar"/>
        <classpathentry kind="lib" path="support/lib/test/asm-attrs.jar"/>
@@ -41,5 +42,24 @@
        <classpathentry kind="lib" path="support/lib/external/commons-logging-1.0.2.jar"/>
        <classpathentry kind="lib" path="support/lib/external/jaxen-1.1-beta-4.jar"/>
        <classpathentry kind="lib" path="support/lib/external/commons-collections-3.1.jar"/>
-       <classpathentry kind="output" path="support/testbin"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/activation.jar"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/commons-beanutils-1.7.0.jar"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/commons-codec-1.3.jar"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/commons-email-1.0.jar"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/commons-httpclient-3.0.jar"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/commons-logging-1.0.2.jar"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/dom4j-1.6.jar"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/jaxen-1.1-beta-4.jar"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/jtidy-4aug2000r7-dev.jar"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/log4j-1.2.9.jar"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/mail.jar"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/wamblee-crawler-basic.jar"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/wamblee-support.jar"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/xerces-2.4.0.jar"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/servletapi-2.4.jar"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/quartz-1.5.2.jar"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/wamblee-crawler-kiss.jar"/>
+       <classpathentry kind="lib" path="support/lib/external/spring-1.2.5.jar"/>
+       <classpathentry kind="lib" path="crawler/kissweb/WebRoot/WEB-INF/lib/spring-1.2.5.jar"/>
+       <classpathentry kind="output" path="crawler/kissweb/WebRoot/WEB-INF/classes"/>
 </classpath>

diff --git a/.project b/.project
index 22e7562d2380737ce968a1e6b1b975321160b382..42411d06e6b745e55d7bda0d2c81ae1c3589ba3f 100644 (file)
--- a/.project
+++ b/.project
@@ -5,13 +5,45 @@
        <projects>
        </projects>
        <buildSpec>
+               <buildCommand>
+                       <name>com.genuitec.eclipse.j2eedt.core.WebClasspathBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
                <buildCommand>
                        <name>org.eclipse.jdt.core.javabuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
+               <buildCommand>
+                       <name>com.genuitec.eclipse.j2eedt.core.J2EEProjectValidator</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>com.genuitec.eclipse.j2eedt.core.DeploymentDescriptorValidator</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>com.ibm.etools.validation.validationbuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>com.ibm.sse.model.structuredbuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
        </buildSpec>
        <natures>
+               <nature>com.genuitec.eclipse.ast.deploy.core.deploymentnature</nature>
+               <nature>com.genuitec.eclipse.j2eedt.core.webnature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
        </natures>
 </projectDescription>

diff --git a/crawler/basic/build.xml b/crawler/basic/build.xml
index 01ecc7bd677d6da6374064f457ead9d6d581d8e2..99c57682d303f1ff7a0065bfcd1cb8d5f23671eb 100644 (file)
--- a/crawler/basic/build.xml
+++ b/crawler/basic/build.xml
@@ -3,6 +3,7 @@
 <!DOCTYPE project [
     <!ENTITY header SYSTEM "file:../../build/header.xml">
     <!ENTITY trailer SYSTEM "file:../../build/trailer.xml">
+       <!ENTITY deps SYSTEM "file:deps.xml">
 ]>
 
 <project name="crawler" default="jar" basedir=".">
@@ -15,15 +16,16 @@
     <property name="module.name" value="wamblee-crawler-basic" />
 
    &header;
+   &deps;
        
        <target name="module.build.deps" 
-         depends="logging.d,dom4j.d,xerces.d,httpclient.d,jtidy.d,wamblee.support.d">
+         depends="crawler.src.d">
        </target>
        
        <!-- Set libraries to use in addition for test, a library which 
                             is already mentioned in module.build.path should not be 
                             mentioned below again --> 
-       <target name="module.test.deps" depends="wamblee.support.test.d">
+       <target name="module.test.deps" depends="crawler.test.d">
        </target>
                        
   &trailer; 

diff --git a/crawler/build.xml b/crawler/build.xml
index 1bb0c5624a13636b33d735c869cb3ad43013d433..f9f17765dd9b3e82de543fcfdd7c6894c1289764 100644 (file)
--- a/crawler/build.xml
+++ b/crawler/build.xml
@@ -10,7 +10,7 @@
 
     &header;
     
-    <property name="projects" value="basic,kiss"/>
+    <property name="projects" value="basic,kiss,kissweb"/>
     
     &delegator;
 

diff --git a/crawler/kiss/build.xml b/crawler/kiss/build.xml
index 59ba0ab0d45bb09077f5c61e83538640c8c861bb..2223c428ea498aa09ec64d819f7ff1effd987319 100644 (file)
--- a/crawler/kiss/build.xml
+++ b/crawler/kiss/build.xml
@@ -3,6 +3,8 @@
 <!DOCTYPE project [
     <!ENTITY header SYSTEM "file:../../build/header.xml">
     <!ENTITY trailer SYSTEM "file:../../build/trailer.xml">
+       <!ENTITY crawlerdeps SYSTEM "file:../basic/deps.xml">
+       <!ENTITY deps SYSTEM "file:deps.xml">
 ]>
 
 <project name="crawler" default="jar" basedir=".">
@@ -15,15 +17,17 @@
     <property name="module.name" value="wamblee-crawler-kiss" />
 
    &header;
+   &crawlerdeps;
+   &deps;
        
        <target name="module.build.deps" 
-         depends="logging.d,mail.d,commons-email.d,commons-beanutils.d,commons-codec.d,dom4j.d,xerces.d,httpclient.d,jtidy.d,wamblee.support.d,wamblee.crawler.d">
+         depends="kisscrawler.src.d">
        </target>
        
        <!-- Set libraries to use in addition for test, a library which 
                             is already mentioned in module.build.path should not be 
                             mentioned below again --> 
-       <target name="module.test.deps" depends="wamblee.support.test.d,wamblee.crawler.test.d">
+       <target name="module.test.deps" depends="kisscrawler.test.d">
        </target>
        
        <property name="post-dist-lite" value="yes"/>

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java b/crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java
index 735593109c20992c77c09106ec6f9ac38be02ed6..976d7d15de9382361f0cfe3118c1838d5cc9cfb9 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java
@@ -86,6 +86,26 @@ public class KissCrawler {
         String programConfig = new File(aArgs[1]).getCanonicalPath(); 
         new KissCrawler(START_URL, crawlerConfig, programConfig);
     }
+    
+    /**
+     * Constructs the crawler. This retrieves the TV guide by crawling the KiSS
+     * EPG guide, filters the guide for interesting programs, tries to record
+     * them, and sends a summary mail to the user.
+     * 
+     * @param aCrawlerConfig
+     *            Configuration file for the crawler.
+     * @param aProgramConfig
+     *            Configuration file describing interesting shows.
+     * @throws IOException
+     *             In case of problems reading files.
+     * @throws MessagingException
+     *             In case of problems sending a mail notification.
+     */
+    public KissCrawler(String aCrawlerConfig,
+            String aProgramConfig) throws IOException, NotificationException {
+        this(START_URL, aCrawlerConfig, aProgramConfig);
+    }
+
 
     /**
      * Constructs the crawler. This retrieves the TV guide by crawling the KiSS
@@ -212,7 +232,7 @@ public class KissCrawler {
             }
             return favorites.execute();
         } catch (PageException e) {
-            String msg = "Could not login to electronic programme guide.";
+            String msg = "Could not complete login to electronic programme guide.";
             throw new PageException(msg, e);
         }
     }