restructuring into packages.

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/AbstractVisitor.java b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/AbstractVisitor.java
similarity index 97%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/AbstractVisitor.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/guide/AbstractVisitor.java
index c63487e173f4740b941c483e930580bc2aede58d..4b27e4f1db2e23b3213a16470f9f64d63fd41d24 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/AbstractVisitor.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/AbstractVisitor.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */ 
 
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.guide;
 
 import java.util.List;
 
+
 /**
  * Abstract visitor of the tv guide with default looping behavior. 
  */

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/Channel.java b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/Channel.java
similarity index 97%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/Channel.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/guide/Channel.java
index a59ed08d109c30794f5ad182c1e71895d2871789..3a0d5800effccd685cd40e56beee4de262d3bc17 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/Channel.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/Channel.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.guide;
 
 import java.util.Collections;
 import java.util.List;
 
+
 /**
  * Represents the programme for a tv channel.
  */

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/MatchVisitor.java b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/MatchVisitor.java
similarity index 97%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/MatchVisitor.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/guide/MatchVisitor.java
index 031c48ad6b77c7c570eb5284cc397a5424f364da..e8138ed821c7a824038206c200c93f88dd9671bb 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/MatchVisitor.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/MatchVisitor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.guide;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/PrintVisitor.java b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/PrintVisitor.java
similarity index 97%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/PrintVisitor.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/guide/PrintVisitor.java
index 0764426bd7cdcebe6e08df531fba6128b571b89d..ea1c3c22cf51346cd60eb6803b913afb03b4b010 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/PrintVisitor.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/PrintVisitor.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */ 
 
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.guide;
 
 import java.io.PrintStream;
 
+
 /**
  * Print visitor for pretty printing the TV guide. 
  */

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/Program.java b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/Program.java
similarity index 98%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/Program.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/guide/Program.java
index c80fea246badc9c8cfe19c2e9b0addb78e1ea392..6b1656478dd9ded48d8259f64d971406f76fa1cd 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/Program.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/Program.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.guide;
 
 import java.util.Comparator;
 
@@ -25,6 +25,7 @@ import org.dom4j.Element;
 import org.wamblee.crawler.Action;
 import org.wamblee.crawler.Page;
 import org.wamblee.crawler.PageException;
+import org.wamblee.crawler.kiss.main.SystemProperties;
 
 /**
  * Represents a television program.

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/TVGuide.java b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/TVGuide.java
similarity index 97%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/TVGuide.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/guide/TVGuide.java
index 319380a419b6615c1fe518e9851eaace5de64319..d21a47ea035de94ffa66ca741b2740a8c2c955bc 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/TVGuide.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/TVGuide.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */ 
 
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.guide;
 
 import java.util.Collections;
 import java.util.List;
 
