library names now start with wamblee- to make them unique.

diff --git a/build/header.xml b/build/header.xml
index fed9d8d7619a2b938168f22b5128f0e5a2594d7c..930517a64762688e5e36f92f836a8e5351519345 100644 (file)
--- a/build/header.xml
+++ b/build/header.xml
@@ -11,7 +11,7 @@
 
 <property name="project.home" value=".."/>
 <property name="build.dir" value="${project.home}/build"/>
-<property name="lib.dir" value="${project.home}/lib/wamblee"/>
+<property name="lib.dir" value="${project.home}/lib"/>
 
 <target name="download.dep">
   <if>
@@ -188,7 +188,7 @@
   </antcall>
 </target>
 
-<property name="support.dist.dir" value="${lib.dir}/support"/>
+<property name="support.dist.dir" value="${lib.dir}/wamblee/support"/>
 <target name="wamblee.support.d">
   <copy todir="${download.dir}">
     <fileset dir="${support.dist.dir}">
@@ -204,7 +204,7 @@
   </copy>
 </target>
 
-<property name="crawler.dist.dir" value="${lib.dir}/crawler/basic"/>
+<property name="crawler.dist.dir" value="${lib.dir}/wamblee/crawler/basic"/>
 <target name="wamblee.crawler.d">
   <copy todir="${download.dir}">
     <fileset dir="${crawler.dist.dir}">

diff --git a/crawler/basic/build.xml b/crawler/basic/build.xml
index ac44f8462ae2994806138ebebcab2f327c433a23..01ecc7bd677d6da6374064f457ead9d6d581d8e2 100644 (file)
--- a/crawler/basic/build.xml
+++ b/crawler/basic/build.xml
@@ -12,7 +12,7 @@
        <!-- Include the build header defining general properties                            -->
        <!-- =============================================================================== -->
     <property name="project.home" value="../.."/>
-    <property name="module.name" value="crawler-basic" />
+    <property name="module.name" value="wamblee-crawler-basic" />
 
    &header;
        

diff --git a/crawler/kiss/build.xml b/crawler/kiss/build.xml
index f7b685a8fa9dea61d462148d53e8cc2f85522baa..846fd7c1b9217c3869f1bc780902064283a25471 100644 (file)
--- a/crawler/kiss/build.xml
+++ b/crawler/kiss/build.xml
@@ -12,7 +12,7 @@
        <!-- Include the build header defining general properties                            -->
        <!-- =============================================================================== -->
     <property name="project.home" value="../.."/>
-    <property name="module.name" value="crawler-kiss" />
+    <property name="module.name" value="wamblee-crawler-kiss" />
 
    &header;
        

diff --git a/crawler/kiss/conf/kiss/programs.xml b/crawler/kiss/conf/kiss/programs.xml
index aa0664c27fb6ba3530aea0931db7d8d701a23d1d..a53c1226aa502796e5fca935e94b062ee494ba6d 100644 (file)
--- a/crawler/kiss/conf/kiss/programs.xml
+++ b/crawler/kiss/conf/kiss/programs.xml
@@ -73,6 +73,10 @@
     <priority>9</priority>
     <match>buffy.*vampire.*slayer</match>
   </program>
+
+  <program>
+    <match>de.*wereld.*draait.*door</match>
+  </program>
   
   <program>
     <priority>8</priority>

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramConfigurationParser.java b/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramConfigurationParser.java
index c5fd56023e4fd971f3c7285b888493ad8214d89a..2e22f351baca0ac126d5f5afbf288f54c956fa01 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramConfigurationParser.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramConfigurationParser.java
@@ -197,8 +197,7 @@ class ProgramConfigurationParser {
         String username = aSmtp.elementTextTrim(ELEM_USERNAME);
         String password = aSmtp.elementTextTrim(ELEM_PASSWORD);
 
-        MailServer server = new MailServer(host, port, username, password);
-        return server;
+        return new MailServer(host, port, username, password);
     }
 
     /**

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/notification/MailServer.java b/crawler/kiss/src/org/wamblee/crawler/kiss/notification/MailServer.java
index d397594c3343a37371c8fdf3c11b6d7eae82021c..917f6287b14c8a238afc5463efae33f0f3a68054 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/notification/MailServer.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/notification/MailServer.java
@@ -25,7 +25,7 @@ public class MailServer {
     private String _password;
 
     /**
-     * Constructs the mail server interface.
+     * Constructs the mail server.
      * 
      * @param aHost
      *            Host name of the SMTP server.

diff --git a/socketproxy/build.xml b/socketproxy/build.xml
index ec298d336f848f8fe40097b48f1b35dd4221dc9c..bc35c931502474335548364d1aa789c9fac729db 100644 (file)
--- a/socketproxy/build.xml
+++ b/socketproxy/build.xml
@@ -12,7 +12,7 @@
        <!-- Include the build header defining general properties                            -->
        <!-- =============================================================================== -->
     <property name="project.home" value=".."/>
-    <property name="module.name" value="socketproxy" />
+    <property name="module.name" value="wamblee-socketproxy" />
 
    &header;
        

diff --git a/support/build.xml b/support/build.xml
index 7be2e619c8e36314f1b4e0804c2f8822e34abbba..856ce1dcea0d5698c600897eb4079dfdef46f4c0 100644 (file)
--- a/support/build.xml
+++ b/support/build.xml
@@ -12,7 +12,7 @@
        <!-- Include the build header defining general properties                            -->
        <!-- =============================================================================== -->
     <property name="project.home" value=".."/>
-    <property name="module.name" value="support" />
+    <property name="module.name" value="wamblee-support" />
 
    &header;