From de971c9c7b7dca78ee347d87b2119e3a44d1a709 Mon Sep 17 00:00:00 2001 From: "Eric J. Bowersox" Date: Mon, 19 Nov 2001 02:20:22 +0000 Subject: [PATCH] continued the separation by shifting all the exceptions into their own package (preparatory to establishing some sort of service-based architecture) --- src/com/silverwrist/venice/core/AdminOperations.java | 1 + src/com/silverwrist/venice/core/AdminUserContext.java | 1 + src/com/silverwrist/venice/core/BinaryData.java | 1 + src/com/silverwrist/venice/core/CategoryDescriptor.java | 1 + src/com/silverwrist/venice/core/CommunityContext.java | 3 +++ src/com/silverwrist/venice/core/ConferenceContext.java | 2 ++ src/com/silverwrist/venice/core/Startup.java | 3 ++- src/com/silverwrist/venice/core/TopicContext.java | 2 ++ src/com/silverwrist/venice/core/TopicMessageContext.java | 2 ++ src/com/silverwrist/venice/core/UserContext.java | 3 +++ src/com/silverwrist/venice/core/UserProfile.java | 3 +++ src/com/silverwrist/venice/core/UserSideBoxDescriptor.java | 2 ++ src/com/silverwrist/venice/core/VeniceEngine.java | 4 ++++ .../silverwrist/venice/core/impl/AdminOperationsImpl.java | 1 + .../silverwrist/venice/core/impl/AdminUserContextImpl.java | 1 + src/com/silverwrist/venice/core/impl/AdvertisementImpl.java | 1 + .../venice/core/impl/BackgroundCommunityPurge.java | 4 ++-- .../venice/core/impl/BackgroundConferencePurge.java | 2 +- .../venice/core/impl/CategoryDescriptorImpl.java | 1 + src/com/silverwrist/venice/core/impl/CommunityCoreData.java | 1 + .../venice/core/impl/CommunityUserContextImpl.java | 1 + .../venice/core/impl/ConferenceCommunityContextImpl.java | 1 + .../silverwrist/venice/core/impl/ConferenceCoreData.java | 1 + .../venice/core/impl/ConferenceUserContextImpl.java | 1 + src/com/silverwrist/venice/core/impl/ContactInfoImpl.java | 1 + src/com/silverwrist/venice/core/impl/ImageStore.java | 1 + .../silverwrist/venice/core/impl/PublishedMessageImpl.java | 1 + .../silverwrist/venice/core/impl/SideBoxDescriptorImpl.java | 3 ++- src/com/silverwrist/venice/core/impl/SimpleEmailer.java | 4 ++-- src/com/silverwrist/venice/core/impl/Stashable.java | 2 +- .../venice/core/impl/TopicMessageUserContextImpl.java | 1 + .../silverwrist/venice/core/impl/TopicUserContextImpl.java | 1 + src/com/silverwrist/venice/core/impl/UserContextImpl.java | 1 + src/com/silverwrist/venice/core/impl/UserProfileImpl.java | 1 + src/com/silverwrist/venice/core/impl/VeniceEngineImpl.java | 1 + .../silverwrist/venice/core/internals/CommunityBackend.java | 2 +- .../silverwrist/venice/core/internals/CommunityData.java | 4 ++-- .../venice/core/internals/ConferenceBackend.java | 2 +- .../venice/core/internals/ConferenceCommunityContext.java | 2 +- .../silverwrist/venice/core/internals/ConferenceData.java | 2 +- src/com/silverwrist/venice/core/internals/Emailer.java | 2 +- .../silverwrist/venice/core/internals/EngineBackend.java | 2 +- src/com/silverwrist/venice/core/internals/EnvCommunity.java | 2 +- .../silverwrist/venice/core/internals/EnvCommunityData.java | 2 +- .../silverwrist/venice/core/internals/EnvConference.java | 2 +- .../venice/core/internals/EnvConferenceData.java | 2 +- src/com/silverwrist/venice/core/internals/EnvEngine.java | 2 +- src/com/silverwrist/venice/core/internals/EnvUser.java | 2 +- src/com/silverwrist/venice/core/internals/UserBackend.java | 2 +- src/com/silverwrist/venice/db/DataPool.java | 2 +- src/com/silverwrist/venice/db/PostLinkDecoder.java | 2 +- src/com/silverwrist/venice/db/PostLinkRewriter.java | 2 +- .../silverwrist/venice/{core => except}/AccessError.java | 4 ++-- .../venice/{core => except}/ConfigException.java | 3 +-- .../silverwrist/venice/{core => except}/DataException.java | 4 ++-- .../silverwrist/venice/{core => except}/EmailException.java | 4 ++-- .../venice/{core => except}/InternalStateError.java | 2 +- .../venice/{ => except}/ValidationException.java | 2 +- .../silverwrist/venice/{ => except}/VeniceException.java | 2 +- .../silverwrist/venice/htmlcheck/HTMLCheckerException.java | 6 ++++-- src/com/silverwrist/venice/security/AuditRecord.java | 4 ++-- .../venice/security/PrimordialSecurityMonitor.java | 2 +- src/com/silverwrist/venice/security/SecurityMonitor.java | 2 +- .../silverwrist/venice/security/StaticSecurityMonitor.java | 4 ++-- src/com/silverwrist/venice/servlets/Account.java | 2 +- src/com/silverwrist/venice/servlets/Attachment.java | 1 + src/com/silverwrist/venice/servlets/CommunityAdmin.java | 2 +- src/com/silverwrist/venice/servlets/CommunityFrontEnd.java | 1 + src/com/silverwrist/venice/servlets/CommunityLogo.java | 1 + .../silverwrist/venice/servlets/CommunityOperations.java | 2 +- src/com/silverwrist/venice/servlets/CommunityProfile.java | 1 + src/com/silverwrist/venice/servlets/ConfDisplay.java | 2 +- src/com/silverwrist/venice/servlets/ConfOperations.java | 2 +- src/com/silverwrist/venice/servlets/Find.java | 2 +- src/com/silverwrist/venice/servlets/ImageRetrieve.java | 1 + src/com/silverwrist/venice/servlets/PasswordRecovery.java | 1 + src/com/silverwrist/venice/servlets/PostMessage.java | 2 +- src/com/silverwrist/venice/servlets/PostOperations.java | 2 +- src/com/silverwrist/venice/servlets/PostShortcut.java | 2 +- src/com/silverwrist/venice/servlets/Settings.java | 1 + src/com/silverwrist/venice/servlets/SystemAdmin.java | 2 +- src/com/silverwrist/venice/servlets/Top.java | 1 + src/com/silverwrist/venice/servlets/TopicOperations.java | 2 +- src/com/silverwrist/venice/servlets/UserDisplay.java | 1 + src/com/silverwrist/venice/servlets/UserPhoto.java | 1 + src/com/silverwrist/venice/servlets/Variables.java | 1 + src/com/silverwrist/venice/servlets/VeniceServlet.java | 1 + .../silverwrist/venice/servlets/format/AdminFindUser.java | 2 +- .../venice/servlets/format/AdminModifyUserDialog.java | 2 +- .../silverwrist/venice/servlets/format/CDBaseFormField.java | 2 +- .../venice/servlets/format/CDBaseFormFieldReverse.java | 2 +- .../venice/servlets/format/CDCheckBoxFormField.java | 2 +- .../venice/servlets/format/CDEmailAddressFormField.java | 2 +- .../venice/servlets/format/CDFormCategoryHeader.java | 2 +- src/com/silverwrist/venice/servlets/format/CDFormField.java | 2 +- .../venice/servlets/format/CDIntegerFormField.java | 2 +- .../venice/servlets/format/CDPasswordFormField.java | 2 +- .../silverwrist/venice/servlets/format/CDTextFormField.java | 2 +- .../venice/servlets/format/CDVeniceIDFormField.java | 2 +- .../venice/servlets/format/CommunityCategoryBrowseData.java | 1 + .../venice/servlets/format/CommunityLogoData.java | 1 + .../venice/servlets/format/CommunityMembership.java | 2 +- .../venice/servlets/format/CommunityProfileData.java | 1 + .../venice/servlets/format/ConferenceActivity.java | 1 + .../venice/servlets/format/ConferenceListing.java | 1 + .../venice/servlets/format/ConferenceMembership.java | 2 +- .../venice/servlets/format/ConferenceSequence.java | 1 + .../silverwrist/venice/servlets/format/ContentDialog.java | 2 +- .../venice/servlets/format/CreateCommunityDialog.java | 2 +- .../venice/servlets/format/CreateConferenceDialog.java | 4 +++- .../venice/servlets/format/EditCommunityProfileDialog.java | 2 +- .../venice/servlets/format/EditConferenceDialog.java | 2 +- .../venice/servlets/format/EditGlobalPropertiesDialog.java | 2 +- .../venice/servlets/format/EditProfileDialog.java | 2 +- src/com/silverwrist/venice/servlets/format/FindData.java | 2 +- src/com/silverwrist/venice/servlets/format/Hotlist.java | 1 + .../silverwrist/venice/servlets/format/JoinKeyDialog.java | 2 +- src/com/silverwrist/venice/servlets/format/LoginDialog.java | 2 +- .../venice/servlets/format/ManageConferenceAliases.java | 1 + src/com/silverwrist/venice/servlets/format/ManageTopic.java | 1 + .../silverwrist/venice/servlets/format/MenuCommunity.java | 1 + .../venice/servlets/format/NewAccountDialog.java | 2 +- .../silverwrist/venice/servlets/format/NewTopicForm.java | 2 +- src/com/silverwrist/venice/servlets/format/PostPreview.java | 1 + .../silverwrist/venice/servlets/format/PostSlippage.java | 1 + .../silverwrist/venice/servlets/format/RenderConfig.java | 6 +++--- src/com/silverwrist/venice/servlets/format/RenderData.java | 2 +- .../venice/servlets/format/ReportConferenceMenu.java | 1 + src/com/silverwrist/venice/servlets/format/SideBoxList.java | 1 + .../venice/servlets/format/TextMessageDialog.java | 1 + src/com/silverwrist/venice/servlets/format/TopDisplay.java | 1 + .../silverwrist/venice/servlets/format/TopicListing.java | 1 + src/com/silverwrist/venice/servlets/format/TopicPosts.java | 1 + .../venice/servlets/format/UserCommunityList.java | 1 + .../silverwrist/venice/servlets/format/UserPhotoData.java | 1 + .../venice/servlets/format/VerifyEmailDialog.java | 4 ++-- .../venice/servlets/format/ViewCommunityMembers.java | 2 +- .../silverwrist/venice/servlets/format/menus/ImageItem.java | 2 +- .../silverwrist/venice/servlets/format/menus/LeftMenu.java | 2 +- .../silverwrist/venice/servlets/format/menus/LinkItem.java | 2 +- .../venice/servlets/format/sideboxes/CommunityBox.java | 1 + .../venice/servlets/format/sideboxes/ConferenceBox.java | 1 + .../venice/servlets/format/sideboxes/JSPSideBoxFactory.java | 1 + .../venice/servlets/format/sideboxes/SideBoxFactory.java | 4 +--- 144 files changed, 175 insertions(+), 95 deletions(-) rename src/com/silverwrist/venice/{core => except}/AccessError.java (91%) rename src/com/silverwrist/venice/{core => except}/ConfigException.java (96%) rename src/com/silverwrist/venice/{core => except}/DataException.java (91%) rename src/com/silverwrist/venice/{core => except}/EmailException.java (91%) rename src/com/silverwrist/venice/{core => except}/InternalStateError.java (99%) rename src/com/silverwrist/venice/{ => except}/ValidationException.java (98%) rename src/com/silverwrist/venice/{ => except}/VeniceException.java (99%) diff --git a/src/com/silverwrist/venice/core/AdminOperations.java b/src/com/silverwrist/venice/core/AdminOperations.java index 59982ea..fc769e0 100644 --- a/src/com/silverwrist/venice/core/AdminOperations.java +++ b/src/com/silverwrist/venice/core/AdminOperations.java @@ -18,6 +18,7 @@ package com.silverwrist.venice.core; import java.util.List; +import com.silverwrist.venice.except.DataException; public interface AdminOperations { diff --git a/src/com/silverwrist/venice/core/AdminUserContext.java b/src/com/silverwrist/venice/core/AdminUserContext.java index 0966b27..522f993 100644 --- a/src/com/silverwrist/venice/core/AdminUserContext.java +++ b/src/com/silverwrist/venice/core/AdminUserContext.java @@ -20,6 +20,7 @@ package com.silverwrist.venice.core; import java.util.Date; import java.util.Locale; import java.util.TimeZone; +import com.silverwrist.venice.except.DataException; import com.silverwrist.venice.security.Role; public interface AdminUserContext diff --git a/src/com/silverwrist/venice/core/BinaryData.java b/src/com/silverwrist/venice/core/BinaryData.java index 6486798..c461536 100644 --- a/src/com/silverwrist/venice/core/BinaryData.java +++ b/src/com/silverwrist/venice/core/BinaryData.java @@ -18,6 +18,7 @@ package com.silverwrist.venice.core; import java.io.InputStream; +import com.silverwrist.venice.except.DataException; public interface BinaryData { diff --git a/src/com/silverwrist/venice/core/CategoryDescriptor.java b/src/com/silverwrist/venice/core/CategoryDescriptor.java index c21c1ec..34aa672 100644 --- a/src/com/silverwrist/venice/core/CategoryDescriptor.java +++ b/src/com/silverwrist/venice/core/CategoryDescriptor.java @@ -18,6 +18,7 @@ package com.silverwrist.venice.core; import java.util.List; +import com.silverwrist.venice.except.DataException; public interface CategoryDescriptor { diff --git a/src/com/silverwrist/venice/core/CommunityContext.java b/src/com/silverwrist/venice/core/CommunityContext.java index c31aea3..09bc585 100644 --- a/src/com/silverwrist/venice/core/CommunityContext.java +++ b/src/com/silverwrist/venice/core/CommunityContext.java @@ -20,6 +20,9 @@ package com.silverwrist.venice.core; import java.util.BitSet; import java.util.Date; import java.util.List; +import com.silverwrist.venice.except.AccessError; +import com.silverwrist.venice.except.DataException; +import com.silverwrist.venice.except.EmailException; public interface CommunityContext extends SearchMode { diff --git a/src/com/silverwrist/venice/core/ConferenceContext.java b/src/com/silverwrist/venice/core/ConferenceContext.java index 0a7bc86..4dcb6ab 100644 --- a/src/com/silverwrist/venice/core/ConferenceContext.java +++ b/src/com/silverwrist/venice/core/ConferenceContext.java @@ -19,6 +19,8 @@ package com.silverwrist.venice.core; import java.util.Date; import java.util.List; +import com.silverwrist.venice.except.AccessError; +import com.silverwrist.venice.except.DataException; import com.silverwrist.venice.htmlcheck.HTMLChecker; public interface ConferenceContext diff --git a/src/com/silverwrist/venice/core/Startup.java b/src/com/silverwrist/venice/core/Startup.java index f6cacb5..b21d094 100644 --- a/src/com/silverwrist/venice/core/Startup.java +++ b/src/com/silverwrist/venice/core/Startup.java @@ -24,6 +24,7 @@ import org.w3c.dom.*; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import com.silverwrist.util.DOMElementHelper; +import com.silverwrist.venice.except.*; public class Startup { @@ -32,7 +33,7 @@ public class Startup *-------------------------------------------------------------------------------- */ - private static Category logger = Category.getInstance(Startup.class.getName()); + private static Category logger = Category.getInstance(Startup.class); /*-------------------------------------------------------------------------------- * Constructor diff --git a/src/com/silverwrist/venice/core/TopicContext.java b/src/com/silverwrist/venice/core/TopicContext.java index bd1cb80..558efd2 100644 --- a/src/com/silverwrist/venice/core/TopicContext.java +++ b/src/com/silverwrist/venice/core/TopicContext.java @@ -19,6 +19,8 @@ package com.silverwrist.venice.core; import java.util.Date; import java.util.List; +import com.silverwrist.venice.except.AccessError; +import com.silverwrist.venice.except.DataException; import com.silverwrist.venice.htmlcheck.HTMLChecker; public interface TopicContext diff --git a/src/com/silverwrist/venice/core/TopicMessageContext.java b/src/com/silverwrist/venice/core/TopicMessageContext.java index dc34ad3..1469887 100644 --- a/src/com/silverwrist/venice/core/TopicMessageContext.java +++ b/src/com/silverwrist/venice/core/TopicMessageContext.java @@ -19,6 +19,8 @@ package com.silverwrist.venice.core; import java.io.InputStream; import java.util.Date; +import com.silverwrist.venice.except.AccessError; +import com.silverwrist.venice.except.DataException; public interface TopicMessageContext { diff --git a/src/com/silverwrist/venice/core/UserContext.java b/src/com/silverwrist/venice/core/UserContext.java index 8c56ca5..3aeb034 100644 --- a/src/com/silverwrist/venice/core/UserContext.java +++ b/src/com/silverwrist/venice/core/UserContext.java @@ -20,6 +20,9 @@ package com.silverwrist.venice.core; import java.util.List; import java.util.Locale; import java.util.TimeZone; +import com.silverwrist.venice.except.AccessError; +import com.silverwrist.venice.except.DataException; +import com.silverwrist.venice.except.EmailException; public interface UserContext extends SearchMode { diff --git a/src/com/silverwrist/venice/core/UserProfile.java b/src/com/silverwrist/venice/core/UserProfile.java index 6147e57..ad88c6b 100644 --- a/src/com/silverwrist/venice/core/UserProfile.java +++ b/src/com/silverwrist/venice/core/UserProfile.java @@ -18,6 +18,9 @@ package com.silverwrist.venice.core; import java.util.Date; +import com.silverwrist.venice.except.AccessError; +import com.silverwrist.venice.except.DataException; +import com.silverwrist.venice.except.EmailException; public interface UserProfile { diff --git a/src/com/silverwrist/venice/core/UserSideBoxDescriptor.java b/src/com/silverwrist/venice/core/UserSideBoxDescriptor.java index ac4445d..baaa0ac 100644 --- a/src/com/silverwrist/venice/core/UserSideBoxDescriptor.java +++ b/src/com/silverwrist/venice/core/UserSideBoxDescriptor.java @@ -17,6 +17,8 @@ */ package com.silverwrist.venice.core; +import com.silverwrist.venice.except.DataException; + public interface UserSideBoxDescriptor extends SideBoxDescriptor { public abstract void setSequence(int seq) throws DataException; diff --git a/src/com/silverwrist/venice/core/VeniceEngine.java b/src/com/silverwrist/venice/core/VeniceEngine.java index 773ac15..df008ed 100644 --- a/src/com/silverwrist/venice/core/VeniceEngine.java +++ b/src/com/silverwrist/venice/core/VeniceEngine.java @@ -21,6 +21,10 @@ import java.awt.Dimension; import java.util.BitSet; import java.util.List; import org.w3c.dom.Document; +import com.silverwrist.venice.except.AccessError; +import com.silverwrist.venice.except.ConfigException; +import com.silverwrist.venice.except.DataException; +import com.silverwrist.venice.except.EmailException; import com.silverwrist.venice.htmlcheck.HTMLChecker; public interface VeniceEngine extends SearchMode diff --git a/src/com/silverwrist/venice/core/impl/AdminOperationsImpl.java b/src/com/silverwrist/venice/core/impl/AdminOperationsImpl.java index 1e0c379..b08a6e7 100644 --- a/src/com/silverwrist/venice/core/impl/AdminOperationsImpl.java +++ b/src/com/silverwrist/venice/core/impl/AdminOperationsImpl.java @@ -23,6 +23,7 @@ import org.apache.log4j.*; import com.silverwrist.venice.core.*; import com.silverwrist.venice.core.internals.*; import com.silverwrist.venice.db.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.security.AuditRecord; class AdminOperationsImpl implements AdminOperations diff --git a/src/com/silverwrist/venice/core/impl/AdminUserContextImpl.java b/src/com/silverwrist/venice/core/impl/AdminUserContextImpl.java index 450c144..9861f26 100644 --- a/src/com/silverwrist/venice/core/impl/AdminUserContextImpl.java +++ b/src/com/silverwrist/venice/core/impl/AdminUserContextImpl.java @@ -24,6 +24,7 @@ import com.silverwrist.util.International; import com.silverwrist.venice.core.*; import com.silverwrist.venice.core.internals.*; import com.silverwrist.venice.db.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.security.*; class AdminUserContextImpl implements AdminUserContext diff --git a/src/com/silverwrist/venice/core/impl/AdvertisementImpl.java b/src/com/silverwrist/venice/core/impl/AdvertisementImpl.java index 8d93088..b7fb5e9 100644 --- a/src/com/silverwrist/venice/core/impl/AdvertisementImpl.java +++ b/src/com/silverwrist/venice/core/impl/AdvertisementImpl.java @@ -23,6 +23,7 @@ import com.silverwrist.util.cache.CacheMap; import com.silverwrist.venice.core.*; import com.silverwrist.venice.core.internals.EnvEngine; import com.silverwrist.venice.db.*; +import com.silverwrist.venice.except.*; class AdvertisementImpl implements Advertisement { diff --git a/src/com/silverwrist/venice/core/impl/BackgroundCommunityPurge.java b/src/com/silverwrist/venice/core/impl/BackgroundCommunityPurge.java index d2d76df..5a6c6de 100644 --- a/src/com/silverwrist/venice/core/impl/BackgroundCommunityPurge.java +++ b/src/com/silverwrist/venice/core/impl/BackgroundCommunityPurge.java @@ -22,10 +22,10 @@ import java.util.*; import org.apache.log4j.*; import com.silverwrist.util.ParallelRunQueue; import com.silverwrist.util.cache.ObjectCache; -import com.silverwrist.venice.core.DataException; -import com.silverwrist.venice.core.InternalStateError; import com.silverwrist.venice.core.internals.*; import com.silverwrist.venice.db.*; +import com.silverwrist.venice.except.DataException; +import com.silverwrist.venice.except.InternalStateError; class BackgroundCommunityPurge implements Runnable { diff --git a/src/com/silverwrist/venice/core/impl/BackgroundConferencePurge.java b/src/com/silverwrist/venice/core/impl/BackgroundConferencePurge.java index 3b59d0e..73944d6 100644 --- a/src/com/silverwrist/venice/core/impl/BackgroundConferencePurge.java +++ b/src/com/silverwrist/venice/core/impl/BackgroundConferencePurge.java @@ -21,7 +21,7 @@ import java.sql.*; import org.apache.log4j.*; import com.silverwrist.util.ParallelRunQueue; import com.silverwrist.venice.db.*; -import com.silverwrist.venice.core.InternalStateError; +import com.silverwrist.venice.except.InternalStateError; import com.silverwrist.venice.core.internals.*; class BackgroundConferencePurge implements Runnable diff --git a/src/com/silverwrist/venice/core/impl/CategoryDescriptorImpl.java b/src/com/silverwrist/venice/core/impl/CategoryDescriptorImpl.java index d944a4d..b47c0da 100644 --- a/src/com/silverwrist/venice/core/impl/CategoryDescriptorImpl.java +++ b/src/com/silverwrist/venice/core/impl/CategoryDescriptorImpl.java @@ -23,6 +23,7 @@ import org.apache.log4j.*; import com.silverwrist.venice.db.*; import com.silverwrist.venice.core.*; import com.silverwrist.venice.core.internals.EnvEngine; +import com.silverwrist.venice.except.*; class CategoryDescriptorImpl implements CategoryDescriptor, Cloneable { diff --git a/src/com/silverwrist/venice/core/impl/CommunityCoreData.java b/src/com/silverwrist/venice/core/impl/CommunityCoreData.java index 49f979e..423cc3e 100644 --- a/src/com/silverwrist/venice/core/impl/CommunityCoreData.java +++ b/src/com/silverwrist/venice/core/impl/CommunityCoreData.java @@ -26,6 +26,7 @@ import com.silverwrist.util.cache.*; import com.silverwrist.venice.db.*; import com.silverwrist.venice.core.*; import com.silverwrist.venice.core.internals.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.security.AuditRecord; class CommunityCoreData implements CommunityData, CommunityDataBackend diff --git a/src/com/silverwrist/venice/core/impl/CommunityUserContextImpl.java b/src/com/silverwrist/venice/core/impl/CommunityUserContextImpl.java index f0ca9f8..810d5d0 100644 --- a/src/com/silverwrist/venice/core/impl/CommunityUserContextImpl.java +++ b/src/com/silverwrist/venice/core/impl/CommunityUserContextImpl.java @@ -24,6 +24,7 @@ import com.silverwrist.util.*; import com.silverwrist.venice.core.*; import com.silverwrist.venice.core.internals.*; import com.silverwrist.venice.db.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.security.AuditRecord; import com.silverwrist.venice.security.Role; diff --git a/src/com/silverwrist/venice/core/impl/ConferenceCommunityContextImpl.java b/src/com/silverwrist/venice/core/impl/ConferenceCommunityContextImpl.java index 7dc7a86..2acce1b 100644 --- a/src/com/silverwrist/venice/core/impl/ConferenceCommunityContextImpl.java +++ b/src/com/silverwrist/venice/core/impl/ConferenceCommunityContextImpl.java @@ -23,6 +23,7 @@ import org.apache.log4j.*; import com.silverwrist.venice.core.*; import com.silverwrist.venice.core.internals.*; import com.silverwrist.venice.db.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.htmlcheck.*; import com.silverwrist.venice.security.AuditRecord; diff --git a/src/com/silverwrist/venice/core/impl/ConferenceCoreData.java b/src/com/silverwrist/venice/core/impl/ConferenceCoreData.java index 7a58ce1..bce5cb6 100644 --- a/src/com/silverwrist/venice/core/impl/ConferenceCoreData.java +++ b/src/com/silverwrist/venice/core/impl/ConferenceCoreData.java @@ -24,6 +24,7 @@ import com.silverwrist.util.OptionSet; import com.silverwrist.venice.core.*; import com.silverwrist.venice.core.internals.*; import com.silverwrist.venice.db.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.security.AuditRecord; class ConferenceCoreData implements ConferenceData diff --git a/src/com/silverwrist/venice/core/impl/ConferenceUserContextImpl.java b/src/com/silverwrist/venice/core/impl/ConferenceUserContextImpl.java index 48bdc4a..41616bf 100644 --- a/src/com/silverwrist/venice/core/impl/ConferenceUserContextImpl.java +++ b/src/com/silverwrist/venice/core/impl/ConferenceUserContextImpl.java @@ -23,6 +23,7 @@ import org.apache.log4j.*; import com.silverwrist.venice.core.*; import com.silverwrist.venice.core.internals.*; import com.silverwrist.venice.db.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.htmlcheck.*; import com.silverwrist.venice.security.Role; diff --git a/src/com/silverwrist/venice/core/impl/ContactInfoImpl.java b/src/com/silverwrist/venice/core/impl/ContactInfoImpl.java index bb02e1f..309c27d 100644 --- a/src/com/silverwrist/venice/core/impl/ContactInfoImpl.java +++ b/src/com/silverwrist/venice/core/impl/ContactInfoImpl.java @@ -24,6 +24,7 @@ import org.apache.log4j.*; import com.silverwrist.venice.core.*; import com.silverwrist.venice.core.internals.EnvEngine; import com.silverwrist.venice.db.*; +import com.silverwrist.venice.except.*; class ContactInfoImpl implements ContactInfo, Stashable { diff --git a/src/com/silverwrist/venice/core/impl/ImageStore.java b/src/com/silverwrist/venice/core/impl/ImageStore.java index 82c9ee8..e1a6119 100644 --- a/src/com/silverwrist/venice/core/impl/ImageStore.java +++ b/src/com/silverwrist/venice/core/impl/ImageStore.java @@ -25,6 +25,7 @@ import com.silverwrist.util.IOUtil; import com.silverwrist.venice.db.*; import com.silverwrist.venice.core.*; import com.silverwrist.venice.core.internals.EnvEngine; +import com.silverwrist.venice.except.*; class ImageStore implements BinaryData { diff --git a/src/com/silverwrist/venice/core/impl/PublishedMessageImpl.java b/src/com/silverwrist/venice/core/impl/PublishedMessageImpl.java index bac13e6..2174fe8 100644 --- a/src/com/silverwrist/venice/core/impl/PublishedMessageImpl.java +++ b/src/com/silverwrist/venice/core/impl/PublishedMessageImpl.java @@ -25,6 +25,7 @@ import com.silverwrist.util.StringUtil; import com.silverwrist.venice.db.*; import com.silverwrist.venice.core.*; import com.silverwrist.venice.core.internals.EnvEngine; +import com.silverwrist.venice.except.*; class PublishedMessageImpl implements TopicMessageContext { diff --git a/src/com/silverwrist/venice/core/impl/SideBoxDescriptorImpl.java b/src/com/silverwrist/venice/core/impl/SideBoxDescriptorImpl.java index 649ba06..6215464 100644 --- a/src/com/silverwrist/venice/core/impl/SideBoxDescriptorImpl.java +++ b/src/com/silverwrist/venice/core/impl/SideBoxDescriptorImpl.java @@ -20,8 +20,9 @@ package com.silverwrist.venice.core.impl; import java.sql.*; import org.apache.log4j.*; import com.silverwrist.venice.core.*; -import com.silverwrist.venice.db.*; import com.silverwrist.venice.core.internals.*; +import com.silverwrist.venice.db.*; +import com.silverwrist.venice.except.*; class SideBoxDescriptorImpl implements UserSideBoxDescriptor { diff --git a/src/com/silverwrist/venice/core/impl/SimpleEmailer.java b/src/com/silverwrist/venice/core/impl/SimpleEmailer.java index 0706156..7918b4a 100644 --- a/src/com/silverwrist/venice/core/impl/SimpleEmailer.java +++ b/src/com/silverwrist/venice/core/impl/SimpleEmailer.java @@ -20,9 +20,9 @@ package com.silverwrist.venice.core.impl; import java.util.*; import javax.mail.*; import javax.mail.internet.*; -import com.silverwrist.venice.core.EmailException; -import com.silverwrist.venice.core.InternalStateError; import com.silverwrist.venice.core.internals.Emailer; +import com.silverwrist.venice.except.EmailException; +import com.silverwrist.venice.except.InternalStateError; class SimpleEmailer implements Emailer { diff --git a/src/com/silverwrist/venice/core/impl/Stashable.java b/src/com/silverwrist/venice/core/impl/Stashable.java index 006947b..51ed2bb 100644 --- a/src/com/silverwrist/venice/core/impl/Stashable.java +++ b/src/com/silverwrist/venice/core/impl/Stashable.java @@ -19,7 +19,7 @@ package com.silverwrist.venice.core.impl; import java.sql.Connection; import java.sql.SQLException; -import com.silverwrist.venice.core.DataException; +import com.silverwrist.venice.except.DataException; public interface Stashable { diff --git a/src/com/silverwrist/venice/core/impl/TopicMessageUserContextImpl.java b/src/com/silverwrist/venice/core/impl/TopicMessageUserContextImpl.java index c737256..bdaddd6 100644 --- a/src/com/silverwrist/venice/core/impl/TopicMessageUserContextImpl.java +++ b/src/com/silverwrist/venice/core/impl/TopicMessageUserContextImpl.java @@ -27,6 +27,7 @@ import com.silverwrist.util.StringUtil; import com.silverwrist.venice.core.*; import com.silverwrist.venice.core.internals.*; import com.silverwrist.venice.db.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.security.AuditRecord; class TopicMessageUserContextImpl implements TopicMessageContext diff --git a/src/com/silverwrist/venice/core/impl/TopicUserContextImpl.java b/src/com/silverwrist/venice/core/impl/TopicUserContextImpl.java index 352b5ba..720e4de 100644 --- a/src/com/silverwrist/venice/core/impl/TopicUserContextImpl.java +++ b/src/com/silverwrist/venice/core/impl/TopicUserContextImpl.java @@ -23,6 +23,7 @@ import org.apache.log4j.*; import com.silverwrist.venice.core.*; import com.silverwrist.venice.core.internals.*; import com.silverwrist.venice.db.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.htmlcheck.*; import com.silverwrist.venice.security.AuditRecord; diff --git a/src/com/silverwrist/venice/core/impl/UserContextImpl.java b/src/com/silverwrist/venice/core/impl/UserContextImpl.java index 8b81295..8ca704e 100644 --- a/src/com/silverwrist/venice/core/impl/UserContextImpl.java +++ b/src/com/silverwrist/venice/core/impl/UserContextImpl.java @@ -25,6 +25,7 @@ import com.silverwrist.venice.*; import com.silverwrist.venice.core.*; import com.silverwrist.venice.core.internals.*; import com.silverwrist.venice.db.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.security.*; class UserContextImpl implements UserContext, UserBackend diff --git a/src/com/silverwrist/venice/core/impl/UserProfileImpl.java b/src/com/silverwrist/venice/core/impl/UserProfileImpl.java index 1e935d7..42ca437 100644 --- a/src/com/silverwrist/venice/core/impl/UserProfileImpl.java +++ b/src/com/silverwrist/venice/core/impl/UserProfileImpl.java @@ -24,6 +24,7 @@ import com.silverwrist.util.*; import com.silverwrist.venice.core.*; import com.silverwrist.venice.core.internals.*; import com.silverwrist.venice.db.*; +import com.silverwrist.venice.except.*; class UserProfileImpl implements UserProfile { diff --git a/src/com/silverwrist/venice/core/impl/VeniceEngineImpl.java b/src/com/silverwrist/venice/core/impl/VeniceEngineImpl.java index db4ca6d..fb61357 100644 --- a/src/com/silverwrist/venice/core/impl/VeniceEngineImpl.java +++ b/src/com/silverwrist/venice/core/impl/VeniceEngineImpl.java @@ -27,6 +27,7 @@ import com.silverwrist.util.cache.*; import com.silverwrist.venice.core.*; import com.silverwrist.venice.core.internals.*; import com.silverwrist.venice.db.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.htmlcheck.*; import com.silverwrist.venice.htmlcheck.dict.*; import com.silverwrist.venice.htmlcheck.filters.*; diff --git a/src/com/silverwrist/venice/core/internals/CommunityBackend.java b/src/com/silverwrist/venice/core/internals/CommunityBackend.java index c8e67bc..a8dbe66 100644 --- a/src/com/silverwrist/venice/core/internals/CommunityBackend.java +++ b/src/com/silverwrist/venice/core/internals/CommunityBackend.java @@ -17,8 +17,8 @@ */ package com.silverwrist.venice.core.internals; -import com.silverwrist.venice.core.DataException; import com.silverwrist.venice.core.CommunityContext; +import com.silverwrist.venice.except.DataException; public interface CommunityBackend { diff --git a/src/com/silverwrist/venice/core/internals/CommunityData.java b/src/com/silverwrist/venice/core/internals/CommunityData.java index 5de838b..299ecff 100644 --- a/src/com/silverwrist/venice/core/internals/CommunityData.java +++ b/src/com/silverwrist/venice/core/internals/CommunityData.java @@ -20,10 +20,10 @@ package com.silverwrist.venice.core.internals; import java.util.BitSet; import java.util.Date; import java.util.List; -import com.silverwrist.venice.core.AccessError; import com.silverwrist.venice.core.CommunityProperties; import com.silverwrist.venice.core.ContactInfo; -import com.silverwrist.venice.core.DataException; +import com.silverwrist.venice.except.AccessError; +import com.silverwrist.venice.except.DataException; public interface CommunityData { diff --git a/src/com/silverwrist/venice/core/internals/ConferenceBackend.java b/src/com/silverwrist/venice/core/internals/ConferenceBackend.java index 5780c92..1e95865 100644 --- a/src/com/silverwrist/venice/core/internals/ConferenceBackend.java +++ b/src/com/silverwrist/venice/core/internals/ConferenceBackend.java @@ -21,7 +21,7 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.Date; import com.silverwrist.venice.db.PostLinkDecoderContext; -import com.silverwrist.venice.core.DataException; +import com.silverwrist.venice.except.DataException; public interface ConferenceBackend { diff --git a/src/com/silverwrist/venice/core/internals/ConferenceCommunityContext.java b/src/com/silverwrist/venice/core/internals/ConferenceCommunityContext.java index 2d7ec69..80d473b 100644 --- a/src/com/silverwrist/venice/core/internals/ConferenceCommunityContext.java +++ b/src/com/silverwrist/venice/core/internals/ConferenceCommunityContext.java @@ -21,7 +21,7 @@ import java.sql.Connection; import java.util.Date; import java.util.List; import com.silverwrist.venice.core.ConferenceProperties; -import com.silverwrist.venice.core.DataException; +import com.silverwrist.venice.except.DataException; public interface ConferenceCommunityContext { diff --git a/src/com/silverwrist/venice/core/internals/ConferenceData.java b/src/com/silverwrist/venice/core/internals/ConferenceData.java index ca4a66c..d266a24 100644 --- a/src/com/silverwrist/venice/core/internals/ConferenceData.java +++ b/src/com/silverwrist/venice/core/internals/ConferenceData.java @@ -21,7 +21,7 @@ import java.sql.Connection; import java.util.Date; import java.util.List; import com.silverwrist.venice.core.ConferenceProperties; -import com.silverwrist.venice.core.DataException; +import com.silverwrist.venice.except.DataException; public interface ConferenceData { diff --git a/src/com/silverwrist/venice/core/internals/Emailer.java b/src/com/silverwrist/venice/core/internals/Emailer.java index fab1597..f00bf0e 100644 --- a/src/com/silverwrist/venice/core/internals/Emailer.java +++ b/src/com/silverwrist/venice/core/internals/Emailer.java @@ -17,7 +17,7 @@ */ package com.silverwrist.venice.core.internals; -import com.silverwrist.venice.core.EmailException; +import com.silverwrist.venice.except.EmailException; public interface Emailer { diff --git a/src/com/silverwrist/venice/core/internals/EngineBackend.java b/src/com/silverwrist/venice/core/internals/EngineBackend.java index 6cf7923..30b3c66 100644 --- a/src/com/silverwrist/venice/core/internals/EngineBackend.java +++ b/src/com/silverwrist/venice/core/internals/EngineBackend.java @@ -23,11 +23,11 @@ import com.silverwrist.venice.security.AuditRecord; import com.silverwrist.venice.security.Role; import com.silverwrist.venice.security.SecurityMonitor; import com.silverwrist.venice.htmlcheck.HTMLChecker; -import com.silverwrist.venice.core.DataException; import com.silverwrist.venice.core.GlobalProperties; import com.silverwrist.venice.core.SideBoxDescriptor; import com.silverwrist.venice.core.TopicMessageContext; import com.silverwrist.venice.core.VeniceEngine; +import com.silverwrist.venice.except.DataException; public interface EngineBackend { diff --git a/src/com/silverwrist/venice/core/internals/EnvCommunity.java b/src/com/silverwrist/venice/core/internals/EnvCommunity.java index f6a02f6..3677cdb 100644 --- a/src/com/silverwrist/venice/core/internals/EnvCommunity.java +++ b/src/com/silverwrist/venice/core/internals/EnvCommunity.java @@ -17,7 +17,7 @@ */ package com.silverwrist.venice.core.internals; -import com.silverwrist.venice.core.AccessError; +import com.silverwrist.venice.except.AccessError; import com.silverwrist.venice.security.AuditRecord; import com.silverwrist.venice.security.Role; import com.silverwrist.venice.security.SecurityMonitor; diff --git a/src/com/silverwrist/venice/core/internals/EnvCommunityData.java b/src/com/silverwrist/venice/core/internals/EnvCommunityData.java index d1af316..ca2509a 100644 --- a/src/com/silverwrist/venice/core/internals/EnvCommunityData.java +++ b/src/com/silverwrist/venice/core/internals/EnvCommunityData.java @@ -17,7 +17,7 @@ */ package com.silverwrist.venice.core.internals; -import com.silverwrist.venice.core.AccessError; +import com.silverwrist.venice.except.AccessError; import com.silverwrist.venice.security.SecurityMonitor; public class EnvCommunityData extends EnvEngine diff --git a/src/com/silverwrist/venice/core/internals/EnvConference.java b/src/com/silverwrist/venice/core/internals/EnvConference.java index 818e591..aa20410 100644 --- a/src/com/silverwrist/venice/core/internals/EnvConference.java +++ b/src/com/silverwrist/venice/core/internals/EnvConference.java @@ -17,7 +17,7 @@ */ package com.silverwrist.venice.core.internals; -import com.silverwrist.venice.core.AccessError; +import com.silverwrist.venice.except.AccessError; import com.silverwrist.venice.security.SecurityMonitor; public class EnvConference extends EnvCommunity diff --git a/src/com/silverwrist/venice/core/internals/EnvConferenceData.java b/src/com/silverwrist/venice/core/internals/EnvConferenceData.java index e294afa..7b6c936 100644 --- a/src/com/silverwrist/venice/core/internals/EnvConferenceData.java +++ b/src/com/silverwrist/venice/core/internals/EnvConferenceData.java @@ -17,7 +17,7 @@ */ package com.silverwrist.venice.core.internals; -import com.silverwrist.venice.core.AccessError; +import com.silverwrist.venice.except.AccessError; import com.silverwrist.venice.security.SecurityMonitor; public class EnvConferenceData extends EnvEngine diff --git a/src/com/silverwrist/venice/core/internals/EnvEngine.java b/src/com/silverwrist/venice/core/internals/EnvEngine.java index 1105da0..ee4bee0 100644 --- a/src/com/silverwrist/venice/core/internals/EnvEngine.java +++ b/src/com/silverwrist/venice/core/internals/EnvEngine.java @@ -20,9 +20,9 @@ package com.silverwrist.venice.core.internals; import java.sql.Connection; import java.sql.SQLException; import java.util.List; -import com.silverwrist.venice.core.AccessError; import com.silverwrist.venice.core.SecurityInfo; import com.silverwrist.venice.db.*; +import com.silverwrist.venice.except.AccessError; import com.silverwrist.venice.security.*; public class EnvEngine diff --git a/src/com/silverwrist/venice/core/internals/EnvUser.java b/src/com/silverwrist/venice/core/internals/EnvUser.java index 2c2da44..117cd53 100644 --- a/src/com/silverwrist/venice/core/internals/EnvUser.java +++ b/src/com/silverwrist/venice/core/internals/EnvUser.java @@ -18,7 +18,7 @@ package com.silverwrist.venice.core.internals; import org.apache.log4j.*; -import com.silverwrist.venice.core.AccessError; +import com.silverwrist.venice.except.AccessError; import com.silverwrist.venice.security.AuditRecord; import com.silverwrist.venice.security.Role; diff --git a/src/com/silverwrist/venice/core/internals/UserBackend.java b/src/com/silverwrist/venice/core/internals/UserBackend.java index 5c6e841..624fc5c 100644 --- a/src/com/silverwrist/venice/core/internals/UserBackend.java +++ b/src/com/silverwrist/venice/core/internals/UserBackend.java @@ -17,7 +17,7 @@ */ package com.silverwrist.venice.core.internals; -import com.silverwrist.venice.core.DataException; +import com.silverwrist.venice.except.DataException; public interface UserBackend { diff --git a/src/com/silverwrist/venice/db/DataPool.java b/src/com/silverwrist/venice/db/DataPool.java index b8a308e..c432a88 100644 --- a/src/com/silverwrist/venice/db/DataPool.java +++ b/src/com/silverwrist/venice/db/DataPool.java @@ -22,7 +22,7 @@ import java.sql.*; import org.apache.log4j.*; import org.w3c.dom.*; import com.silverwrist.util.DOMElementHelper; -import com.silverwrist.venice.core.ConfigException; +import com.silverwrist.venice.except.ConfigException; /** * A simple pooling system for JDBC connections, which allows connections to be kept in a pool until diff --git a/src/com/silverwrist/venice/db/PostLinkDecoder.java b/src/com/silverwrist/venice/db/PostLinkDecoder.java index 5d1100d..07a002e 100644 --- a/src/com/silverwrist/venice/db/PostLinkDecoder.java +++ b/src/com/silverwrist/venice/db/PostLinkDecoder.java @@ -19,8 +19,8 @@ package com.silverwrist.venice.db; import java.sql.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.IDUtils; +import com.silverwrist.venice.except.ValidationException; public class PostLinkDecoder { diff --git a/src/com/silverwrist/venice/db/PostLinkRewriter.java b/src/com/silverwrist/venice/db/PostLinkRewriter.java index 944a20d..758d7be 100644 --- a/src/com/silverwrist/venice/db/PostLinkRewriter.java +++ b/src/com/silverwrist/venice/db/PostLinkRewriter.java @@ -19,11 +19,11 @@ package com.silverwrist.venice.db; import java.sql.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.htmlcheck.Rewriter; import com.silverwrist.venice.htmlcheck.RewriterServices; import com.silverwrist.venice.htmlcheck.MarkupData; import com.silverwrist.venice.core.IDUtils; +import com.silverwrist.venice.except.ValidationException; public class PostLinkRewriter implements Rewriter { diff --git a/src/com/silverwrist/venice/core/AccessError.java b/src/com/silverwrist/venice/except/AccessError.java similarity index 91% rename from src/com/silverwrist/venice/core/AccessError.java rename to src/com/silverwrist/venice/except/AccessError.java index 2360fae..317c3c5 100644 --- a/src/com/silverwrist/venice/core/AccessError.java +++ b/src/com/silverwrist/venice/except/AccessError.java @@ -15,9 +15,9 @@ * * Contributor(s): */ -package com.silverwrist.venice.core; +package com.silverwrist.venice.except; -public class AccessError extends com.silverwrist.venice.VeniceException +public class AccessError extends VeniceException { public AccessError() { diff --git a/src/com/silverwrist/venice/core/ConfigException.java b/src/com/silverwrist/venice/except/ConfigException.java similarity index 96% rename from src/com/silverwrist/venice/core/ConfigException.java rename to src/com/silverwrist/venice/except/ConfigException.java index 379f9b9..3d60802 100644 --- a/src/com/silverwrist/venice/core/ConfigException.java +++ b/src/com/silverwrist/venice/except/ConfigException.java @@ -15,10 +15,9 @@ * * Contributor(s): */ -package com.silverwrist.venice.core; +package com.silverwrist.venice.except; import org.w3c.dom.*; -import com.silverwrist.venice.VeniceException; public class ConfigException extends VeniceException { diff --git a/src/com/silverwrist/venice/core/DataException.java b/src/com/silverwrist/venice/except/DataException.java similarity index 91% rename from src/com/silverwrist/venice/core/DataException.java rename to src/com/silverwrist/venice/except/DataException.java index 49fe104..46d5ae1 100644 --- a/src/com/silverwrist/venice/core/DataException.java +++ b/src/com/silverwrist/venice/except/DataException.java @@ -15,9 +15,9 @@ * * Contributor(s): */ -package com.silverwrist.venice.core; +package com.silverwrist.venice.except; -public class DataException extends com.silverwrist.venice.VeniceException +public class DataException extends VeniceException { public DataException() { diff --git a/src/com/silverwrist/venice/core/EmailException.java b/src/com/silverwrist/venice/except/EmailException.java similarity index 91% rename from src/com/silverwrist/venice/core/EmailException.java rename to src/com/silverwrist/venice/except/EmailException.java index 4778ace..c5a708d 100644 --- a/src/com/silverwrist/venice/core/EmailException.java +++ b/src/com/silverwrist/venice/except/EmailException.java @@ -15,9 +15,9 @@ * * Contributor(s): */ -package com.silverwrist.venice.core; +package com.silverwrist.venice.except; -public class EmailException extends com.silverwrist.venice.VeniceException +public class EmailException extends VeniceException { public EmailException() { diff --git a/src/com/silverwrist/venice/core/InternalStateError.java b/src/com/silverwrist/venice/except/InternalStateError.java similarity index 99% rename from src/com/silverwrist/venice/core/InternalStateError.java rename to src/com/silverwrist/venice/except/InternalStateError.java index 8df7b6e..e37d73b 100644 --- a/src/com/silverwrist/venice/core/InternalStateError.java +++ b/src/com/silverwrist/venice/except/InternalStateError.java @@ -15,7 +15,7 @@ * * Contributor(s): */ -package com.silverwrist.venice.core; +package com.silverwrist.venice.except; import java.io.PrintStream; import java.io.PrintWriter; diff --git a/src/com/silverwrist/venice/ValidationException.java b/src/com/silverwrist/venice/except/ValidationException.java similarity index 98% rename from src/com/silverwrist/venice/ValidationException.java rename to src/com/silverwrist/venice/except/ValidationException.java index 002bb57..e653f83 100644 --- a/src/com/silverwrist/venice/ValidationException.java +++ b/src/com/silverwrist/venice/except/ValidationException.java @@ -15,7 +15,7 @@ * * Contributor(s): */ -package com.silverwrist.venice; +package com.silverwrist.venice.except; /** * An exception that is commonly thrown when a particular piece of data retrieved from the user is diff --git a/src/com/silverwrist/venice/VeniceException.java b/src/com/silverwrist/venice/except/VeniceException.java similarity index 99% rename from src/com/silverwrist/venice/VeniceException.java rename to src/com/silverwrist/venice/except/VeniceException.java index 95db37a..9d5bdb2 100644 --- a/src/com/silverwrist/venice/VeniceException.java +++ b/src/com/silverwrist/venice/except/VeniceException.java @@ -15,7 +15,7 @@ * * Contributor(s): */ -package com.silverwrist.venice; +package com.silverwrist.venice.except; import java.io.PrintStream; import java.io.PrintWriter; diff --git a/src/com/silverwrist/venice/htmlcheck/HTMLCheckerException.java b/src/com/silverwrist/venice/htmlcheck/HTMLCheckerException.java index 4aeaa68..19d3c15 100644 --- a/src/com/silverwrist/venice/htmlcheck/HTMLCheckerException.java +++ b/src/com/silverwrist/venice/htmlcheck/HTMLCheckerException.java @@ -7,7 +7,7 @@ * WARRANTY OF ANY KIND, either express or implied. See the License for the specific * language governing rights and limitations under the License. * - * The Original Code is the Venice Web Community System. + * The Original Code is the Venice Web Communities System. * * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are @@ -17,7 +17,9 @@ */ package com.silverwrist.venice.htmlcheck; -public class HTMLCheckerException extends com.silverwrist.venice.VeniceException +import com.silverwrist.venice.except.VeniceException; + +public class HTMLCheckerException extends VeniceException { public HTMLCheckerException() { diff --git a/src/com/silverwrist/venice/security/AuditRecord.java b/src/com/silverwrist/venice/security/AuditRecord.java index 1b4cfc8..a00d0de 100644 --- a/src/com/silverwrist/venice/security/AuditRecord.java +++ b/src/com/silverwrist/venice/security/AuditRecord.java @@ -21,8 +21,8 @@ import java.sql.*; import java.util.*; import com.silverwrist.venice.db.SQLUtil; import com.silverwrist.venice.core.AuditData; -import com.silverwrist.venice.core.DataException; -import com.silverwrist.venice.core.InternalStateError; +import com.silverwrist.venice.except.DataException; +import com.silverwrist.venice.except.InternalStateError; public class AuditRecord implements AuditData { diff --git a/src/com/silverwrist/venice/security/PrimordialSecurityMonitor.java b/src/com/silverwrist/venice/security/PrimordialSecurityMonitor.java index a4dcb0b..4fca6f2 100644 --- a/src/com/silverwrist/venice/security/PrimordialSecurityMonitor.java +++ b/src/com/silverwrist/venice/security/PrimordialSecurityMonitor.java @@ -20,7 +20,7 @@ package com.silverwrist.venice.security; import java.io.IOException; import java.util.*; import org.apache.log4j.*; -import com.silverwrist.venice.core.AccessError; +import com.silverwrist.venice.except.AccessError; public class PrimordialSecurityMonitor implements SecurityMonitor { diff --git a/src/com/silverwrist/venice/security/SecurityMonitor.java b/src/com/silverwrist/venice/security/SecurityMonitor.java index 228479e..c483997 100644 --- a/src/com/silverwrist/venice/security/SecurityMonitor.java +++ b/src/com/silverwrist/venice/security/SecurityMonitor.java @@ -18,7 +18,7 @@ package com.silverwrist.venice.security; import java.util.List; -import com.silverwrist.venice.core.AccessError; +import com.silverwrist.venice.except.AccessError; public interface SecurityMonitor { diff --git a/src/com/silverwrist/venice/security/StaticSecurityMonitor.java b/src/com/silverwrist/venice/security/StaticSecurityMonitor.java index d2ac50e..6a3f99d 100644 --- a/src/com/silverwrist/venice/security/StaticSecurityMonitor.java +++ b/src/com/silverwrist/venice/security/StaticSecurityMonitor.java @@ -21,8 +21,8 @@ import java.util.*; import org.apache.log4j.*; import org.w3c.dom.*; import com.silverwrist.util.DOMElementHelper; -import com.silverwrist.venice.core.AccessError; -import com.silverwrist.venice.core.ConfigException; +import com.silverwrist.venice.except.AccessError; +import com.silverwrist.venice.except.ConfigException; public class StaticSecurityMonitor implements SecurityMonitor { diff --git a/src/com/silverwrist/venice/servlets/Account.java b/src/com/silverwrist/venice/servlets/Account.java index 339f3c6..989be73 100644 --- a/src/com/silverwrist/venice/servlets/Account.java +++ b/src/com/silverwrist/venice/servlets/Account.java @@ -23,8 +23,8 @@ import javax.servlet.*; import javax.servlet.http.*; import org.apache.log4j.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class Account extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/Attachment.java b/src/com/silverwrist/venice/servlets/Attachment.java index c25ba13..26208f5 100644 --- a/src/com/silverwrist/venice/servlets/Attachment.java +++ b/src/com/silverwrist/venice/servlets/Attachment.java @@ -25,6 +25,7 @@ import org.apache.log4j.*; import com.silverwrist.util.ServletMultipartHandler; import com.silverwrist.util.ServletMultipartException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class Attachment extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/CommunityAdmin.java b/src/com/silverwrist/venice/servlets/CommunityAdmin.java index eca681c..a8f14e2 100644 --- a/src/com/silverwrist/venice/servlets/CommunityAdmin.java +++ b/src/com/silverwrist/venice/servlets/CommunityAdmin.java @@ -23,8 +23,8 @@ import javax.servlet.*; import javax.servlet.http.*; import org.apache.log4j.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class CommunityAdmin extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/CommunityFrontEnd.java b/src/com/silverwrist/venice/servlets/CommunityFrontEnd.java index 63b5f26..19974d9 100644 --- a/src/com/silverwrist/venice/servlets/CommunityFrontEnd.java +++ b/src/com/silverwrist/venice/servlets/CommunityFrontEnd.java @@ -21,6 +21,7 @@ import java.io.*; import javax.servlet.*; import javax.servlet.http.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class CommunityFrontEnd extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/CommunityLogo.java b/src/com/silverwrist/venice/servlets/CommunityLogo.java index b6c071c..3f0e48b 100644 --- a/src/com/silverwrist/venice/servlets/CommunityLogo.java +++ b/src/com/silverwrist/venice/servlets/CommunityLogo.java @@ -27,6 +27,7 @@ import com.silverwrist.util.ServletMultipartHandler; import com.silverwrist.util.ServletMultipartException; import com.silverwrist.util.image.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class CommunityLogo extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/CommunityOperations.java b/src/com/silverwrist/venice/servlets/CommunityOperations.java index 82ff6e9..6a319ce 100644 --- a/src/com/silverwrist/venice/servlets/CommunityOperations.java +++ b/src/com/silverwrist/venice/servlets/CommunityOperations.java @@ -21,8 +21,8 @@ import java.io.*; import javax.servlet.*; import javax.servlet.http.*; import org.apache.log4j.*; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class CommunityOperations extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/CommunityProfile.java b/src/com/silverwrist/venice/servlets/CommunityProfile.java index 13be3f3..674e3fd 100644 --- a/src/com/silverwrist/venice/servlets/CommunityProfile.java +++ b/src/com/silverwrist/venice/servlets/CommunityProfile.java @@ -21,6 +21,7 @@ import java.io.*; import javax.servlet.*; import javax.servlet.http.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class CommunityProfile extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/ConfDisplay.java b/src/com/silverwrist/venice/servlets/ConfDisplay.java index a9f8d8f..a809d6c 100644 --- a/src/com/silverwrist/venice/servlets/ConfDisplay.java +++ b/src/com/silverwrist/venice/servlets/ConfDisplay.java @@ -23,8 +23,8 @@ import javax.servlet.*; import javax.servlet.http.*; import org.apache.log4j.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class ConfDisplay extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/ConfOperations.java b/src/com/silverwrist/venice/servlets/ConfOperations.java index f8f328f..1de60ac 100644 --- a/src/com/silverwrist/venice/servlets/ConfOperations.java +++ b/src/com/silverwrist/venice/servlets/ConfOperations.java @@ -23,8 +23,8 @@ import javax.servlet.*; import javax.servlet.http.*; import org.apache.log4j.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class ConfOperations extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/Find.java b/src/com/silverwrist/venice/servlets/Find.java index 0013183..cecc660 100644 --- a/src/com/silverwrist/venice/servlets/Find.java +++ b/src/com/silverwrist/venice/servlets/Find.java @@ -20,8 +20,8 @@ package com.silverwrist.venice.servlets; import java.io.*; import javax.servlet.*; import javax.servlet.http.*; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class Find extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/ImageRetrieve.java b/src/com/silverwrist/venice/servlets/ImageRetrieve.java index 5334e1e..acee26d 100644 --- a/src/com/silverwrist/venice/servlets/ImageRetrieve.java +++ b/src/com/silverwrist/venice/servlets/ImageRetrieve.java @@ -23,6 +23,7 @@ import javax.servlet.*; import javax.servlet.http.*; import org.apache.log4j.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class ImageRetrieve extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/PasswordRecovery.java b/src/com/silverwrist/venice/servlets/PasswordRecovery.java index 90e5ca3..b7fe414 100644 --- a/src/com/silverwrist/venice/servlets/PasswordRecovery.java +++ b/src/com/silverwrist/venice/servlets/PasswordRecovery.java @@ -22,6 +22,7 @@ import javax.servlet.*; import javax.servlet.http.*; import org.apache.log4j.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class PasswordRecovery extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/PostMessage.java b/src/com/silverwrist/venice/servlets/PostMessage.java index f54bcb1..593fcab 100644 --- a/src/com/silverwrist/venice/servlets/PostMessage.java +++ b/src/com/silverwrist/venice/servlets/PostMessage.java @@ -23,8 +23,8 @@ import javax.servlet.*; import javax.servlet.http.*; import org.apache.log4j.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class PostMessage extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/PostOperations.java b/src/com/silverwrist/venice/servlets/PostOperations.java index 17d5e18..d8e8b6a 100644 --- a/src/com/silverwrist/venice/servlets/PostOperations.java +++ b/src/com/silverwrist/venice/servlets/PostOperations.java @@ -23,8 +23,8 @@ import javax.servlet.*; import javax.servlet.http.*; import org.apache.log4j.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class PostOperations extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/PostShortcut.java b/src/com/silverwrist/venice/servlets/PostShortcut.java index a3c51d4..79984c3 100644 --- a/src/com/silverwrist/venice/servlets/PostShortcut.java +++ b/src/com/silverwrist/venice/servlets/PostShortcut.java @@ -20,8 +20,8 @@ package com.silverwrist.venice.servlets; import java.io.*; import javax.servlet.*; import javax.servlet.http.*; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.db.PostLinkDecoder; import com.silverwrist.venice.servlets.format.*; diff --git a/src/com/silverwrist/venice/servlets/Settings.java b/src/com/silverwrist/venice/servlets/Settings.java index 0efcd13..b7829c7 100644 --- a/src/com/silverwrist/venice/servlets/Settings.java +++ b/src/com/silverwrist/venice/servlets/Settings.java @@ -23,6 +23,7 @@ import javax.servlet.*; import javax.servlet.http.*; import org.apache.log4j.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class Settings extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/SystemAdmin.java b/src/com/silverwrist/venice/servlets/SystemAdmin.java index 6a911b9..6e0e4ed 100644 --- a/src/com/silverwrist/venice/servlets/SystemAdmin.java +++ b/src/com/silverwrist/venice/servlets/SystemAdmin.java @@ -23,8 +23,8 @@ import javax.servlet.*; import javax.servlet.http.*; import org.apache.log4j.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class SystemAdmin extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/Top.java b/src/com/silverwrist/venice/servlets/Top.java index 95634a7..4baeef7 100644 --- a/src/com/silverwrist/venice/servlets/Top.java +++ b/src/com/silverwrist/venice/servlets/Top.java @@ -23,6 +23,7 @@ import javax.servlet.http.*; import org.apache.log4j.*; import org.apache.log4j.xml.DOMConfigurator; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class Top extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/TopicOperations.java b/src/com/silverwrist/venice/servlets/TopicOperations.java index fb9d7c7..a40b934 100644 --- a/src/com/silverwrist/venice/servlets/TopicOperations.java +++ b/src/com/silverwrist/venice/servlets/TopicOperations.java @@ -22,8 +22,8 @@ import javax.servlet.*; import javax.servlet.http.*; import org.apache.log4j.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class TopicOperations extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/UserDisplay.java b/src/com/silverwrist/venice/servlets/UserDisplay.java index a4972be..a8f9522 100644 --- a/src/com/silverwrist/venice/servlets/UserDisplay.java +++ b/src/com/silverwrist/venice/servlets/UserDisplay.java @@ -22,6 +22,7 @@ import javax.servlet.*; import javax.servlet.http.*; import org.apache.log4j.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class UserDisplay extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/UserPhoto.java b/src/com/silverwrist/venice/servlets/UserPhoto.java index 697a7d3..804195b 100644 --- a/src/com/silverwrist/venice/servlets/UserPhoto.java +++ b/src/com/silverwrist/venice/servlets/UserPhoto.java @@ -28,6 +28,7 @@ import com.silverwrist.util.ServletMultipartHandler; import com.silverwrist.util.ServletMultipartException; import com.silverwrist.util.image.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class UserPhoto extends VeniceServlet diff --git a/src/com/silverwrist/venice/servlets/Variables.java b/src/com/silverwrist/venice/servlets/Variables.java index 53f5a12..bd08b4a 100644 --- a/src/com/silverwrist/venice/servlets/Variables.java +++ b/src/com/silverwrist/venice/servlets/Variables.java @@ -24,6 +24,7 @@ import javax.servlet.*; import javax.servlet.http.*; import org.apache.log4j.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; import com.silverwrist.venice.servlets.format.menus.LeftMenu; diff --git a/src/com/silverwrist/venice/servlets/VeniceServlet.java b/src/com/silverwrist/venice/servlets/VeniceServlet.java index f911375..8f64046 100644 --- a/src/com/silverwrist/venice/servlets/VeniceServlet.java +++ b/src/com/silverwrist/venice/servlets/VeniceServlet.java @@ -26,6 +26,7 @@ import com.silverwrist.util.StringUtil; import com.silverwrist.util.ServletMultipartHandler; import com.silverwrist.util.ServletMultipartException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public abstract class VeniceServlet extends HttpServlet diff --git a/src/com/silverwrist/venice/servlets/format/AdminFindUser.java b/src/com/silverwrist/venice/servlets/format/AdminFindUser.java index cbca977..0f1026d 100644 --- a/src/com/silverwrist/venice/servlets/format/AdminFindUser.java +++ b/src/com/silverwrist/venice/servlets/format/AdminFindUser.java @@ -20,8 +20,8 @@ package com.silverwrist.venice.servlets.format; import java.util.*; import javax.servlet.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class AdminFindUser implements JSPRender, SearchMode { diff --git a/src/com/silverwrist/venice/servlets/format/AdminModifyUserDialog.java b/src/com/silverwrist/venice/servlets/format/AdminModifyUserDialog.java index 49fb9ec..2a86660 100644 --- a/src/com/silverwrist/venice/servlets/format/AdminModifyUserDialog.java +++ b/src/com/silverwrist/venice/servlets/format/AdminModifyUserDialog.java @@ -19,8 +19,8 @@ package com.silverwrist.venice.servlets.format; import java.util.*; import com.silverwrist.util.*; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.security.Role; public class AdminModifyUserDialog extends ContentDialog diff --git a/src/com/silverwrist/venice/servlets/format/CDBaseFormField.java b/src/com/silverwrist/venice/servlets/format/CDBaseFormField.java index c51061f..d79f860 100644 --- a/src/com/silverwrist/venice/servlets/format/CDBaseFormField.java +++ b/src/com/silverwrist/venice/servlets/format/CDBaseFormField.java @@ -20,7 +20,7 @@ package com.silverwrist.venice.servlets.format; import java.io.Writer; import java.io.IOException; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; +import com.silverwrist.venice.except.ValidationException; public abstract class CDBaseFormField implements CDFormField, ColorSelectors { diff --git a/src/com/silverwrist/venice/servlets/format/CDBaseFormFieldReverse.java b/src/com/silverwrist/venice/servlets/format/CDBaseFormFieldReverse.java index 80ae63c..6771843 100644 --- a/src/com/silverwrist/venice/servlets/format/CDBaseFormFieldReverse.java +++ b/src/com/silverwrist/venice/servlets/format/CDBaseFormFieldReverse.java @@ -20,7 +20,7 @@ package com.silverwrist.venice.servlets.format; import java.io.Writer; import java.io.IOException; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; +import com.silverwrist.venice.except.ValidationException; public abstract class CDBaseFormFieldReverse implements CDFormField, ColorSelectors { diff --git a/src/com/silverwrist/venice/servlets/format/CDCheckBoxFormField.java b/src/com/silverwrist/venice/servlets/format/CDCheckBoxFormField.java index d675168..21dc7f3 100644 --- a/src/com/silverwrist/venice/servlets/format/CDCheckBoxFormField.java +++ b/src/com/silverwrist/venice/servlets/format/CDCheckBoxFormField.java @@ -20,7 +20,7 @@ package com.silverwrist.venice.servlets.format; import java.io.Writer; import java.io.IOException; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; +import com.silverwrist.venice.except.ValidationException; public class CDCheckBoxFormField extends CDBaseFormFieldReverse { diff --git a/src/com/silverwrist/venice/servlets/format/CDEmailAddressFormField.java b/src/com/silverwrist/venice/servlets/format/CDEmailAddressFormField.java index 93248d3..f1bd713 100644 --- a/src/com/silverwrist/venice/servlets/format/CDEmailAddressFormField.java +++ b/src/com/silverwrist/venice/servlets/format/CDEmailAddressFormField.java @@ -18,7 +18,7 @@ package com.silverwrist.venice.servlets.format; import com.silverwrist.venice.core.IDUtils; -import com.silverwrist.venice.ValidationException; +import com.silverwrist.venice.except.ValidationException; public class CDEmailAddressFormField extends CDTextFormField { diff --git a/src/com/silverwrist/venice/servlets/format/CDFormCategoryHeader.java b/src/com/silverwrist/venice/servlets/format/CDFormCategoryHeader.java index df231d0..12e056d 100644 --- a/src/com/silverwrist/venice/servlets/format/CDFormCategoryHeader.java +++ b/src/com/silverwrist/venice/servlets/format/CDFormCategoryHeader.java @@ -21,7 +21,7 @@ import java.io.Writer; import java.io.IOException; import javax.servlet.ServletRequest; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; +import com.silverwrist.venice.except.ValidationException; public class CDFormCategoryHeader implements CDFormField, ColorSelectors { diff --git a/src/com/silverwrist/venice/servlets/format/CDFormField.java b/src/com/silverwrist/venice/servlets/format/CDFormField.java index 6bdfa65..23075f5 100644 --- a/src/com/silverwrist/venice/servlets/format/CDFormField.java +++ b/src/com/silverwrist/venice/servlets/format/CDFormField.java @@ -17,7 +17,7 @@ */ package com.silverwrist.venice.servlets.format; -import com.silverwrist.venice.ValidationException; +import com.silverwrist.venice.except.ValidationException; public interface CDFormField extends ComponentRender { diff --git a/src/com/silverwrist/venice/servlets/format/CDIntegerFormField.java b/src/com/silverwrist/venice/servlets/format/CDIntegerFormField.java index 339752d..cb2c703 100644 --- a/src/com/silverwrist/venice/servlets/format/CDIntegerFormField.java +++ b/src/com/silverwrist/venice/servlets/format/CDIntegerFormField.java @@ -18,7 +18,7 @@ package com.silverwrist.venice.servlets.format; import java.io.*; -import com.silverwrist.venice.ValidationException; +import com.silverwrist.venice.except.ValidationException; public class CDIntegerFormField extends CDTextFormField { diff --git a/src/com/silverwrist/venice/servlets/format/CDPasswordFormField.java b/src/com/silverwrist/venice/servlets/format/CDPasswordFormField.java index ff20079..8a3dc2d 100644 --- a/src/com/silverwrist/venice/servlets/format/CDPasswordFormField.java +++ b/src/com/silverwrist/venice/servlets/format/CDPasswordFormField.java @@ -19,7 +19,7 @@ package com.silverwrist.venice.servlets.format; import java.io.Writer; import java.io.IOException; -import com.silverwrist.venice.ValidationException; +import com.silverwrist.venice.except.ValidationException; public class CDPasswordFormField extends CDBaseFormField { diff --git a/src/com/silverwrist/venice/servlets/format/CDTextFormField.java b/src/com/silverwrist/venice/servlets/format/CDTextFormField.java index 24864ba..635ad84 100644 --- a/src/com/silverwrist/venice/servlets/format/CDTextFormField.java +++ b/src/com/silverwrist/venice/servlets/format/CDTextFormField.java @@ -19,7 +19,7 @@ package com.silverwrist.venice.servlets.format; import java.io.Writer; import java.io.IOException; -import com.silverwrist.venice.ValidationException; +import com.silverwrist.venice.except.ValidationException; public class CDTextFormField extends CDBaseFormField { diff --git a/src/com/silverwrist/venice/servlets/format/CDVeniceIDFormField.java b/src/com/silverwrist/venice/servlets/format/CDVeniceIDFormField.java index 4739eeb..88734a1 100644 --- a/src/com/silverwrist/venice/servlets/format/CDVeniceIDFormField.java +++ b/src/com/silverwrist/venice/servlets/format/CDVeniceIDFormField.java @@ -18,7 +18,7 @@ package com.silverwrist.venice.servlets.format; import com.silverwrist.venice.core.IDUtils; -import com.silverwrist.venice.ValidationException; +import com.silverwrist.venice.except.ValidationException; public class CDVeniceIDFormField extends CDTextFormField { diff --git a/src/com/silverwrist/venice/servlets/format/CommunityCategoryBrowseData.java b/src/com/silverwrist/venice/servlets/format/CommunityCategoryBrowseData.java index 9c88a54..59e567d 100644 --- a/src/com/silverwrist/venice/servlets/format/CommunityCategoryBrowseData.java +++ b/src/com/silverwrist/venice/servlets/format/CommunityCategoryBrowseData.java @@ -20,6 +20,7 @@ package com.silverwrist.venice.servlets.format; import java.util.*; import javax.servlet.ServletRequest; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class CommunityCategoryBrowseData implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/CommunityLogoData.java b/src/com/silverwrist/venice/servlets/format/CommunityLogoData.java index 35a02fb..861d869 100644 --- a/src/com/silverwrist/venice/servlets/format/CommunityLogoData.java +++ b/src/com/silverwrist/venice/servlets/format/CommunityLogoData.java @@ -22,6 +22,7 @@ import javax.servlet.*; import javax.servlet.http.*; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class CommunityLogoData implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/CommunityMembership.java b/src/com/silverwrist/venice/servlets/format/CommunityMembership.java index 38c4842..4c380da 100644 --- a/src/com/silverwrist/venice/servlets/format/CommunityMembership.java +++ b/src/com/silverwrist/venice/servlets/format/CommunityMembership.java @@ -22,9 +22,9 @@ import java.util.*; import javax.servlet.*; import javax.servlet.http.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.security.Role; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class CommunityMembership implements JSPRender, SearchMode { diff --git a/src/com/silverwrist/venice/servlets/format/CommunityProfileData.java b/src/com/silverwrist/venice/servlets/format/CommunityProfileData.java index 063ce9f..3ece3fc 100644 --- a/src/com/silverwrist/venice/servlets/format/CommunityProfileData.java +++ b/src/com/silverwrist/venice/servlets/format/CommunityProfileData.java @@ -20,6 +20,7 @@ package com.silverwrist.venice.servlets.format; import javax.servlet.ServletRequest; import com.silverwrist.util.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class CommunityProfileData implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/ConferenceActivity.java b/src/com/silverwrist/venice/servlets/format/ConferenceActivity.java index ed23064..e329238 100644 --- a/src/com/silverwrist/venice/servlets/format/ConferenceActivity.java +++ b/src/com/silverwrist/venice/servlets/format/ConferenceActivity.java @@ -21,6 +21,7 @@ import java.util.*; import javax.servlet.*; import javax.servlet.http.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class ConferenceActivity implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/ConferenceListing.java b/src/com/silverwrist/venice/servlets/format/ConferenceListing.java index 5e63d99..454b162 100644 --- a/src/com/silverwrist/venice/servlets/format/ConferenceListing.java +++ b/src/com/silverwrist/venice/servlets/format/ConferenceListing.java @@ -20,6 +20,7 @@ package com.silverwrist.venice.servlets.format; import java.util.*; import javax.servlet.ServletRequest; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class ConferenceListing implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/ConferenceMembership.java b/src/com/silverwrist/venice/servlets/format/ConferenceMembership.java index 8687f64..fb11b5b 100644 --- a/src/com/silverwrist/venice/servlets/format/ConferenceMembership.java +++ b/src/com/silverwrist/venice/servlets/format/ConferenceMembership.java @@ -22,9 +22,9 @@ import java.util.*; import javax.servlet.*; import javax.servlet.http.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.security.Role; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class ConferenceMembership implements JSPRender, SearchMode { diff --git a/src/com/silverwrist/venice/servlets/format/ConferenceSequence.java b/src/com/silverwrist/venice/servlets/format/ConferenceSequence.java index cd81a57..196446f 100644 --- a/src/com/silverwrist/venice/servlets/format/ConferenceSequence.java +++ b/src/com/silverwrist/venice/servlets/format/ConferenceSequence.java @@ -21,6 +21,7 @@ import java.util.*; import javax.servlet.*; import javax.servlet.http.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class ConferenceSequence implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/ContentDialog.java b/src/com/silverwrist/venice/servlets/format/ContentDialog.java index 07fc43b..1fc1b57 100644 --- a/src/com/silverwrist/venice/servlets/format/ContentDialog.java +++ b/src/com/silverwrist/venice/servlets/format/ContentDialog.java @@ -22,7 +22,7 @@ import java.io.Writer; import java.io.IOException; import javax.servlet.ServletRequest; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; +import com.silverwrist.venice.except.ValidationException; public class ContentDialog implements Cloneable, ContentRender, ColorSelectors { diff --git a/src/com/silverwrist/venice/servlets/format/CreateCommunityDialog.java b/src/com/silverwrist/venice/servlets/format/CreateCommunityDialog.java index 03a338d..df33495 100644 --- a/src/com/silverwrist/venice/servlets/format/CreateCommunityDialog.java +++ b/src/com/silverwrist/venice/servlets/format/CreateCommunityDialog.java @@ -19,8 +19,8 @@ package com.silverwrist.venice.servlets.format; import java.util.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class CreateCommunityDialog extends ContentDialog { diff --git a/src/com/silverwrist/venice/servlets/format/CreateConferenceDialog.java b/src/com/silverwrist/venice/servlets/format/CreateConferenceDialog.java index a36d94a..e51a0d5 100644 --- a/src/com/silverwrist/venice/servlets/format/CreateConferenceDialog.java +++ b/src/com/silverwrist/venice/servlets/format/CreateConferenceDialog.java @@ -18,8 +18,10 @@ package com.silverwrist.venice.servlets.format; import java.util.*; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.AccessError; +import com.silverwrist.venice.except.DataException; +import com.silverwrist.venice.except.ValidationException; public class CreateConferenceDialog extends ContentDialog { diff --git a/src/com/silverwrist/venice/servlets/format/EditCommunityProfileDialog.java b/src/com/silverwrist/venice/servlets/format/EditCommunityProfileDialog.java index d5f816c..d5c7043 100644 --- a/src/com/silverwrist/venice/servlets/format/EditCommunityProfileDialog.java +++ b/src/com/silverwrist/venice/servlets/format/EditCommunityProfileDialog.java @@ -20,9 +20,9 @@ package com.silverwrist.venice.servlets.format; import java.io.*; import java.util.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.security.Role; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class EditCommunityProfileDialog extends ContentDialog { diff --git a/src/com/silverwrist/venice/servlets/format/EditConferenceDialog.java b/src/com/silverwrist/venice/servlets/format/EditConferenceDialog.java index 4abe202..acf8657 100644 --- a/src/com/silverwrist/venice/servlets/format/EditConferenceDialog.java +++ b/src/com/silverwrist/venice/servlets/format/EditConferenceDialog.java @@ -19,9 +19,9 @@ package com.silverwrist.venice.servlets.format; import java.util.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.security.Role; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class EditConferenceDialog extends ContentDialog { diff --git a/src/com/silverwrist/venice/servlets/format/EditGlobalPropertiesDialog.java b/src/com/silverwrist/venice/servlets/format/EditGlobalPropertiesDialog.java index b83ebb6..1a0c35e 100644 --- a/src/com/silverwrist/venice/servlets/format/EditGlobalPropertiesDialog.java +++ b/src/com/silverwrist/venice/servlets/format/EditGlobalPropertiesDialog.java @@ -20,9 +20,9 @@ package com.silverwrist.venice.servlets.format; import java.io.*; import java.util.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.security.Role; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class EditGlobalPropertiesDialog extends ContentDialog { diff --git a/src/com/silverwrist/venice/servlets/format/EditProfileDialog.java b/src/com/silverwrist/venice/servlets/format/EditProfileDialog.java index dd73d72..9a32b6f 100644 --- a/src/com/silverwrist/venice/servlets/format/EditProfileDialog.java +++ b/src/com/silverwrist/venice/servlets/format/EditProfileDialog.java @@ -21,8 +21,8 @@ import java.io.*; import java.net.URLEncoder; import java.util.*; import com.silverwrist.util.*; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class EditProfileDialog extends ContentDialog { diff --git a/src/com/silverwrist/venice/servlets/format/FindData.java b/src/com/silverwrist/venice/servlets/format/FindData.java index 77a93e5..3351503 100644 --- a/src/com/silverwrist/venice/servlets/format/FindData.java +++ b/src/com/silverwrist/venice/servlets/format/FindData.java @@ -22,8 +22,8 @@ import java.io.IOException; import java.util.*; import javax.servlet.*; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class FindData implements JSPRender, SearchMode { diff --git a/src/com/silverwrist/venice/servlets/format/Hotlist.java b/src/com/silverwrist/venice/servlets/format/Hotlist.java index f996de8..6b36d3d 100644 --- a/src/com/silverwrist/venice/servlets/format/Hotlist.java +++ b/src/com/silverwrist/venice/servlets/format/Hotlist.java @@ -21,6 +21,7 @@ import java.util.*; import javax.servlet.*; import javax.servlet.http.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class Hotlist implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/JoinKeyDialog.java b/src/com/silverwrist/venice/servlets/format/JoinKeyDialog.java index 98830fe..d71c2f4 100644 --- a/src/com/silverwrist/venice/servlets/format/JoinKeyDialog.java +++ b/src/com/silverwrist/venice/servlets/format/JoinKeyDialog.java @@ -18,8 +18,8 @@ package com.silverwrist.venice.servlets.format; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class JoinKeyDialog extends ContentDialog { diff --git a/src/com/silverwrist/venice/servlets/format/LoginDialog.java b/src/com/silverwrist/venice/servlets/format/LoginDialog.java index b908dd5..3733775 100644 --- a/src/com/silverwrist/venice/servlets/format/LoginDialog.java +++ b/src/com/silverwrist/venice/servlets/format/LoginDialog.java @@ -18,7 +18,7 @@ package com.silverwrist.venice.servlets.format; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.ValidationException; +import com.silverwrist.venice.except.ValidationException; import com.silverwrist.venice.servlets.Variables; public class LoginDialog extends ContentDialog diff --git a/src/com/silverwrist/venice/servlets/format/ManageConferenceAliases.java b/src/com/silverwrist/venice/servlets/format/ManageConferenceAliases.java index 1291fe6..fd3d8a2 100644 --- a/src/com/silverwrist/venice/servlets/format/ManageConferenceAliases.java +++ b/src/com/silverwrist/venice/servlets/format/ManageConferenceAliases.java @@ -21,6 +21,7 @@ import java.util.*; import javax.servlet.*; import javax.servlet.http.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class ManageConferenceAliases implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/ManageTopic.java b/src/com/silverwrist/venice/servlets/format/ManageTopic.java index 570d49a..d88fd82 100644 --- a/src/com/silverwrist/venice/servlets/format/ManageTopic.java +++ b/src/com/silverwrist/venice/servlets/format/ManageTopic.java @@ -21,6 +21,7 @@ import java.util.*; import javax.servlet.*; import javax.servlet.http.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class ManageTopic implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/MenuCommunity.java b/src/com/silverwrist/venice/servlets/format/MenuCommunity.java index 667296f..9698c77 100644 --- a/src/com/silverwrist/venice/servlets/format/MenuCommunity.java +++ b/src/com/silverwrist/venice/servlets/format/MenuCommunity.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.*; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class MenuCommunity implements ComponentRender, ColorSelectors { diff --git a/src/com/silverwrist/venice/servlets/format/NewAccountDialog.java b/src/com/silverwrist/venice/servlets/format/NewAccountDialog.java index 559c3ab..a11646d 100644 --- a/src/com/silverwrist/venice/servlets/format/NewAccountDialog.java +++ b/src/com/silverwrist/venice/servlets/format/NewAccountDialog.java @@ -19,8 +19,8 @@ package com.silverwrist.venice.servlets.format; import java.util.List; import javax.servlet.ServletRequest; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class NewAccountDialog extends ContentDialog { diff --git a/src/com/silverwrist/venice/servlets/format/NewTopicForm.java b/src/com/silverwrist/venice/servlets/format/NewTopicForm.java index 69a945d..fe259a0 100644 --- a/src/com/silverwrist/venice/servlets/format/NewTopicForm.java +++ b/src/com/silverwrist/venice/servlets/format/NewTopicForm.java @@ -19,9 +19,9 @@ package com.silverwrist.venice.servlets.format; import java.util.*; import javax.servlet.*; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.htmlcheck.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class NewTopicForm implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/PostPreview.java b/src/com/silverwrist/venice/servlets/format/PostPreview.java index 8ff6310..61798e1 100644 --- a/src/com/silverwrist/venice/servlets/format/PostPreview.java +++ b/src/com/silverwrist/venice/servlets/format/PostPreview.java @@ -23,6 +23,7 @@ import javax.servlet.http.*; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.htmlcheck.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class PostPreview implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/PostSlippage.java b/src/com/silverwrist/venice/servlets/format/PostSlippage.java index 41bfd92..e2d02a8 100644 --- a/src/com/silverwrist/venice/servlets/format/PostSlippage.java +++ b/src/com/silverwrist/venice/servlets/format/PostSlippage.java @@ -23,6 +23,7 @@ import javax.servlet.http.*; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.htmlcheck.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class PostSlippage implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/RenderConfig.java b/src/com/silverwrist/venice/servlets/format/RenderConfig.java index 587dfab..6490c87 100644 --- a/src/com/silverwrist/venice/servlets/format/RenderConfig.java +++ b/src/com/silverwrist/venice/servlets/format/RenderConfig.java @@ -29,11 +29,11 @@ import org.xml.sax.SAXParseException; import com.silverwrist.util.DOMElementHelper; import com.silverwrist.util.IOUtil; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.core.AccessError; -import com.silverwrist.venice.core.ConfigException; -import com.silverwrist.venice.core.DataException; import com.silverwrist.venice.core.UserContext; import com.silverwrist.venice.core.VeniceEngine; +import com.silverwrist.venice.except.AccessError; +import com.silverwrist.venice.except.ConfigException; +import com.silverwrist.venice.except.DataException; import com.silverwrist.venice.servlets.Variables; import com.silverwrist.venice.servlets.format.menus.LeftMenu; import com.silverwrist.venice.servlets.format.sideboxes.SideBoxFactory; diff --git a/src/com/silverwrist/venice/servlets/format/RenderData.java b/src/com/silverwrist/venice/servlets/format/RenderData.java index 482b0c0..5e7cf84 100644 --- a/src/com/silverwrist/venice/servlets/format/RenderData.java +++ b/src/com/silverwrist/venice/servlets/format/RenderData.java @@ -25,12 +25,12 @@ import javax.servlet.http.*; import org.apache.log4j.*; import com.silverwrist.util.IOUtil; import com.silverwrist.util.StringUtil; -import com.silverwrist.venice.core.DataException; import com.silverwrist.venice.core.IDUtils; import com.silverwrist.venice.core.UserContext; import com.silverwrist.venice.core.VeniceEngine; import com.silverwrist.venice.db.PostLinkRewriter; import com.silverwrist.venice.db.UserNameRewriter; +import com.silverwrist.venice.except.DataException; import com.silverwrist.venice.servlets.format.menus.LeftMenu; public class RenderData implements ColorSelectors diff --git a/src/com/silverwrist/venice/servlets/format/ReportConferenceMenu.java b/src/com/silverwrist/venice/servlets/format/ReportConferenceMenu.java index 8b144fc..2ebd690 100644 --- a/src/com/silverwrist/venice/servlets/format/ReportConferenceMenu.java +++ b/src/com/silverwrist/venice/servlets/format/ReportConferenceMenu.java @@ -21,6 +21,7 @@ import java.util.*; import javax.servlet.*; import javax.servlet.http.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class ReportConferenceMenu implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/SideBoxList.java b/src/com/silverwrist/venice/servlets/format/SideBoxList.java index 2b533c7..e070750 100644 --- a/src/com/silverwrist/venice/servlets/format/SideBoxList.java +++ b/src/com/silverwrist/venice/servlets/format/SideBoxList.java @@ -21,6 +21,7 @@ import java.util.*; import javax.servlet.*; import javax.servlet.http.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class SideBoxList implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/TextMessageDialog.java b/src/com/silverwrist/venice/servlets/format/TextMessageDialog.java index 42a46a1..c38d9b8 100644 --- a/src/com/silverwrist/venice/servlets/format/TextMessageDialog.java +++ b/src/com/silverwrist/venice/servlets/format/TextMessageDialog.java @@ -23,6 +23,7 @@ import javax.servlet.http.*; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.htmlcheck.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class TextMessageDialog implements ContentRender, ColorSelectors { diff --git a/src/com/silverwrist/venice/servlets/format/TopDisplay.java b/src/com/silverwrist/venice/servlets/format/TopDisplay.java index 8c8fee1..f1438d6 100644 --- a/src/com/silverwrist/venice/servlets/format/TopDisplay.java +++ b/src/com/silverwrist/venice/servlets/format/TopDisplay.java @@ -24,6 +24,7 @@ import javax.servlet.*; import javax.servlet.http.*; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class TopDisplay implements ContentRender, ColorSelectors { diff --git a/src/com/silverwrist/venice/servlets/format/TopicListing.java b/src/com/silverwrist/venice/servlets/format/TopicListing.java index bfc02f3..2c43c4a 100644 --- a/src/com/silverwrist/venice/servlets/format/TopicListing.java +++ b/src/com/silverwrist/venice/servlets/format/TopicListing.java @@ -21,6 +21,7 @@ import java.util.*; import javax.servlet.*; import javax.servlet.http.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class TopicListing implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/TopicPosts.java b/src/com/silverwrist/venice/servlets/format/TopicPosts.java index e92a405..54591fe 100644 --- a/src/com/silverwrist/venice/servlets/format/TopicPosts.java +++ b/src/com/silverwrist/venice/servlets/format/TopicPosts.java @@ -24,6 +24,7 @@ import javax.servlet.http.*; import org.apache.log4j.*; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class TopicPosts implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/UserCommunityList.java b/src/com/silverwrist/venice/servlets/format/UserCommunityList.java index 09a7ec9..3f16177 100644 --- a/src/com/silverwrist/venice/servlets/format/UserCommunityList.java +++ b/src/com/silverwrist/venice/servlets/format/UserCommunityList.java @@ -21,6 +21,7 @@ import java.util.*; import javax.servlet.*; import javax.servlet.http.*; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class UserCommunityList implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/UserPhotoData.java b/src/com/silverwrist/venice/servlets/format/UserPhotoData.java index 423581a..9d1810d 100644 --- a/src/com/silverwrist/venice/servlets/format/UserPhotoData.java +++ b/src/com/silverwrist/venice/servlets/format/UserPhotoData.java @@ -22,6 +22,7 @@ import javax.servlet.*; import javax.servlet.http.*; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class UserPhotoData implements JSPRender { diff --git a/src/com/silverwrist/venice/servlets/format/VerifyEmailDialog.java b/src/com/silverwrist/venice/servlets/format/VerifyEmailDialog.java index 2a99ae8..5e6091a 100644 --- a/src/com/silverwrist/venice/servlets/format/VerifyEmailDialog.java +++ b/src/com/silverwrist/venice/servlets/format/VerifyEmailDialog.java @@ -7,7 +7,7 @@ * WARRANTY OF ANY KIND, either express or implied. See the License for the specific * language governing rights and limitations under the License. * - * The Original Code is the Venice Web Community System. + * The Original Code is the Venice Web Communities System. * * The Initial Developer of the Original Code is Eric J. Bowersox , * for Silverwrist Design Studios. Portions created by Eric J. Bowersox are @@ -17,8 +17,8 @@ */ package com.silverwrist.venice.servlets.format; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.IDUtils; +import com.silverwrist.venice.except.*; public class VerifyEmailDialog extends ContentDialog { diff --git a/src/com/silverwrist/venice/servlets/format/ViewCommunityMembers.java b/src/com/silverwrist/venice/servlets/format/ViewCommunityMembers.java index 60e31c3..1557e4e 100644 --- a/src/com/silverwrist/venice/servlets/format/ViewCommunityMembers.java +++ b/src/com/silverwrist/venice/servlets/format/ViewCommunityMembers.java @@ -21,8 +21,8 @@ import java.io.*; import java.util.*; import javax.servlet.*; import javax.servlet.http.*; -import com.silverwrist.venice.ValidationException; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; public class ViewCommunityMembers implements JSPRender, SearchMode { diff --git a/src/com/silverwrist/venice/servlets/format/menus/ImageItem.java b/src/com/silverwrist/venice/servlets/format/menus/ImageItem.java index 76651dd..b11be18 100644 --- a/src/com/silverwrist/venice/servlets/format/menus/ImageItem.java +++ b/src/com/silverwrist/venice/servlets/format/menus/ImageItem.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.apache.log4j.*; import org.w3c.dom.*; import com.silverwrist.util.*; -import com.silverwrist.venice.core.ConfigException; +import com.silverwrist.venice.except.ConfigException; import com.silverwrist.venice.servlets.format.ComponentRender; import com.silverwrist.venice.servlets.format.RenderData; diff --git a/src/com/silverwrist/venice/servlets/format/menus/LeftMenu.java b/src/com/silverwrist/venice/servlets/format/menus/LeftMenu.java index 00cc15c..dacb2b5 100644 --- a/src/com/silverwrist/venice/servlets/format/menus/LeftMenu.java +++ b/src/com/silverwrist/venice/servlets/format/menus/LeftMenu.java @@ -23,7 +23,7 @@ import java.util.*; import org.apache.log4j.*; import org.w3c.dom.*; import com.silverwrist.util.*; -import com.silverwrist.venice.core.ConfigException; +import com.silverwrist.venice.except.ConfigException; import com.silverwrist.venice.servlets.format.ComponentRender; import com.silverwrist.venice.servlets.format.RenderData; diff --git a/src/com/silverwrist/venice/servlets/format/menus/LinkItem.java b/src/com/silverwrist/venice/servlets/format/menus/LinkItem.java index e544d42..fdc7fde 100644 --- a/src/com/silverwrist/venice/servlets/format/menus/LinkItem.java +++ b/src/com/silverwrist/venice/servlets/format/menus/LinkItem.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.apache.log4j.*; import org.w3c.dom.*; import com.silverwrist.util.*; -import com.silverwrist.venice.core.ConfigException; +import com.silverwrist.venice.except.ConfigException; import com.silverwrist.venice.servlets.format.ColorSelectors; import com.silverwrist.venice.servlets.format.ComponentRender; import com.silverwrist.venice.servlets.format.RenderData; diff --git a/src/com/silverwrist/venice/servlets/format/sideboxes/CommunityBox.java b/src/com/silverwrist/venice/servlets/format/sideboxes/CommunityBox.java index 0f266c7..61d898e 100644 --- a/src/com/silverwrist/venice/servlets/format/sideboxes/CommunityBox.java +++ b/src/com/silverwrist/venice/servlets/format/sideboxes/CommunityBox.java @@ -23,6 +23,7 @@ import org.w3c.dom.*; import com.silverwrist.util.DOMElementHelper; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class CommunityBox implements SideBoxFactory diff --git a/src/com/silverwrist/venice/servlets/format/sideboxes/ConferenceBox.java b/src/com/silverwrist/venice/servlets/format/sideboxes/ConferenceBox.java index f15f905..316aa51 100644 --- a/src/com/silverwrist/venice/servlets/format/sideboxes/ConferenceBox.java +++ b/src/com/silverwrist/venice/servlets/format/sideboxes/ConferenceBox.java @@ -23,6 +23,7 @@ import org.w3c.dom.*; import com.silverwrist.util.DOMElementHelper; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class ConferenceBox implements SideBoxFactory diff --git a/src/com/silverwrist/venice/servlets/format/sideboxes/JSPSideBoxFactory.java b/src/com/silverwrist/venice/servlets/format/sideboxes/JSPSideBoxFactory.java index 9466e6b..4298efe 100644 --- a/src/com/silverwrist/venice/servlets/format/sideboxes/JSPSideBoxFactory.java +++ b/src/com/silverwrist/venice/servlets/format/sideboxes/JSPSideBoxFactory.java @@ -23,6 +23,7 @@ import org.w3c.dom.*; import com.silverwrist.util.DOMElementHelper; import com.silverwrist.util.StringUtil; import com.silverwrist.venice.core.*; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.*; public class JSPSideBoxFactory implements SideBoxFactory diff --git a/src/com/silverwrist/venice/servlets/format/sideboxes/SideBoxFactory.java b/src/com/silverwrist/venice/servlets/format/sideboxes/SideBoxFactory.java index 8c3521c..e654cac 100644 --- a/src/com/silverwrist/venice/servlets/format/sideboxes/SideBoxFactory.java +++ b/src/com/silverwrist/venice/servlets/format/sideboxes/SideBoxFactory.java @@ -18,12 +18,10 @@ package com.silverwrist.venice.servlets.format.sideboxes; import org.w3c.dom.*; -import com.silverwrist.venice.core.ConfigException; -import com.silverwrist.venice.core.AccessError; -import com.silverwrist.venice.core.DataException; import com.silverwrist.venice.core.SideBoxDescriptor; import com.silverwrist.venice.core.UserContext; import com.silverwrist.venice.core.VeniceEngine; +import com.silverwrist.venice.except.*; import com.silverwrist.venice.servlets.format.VeniceContent; public interface SideBoxFactory