+
 /**
  * The TV guide. 
  */

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/Time.java b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/Time.java
similarity index 98%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/Time.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/guide/Time.java
index 16cae4f08d176ef3628dbf20299b9a65c7757825..de1065cf2f3ed024a68734b51fa6267a6b1d6f03 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/Time.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/Time.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.guide;
 
 import java.text.DecimalFormat;
 import java.text.NumberFormat;

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/TimeInterval.java b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/TimeInterval.java
similarity index 98%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/TimeInterval.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/guide/TimeInterval.java
index d56e54e17cb65ebcf374494a2c676acb1a3268de..a22a3e7967d354915d9e963793ee38377abeda60 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/TimeInterval.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/TimeInterval.java
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.guide;
+
 
 /**
  * Time interval. 

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/Visitor.java b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/Visitor.java
similarity index 96%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/Visitor.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/guide/Visitor.java
index d20a91258790daf8f2a5ab68a71b16180d86ce0e..526626cca469eaa30ffdd8f6e2fcc29d7218d4a9 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/Visitor.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/guide/Visitor.java
@@ -14,7 +14,8 @@
  * limitations under the License.
  */ 
 
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.guide;
+
 
 /**
  * Visitor of the TV guide. 

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/InterestingProgramAction.java b/crawler/kiss/src/org/wamblee/crawler/kiss/main/InterestingProgramAction.java
similarity index 94%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/InterestingProgramAction.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/main/InterestingProgramAction.java
index 015694b2426c08e614d79021ea1d68c61066da89..2ce30de2520620431079202237a8be10deabd65b 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/InterestingProgramAction.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/main/InterestingProgramAction.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.main;
+
+import org.wamblee.crawler.kiss.guide.Program;
 
 /**
  * Represents an action to execute for an interesting program.

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/KissCrawler.java b/crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java
similarity index 96%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/KissCrawler.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java
index 6e705315ef77e459bd7c74bb600d7871658ae1d8..6cdaa17a55da35f9aec05a0794cb03c5e63441c5 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/KissCrawler.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.main;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -52,6 +52,14 @@ import org.wamblee.crawler.Page;
 import org.wamblee.crawler.PageException;
 import org.wamblee.crawler.impl.ConfigurationParser;
 import org.wamblee.crawler.impl.CrawlerImpl;
+import org.wamblee.crawler.kiss.guide.Channel;
+import org.wamblee.crawler.kiss.guide.PrintVisitor;
+import org.wamblee.crawler.kiss.guide.Program;
+import org.wamblee.crawler.kiss.guide.TVGuide;
+import org.wamblee.crawler.kiss.guide.Time;
+import org.wamblee.crawler.kiss.guide.TimeInterval;
+import org.wamblee.crawler.kiss.notification.NotificationException;
+import org.wamblee.crawler.kiss.notification.Notifier;
 import org.wamblee.io.FileResource;
 import org.wamblee.xml.XSLT;
 

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/ProgramAction.java b/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramAction.java
similarity index 91%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/ProgramAction.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramAction.java
index e7395b58e9d1b2180c46cc643690ae69b70a273c..d67c26d13eba6c501dc2c24f495129d96bff0a81 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/ProgramAction.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramAction.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */ 
 
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.main;
+
+import org.wamblee.crawler.kiss.guide.Program;
 
 /**
  * Represents an action configured for a program.  

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/ProgramActionExecutor.java b/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramActionExecutor.java
similarity index 97%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/ProgramActionExecutor.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramActionExecutor.java
index 87d417bee644f0fe5d425603473694f9ae0a8448..3ef511cffe4ce9c8b36c445d163e12c57dd7886e 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/ProgramActionExecutor.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramActionExecutor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */ 
 
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.main;
 
 import java.util.EnumMap;
 import java.util.Map;
@@ -24,7 +24,8 @@ import java.util.TreeSet;
 
 import org.dom4j.DocumentFactory;
 import org.dom4j.Element;
-import org.wamblee.crawler.kiss.Program.RecordingResult;
+import org.wamblee.crawler.kiss.guide.Program;
+import org.wamblee.crawler.kiss.guide.Program.RecordingResult;
 
 /**
  * Provides execution of actions for programs. Actions use

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/ProgramConfigurationParser.java b/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramConfigurationParser.java
similarity index 96%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/ProgramConfigurationParser.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramConfigurationParser.java
index 3237ca79a449d140001b072d95fa266781fa644b..24d7d9b3f93dda8f1e933e08f7dc01c1d925190d 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/ProgramConfigurationParser.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramConfigurationParser.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.main;
 
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -29,6 +29,10 @@ import org.dom4j.io.SAXReader;
 import org.wamblee.conditions.AndCondition;
 import org.wamblee.conditions.Condition;
 import org.wamblee.conditions.PropertyRegexCondition;
+import org.wamblee.crawler.kiss.guide.Program;
+import org.wamblee.crawler.kiss.notification.MailNotifier;
+import org.wamblee.crawler.kiss.notification.MailServer;
+import org.wamblee.crawler.kiss.notification.Notifier;
 
 /**
  * Parse the configuration of desired programs.

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/ProgramFilter.java b/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramFilter.java
similarity index 87%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/ProgramFilter.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramFilter.java
index 5f66e0bd49c64382bf9d0cacda6381bd00e6778a..397cfe9c54a3aab3abed61adb80105264d93f881 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/ProgramFilter.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramFilter.java
@@ -14,11 +14,14 @@
  * limitations under the License.
  */ 
 
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.main;
 
 import java.util.List;
 
 import org.wamblee.conditions.Condition;
