From: Erik Brakkee Date: Tue, 21 Mar 2006 18:59:16 +0000 (+0000) Subject: restructuring into packages. X-Git-Tag: wamblee-utils-0.7~1098 X-Git-Url: http://wamblee.org/gitweb/?a=commitdiff_plain;h=d85bc24e068a68a54786fae5dc71573607b3b0cb;p=utils 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 c63487e1..4b27e4f1 100644 --- 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 a59ed08d..3a0d5800 100644 --- 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 031c48ad..e8138ed8 100644 --- 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 0764426b..ea1c3c22 100644 --- 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 c80fea24..6b165647 100644 --- 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 319380a4..d21a47ea 100644 --- 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 16cae4f0..de1065cf 100644 --- 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 d56e54e1..a22a3e79 100644 --- 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 d20a9125..526626cc 100644 --- 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 015694b2..2ce30de2 100644 --- 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 6e705315..6cdaa17a 100644 --- 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 e7395b58..d67c26d1 100644 --- 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 87d417be..3ef511cf 100644 --- 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 3237ca79..24d7d9b3 100644 --- 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 5f66e0bd..397cfe9c 100644 --- 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 1a0d6cc6..00367934 100644 --- 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 20af2a93..4153eb7e 100644 --- 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 ab0c5469..1c970a71 100644 --- 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 768d6e7a..1fe66dde 100644 --- 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 cce6b0f2..63989d56 100644 --- 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 96dc09e2..2befac73 100644 --- 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 b3d29546..88112b4e 100644 --- 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;