From b06adf8c8248a4d677faba42fa1cfdb790ddfde7 Mon Sep 17 00:00:00 2001
From: Erik Brakkee <erik@brakkee.org>
Date: Sat, 1 Apr 2006 18:37:46 +0000
Subject: [PATCH] library names now start with wamblee- to make them unique.
---
build/header.xml | 6 +++---
crawler/basic/build.xml | 2 +-
crawler/kiss/build.xml | 2 +-
crawler/kiss/conf/kiss/programs.xml | 4 ++++
.../crawler/kiss/main/ProgramConfigurationParser.java | 3 +--
.../org/wamblee/crawler/kiss/notification/MailServer.java | 2 +-
socketproxy/build.xml | 2 +-
support/build.xml | 2 +-
8 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/build/header.xml b/build/header.xml
index fed9d8d7..930517a6 100644
--- 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 ac44f846..01ecc7bd 100644
--- 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 f7b685a8..846fd7c1 100644
--- 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 aa0664c2..a53c1226 100644
--- 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 c5fd5602..2e22f351 100644
--- 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 d397594c..917f6287 100644
--- 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 ec298d33..bc35c931 100644
--- 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 7be2e619..856ce1dc 100644
--- 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;
--
2.31.1