+import org.wamblee.crawler.kiss.guide.MatchVisitor;
+import org.wamblee.crawler.kiss.guide.Program;
+import org.wamblee.crawler.kiss.guide.TVGuide;
 
 
 /**

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/RecordProgramAction.java b/crawler/kiss/src/org/wamblee/crawler/kiss/main/RecordProgramAction.java
similarity index 93%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/RecordProgramAction.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/main/RecordProgramAction.java
index 1a0d6cc6d559c34152b2724ff0b330ec9e48ba16..00367934d19ea4293eb05e3c7b00dc665022edb6 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/RecordProgramAction.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/main/RecordProgramAction.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */ 
 
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.main;
+
+import org.wamblee.crawler.kiss.guide.Program;
 
 
 /**

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/SystemProperties.java b/crawler/kiss/src/org/wamblee/crawler/kiss/main/SystemProperties.java
similarity index 97%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/SystemProperties.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/main/SystemProperties.java
index 20af2a93a4e628f768dc843e3d0273b612ed6aa9..4153eb7e00acbf4a3afb55a4fb2b032b2f6c7bac 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/SystemProperties.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/main/SystemProperties.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */ 
 
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.main;
 
 /**
  * Access to system properties for the crawler.  

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/MailNotifier.java b/crawler/kiss/src/org/wamblee/crawler/kiss/notification/MailNotifier.java
similarity index 98%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/MailNotifier.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/notification/MailNotifier.java
index ab0c5469b5bdbf67af0bcbc9dc57b8b8ca8ca298..1c970a7151f11f1260583a873636299b3397ab5b 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/MailNotifier.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/notification/MailNotifier.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2005 UPS_SCS NL
  *  
  */
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.notification;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/MailServer.java b/crawler/kiss/src/org/wamblee/crawler/kiss/notification/MailServer.java
similarity index 97%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/MailServer.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/notification/MailServer.java
index 768d6e7a8e98d4f45085664183a55bf93840383f..1fe66dde36b45438e3de41a94c6b90490d126da7 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/MailServer.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/notification/MailServer.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2005 UPS_SCS NL
  *  
  */
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.notification;
 
 import java.util.Properties;
 

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/NotificationException.java b/crawler/kiss/src/org/wamblee/crawler/kiss/notification/NotificationException.java
similarity index 92%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/NotificationException.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/notification/NotificationException.java
index cce6b0f24aeb06b1be35aefeab36cc04fe36055b..63989d56fc9f86ab2b8118af2905eb8b33d240a8 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/NotificationException.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/notification/NotificationException.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2005 UPS_SCS NL
  *  
  */
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.notification;
 
 /**
  * Notification exception thrown in case of problems sending 

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/Notifier.java b/crawler/kiss/src/org/wamblee/crawler/kiss/notification/Notifier.java
similarity index 87%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/Notifier.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/notification/Notifier.java
index 96dc09e250b55b62fce6448b9f1250668b904fe6..2befac736ecbf6e947765268080b140f2d2f04a1 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/Notifier.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/notification/Notifier.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2005 UPS_SCS NL
  *  
  */
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.notification;
 
 import org.dom4j.Element;
 

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/UsernamePasswordAuthenticator.java b/crawler/kiss/src/org/wamblee/crawler/kiss/notification/UsernamePasswordAuthenticator.java
similarity index 95%
rename from crawler/kiss/src/org/wamblee/crawler/kiss/UsernamePasswordAuthenticator.java
rename to crawler/kiss/src/org/wamblee/crawler/kiss/notification/UsernamePasswordAuthenticator.java
index b3d295463c6fd5dd3c817d42a83463d74a522296..88112b4e2bafc3d8190d9851c5e51fd10d5715bf 100644 (file)
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/UsernamePasswordAuthenticator.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/notification/UsernamePasswordAuthenticator.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2005 UPS_SCS NL
  *  
  */
-package org.wamblee.crawler.kiss;
+package org.wamblee.crawler.kiss.notification;
 
 import javax.mail.Authenticator;
 import javax.mail.PasswordAuthentication;