organizing imports

diff --git a/source/OpenMir.java b/source/OpenMir.java
index 2a5b7cc..8fcc1b8 100755 (executable)
--- a/source/OpenMir.java
+++ b/source/OpenMir.java
@@ -40,14 +40,13 @@ import mir.servlet.AbstractServlet;
 import mir.servlet.ServletModuleDispatch;
 import mir.servlet.ServletModuleUserExc;
 import mir.util.ExceptionFunctions;
-import mircoders.global.MirGlobal;
 import mircoders.servlet.ServletModuleOpenIndy;
 
 /**
  *  OpenMir.java - main servlet for open posting and comment feature to articles
  *
  *  @author RK 1999-2001, the mir-coders group
- *  @version $Id: OpenMir.java,v 1.35 2003/05/01 01:42:11 zapata Exp $
+ *  @version $Id: OpenMir.java,v 1.36 2003/06/15 22:59:44 idfx Exp $
  *
  */
 

diff --git a/source/mir/producer/RDFAggregatorProducerNode.java b/source/mir/producer/RDFAggregatorProducerNode.java
index 7d002cf..209f51f 100755 (executable)
--- a/source/mir/producer/RDFAggregatorProducerNode.java
+++ b/source/mir/producer/RDFAggregatorProducerNode.java
@@ -32,7 +32,6 @@ package mir.producer;
 import java.util.*;
 
 import mir.log.LoggerWrapper;
-import mir.rss.RSSData;
 import mir.rss.*;
 import mir.util.ExceptionFunctions;
 import mir.util.ParameterExpander;

diff --git a/source/mir/rss/RSSReader.java b/source/mir/rss/RSSReader.java
index 5a67825..82a9a30 100755 (executable)
--- a/source/mir/rss/RSSReader.java
+++ b/source/mir/rss/RSSReader.java
@@ -78,7 +78,7 @@ public class RSSReader {
     registerModule(new RSSBasicModule(RSS_1_0_NAMESPACE_URI, "RSS 1.0 module"), "rss");
 
     RSSBasicModule dcModule = new RSSBasicModule(DUBLINCORE_NAMESPACE_URI, "Dublin Core RSS module 1.1");
-    dcModule.addProperty("date", dcModule.W3CDTF_PROPERTY_TYPE);
+    dcModule.addProperty("date", RSSBasicModule.W3CDTF_PROPERTY_TYPE);
     registerModule(dcModule, "dc");
 
     registerModule(new RSSBasicModule(EVENT_NAMESPACE_URI, "Event RSS module"), "ev");

diff --git a/source/mircoders/global/Abuse.java b/source/mircoders/global/Abuse.java
index f979598..15d6cca 100755 (executable)
--- a/source/mircoders/global/Abuse.java
+++ b/source/mircoders/global/Abuse.java
@@ -223,7 +223,7 @@ public class Abuse {
       logger.info("checkComment: " + (System.currentTimeMillis()-time) + "ms");
     }
     catch (Throwable t) {
-      t.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));
+      t.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
       logger.error("Abuse.checkComment: " + t.toString());
     }
   }
@@ -243,7 +243,7 @@ public class Abuse {
       logger.info("checkArticle: " + (System.currentTimeMillis()-time) + "ms");
     }
     catch (Throwable t) {
-      t.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));
+      t.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
       logger.error("Abuse.checkArticle: " + t.toString());
     }
   }

diff --git a/source/mircoders/localizer/basic/MirBasicArticlePostingHandler.java b/source/mircoders/localizer/basic/MirBasicArticlePostingHandler.java
index fa13298..7a082a9 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicArticlePostingHandler.java
+++ b/source/mircoders/localizer/basic/MirBasicArticlePostingHandler.java
@@ -44,12 +44,10 @@ import mir.session.Session;
 import mir.session.SessionExc;
 import mir.session.SessionFailure;
 import mir.session.UploadedFile;
-import mir.util.ExceptionFunctions;
 import mircoders.entity.EntityContent;
 import mircoders.global.MirGlobal;
 import mircoders.media.MediaUploadProcessor;
 import mircoders.module.ModuleContent;
-import mircoders.module.ModuleMediaType;
 import mircoders.storage.DatabaseContent;
 import mircoders.storage.DatabaseContentToMedia;
 import mircoders.storage.DatabaseContentToTopics;

diff --git a/source/mircoders/localizer/basic/MirBasicCommentPostingHandler.java b/source/mircoders/localizer/basic/MirBasicCommentPostingHandler.java
index 7707dff..1e243b1 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicCommentPostingHandler.java
+++ b/source/mircoders/localizer/basic/MirBasicCommentPostingHandler.java
@@ -41,12 +41,10 @@ import mir.session.Session;
 import mir.session.SessionExc;
 import mir.session.SessionFailure;
 import mir.session.UploadedFile;
-import mir.util.ExceptionFunctions;
 import mircoders.entity.EntityComment;
 import mircoders.global.MirGlobal;
 import mircoders.media.MediaUploadProcessor;
 import mircoders.module.ModuleComment;
-import mircoders.module.ModuleMediaType;
 import mircoders.storage.DatabaseComment;
 import mircoders.storage.DatabaseCommentToMedia;
 import mircoders.storage.DatabaseContent;

diff --git a/source/mircoders/media/MediaHandlerAudio.java b/source/mircoders/media/MediaHandlerAudio.java
index 05a9c8d..c839eab 100755 (executable)
--- a/source/mircoders/media/MediaHandlerAudio.java
+++ b/source/mircoders/media/MediaHandlerAudio.java
@@ -31,7 +31,6 @@
 package  mircoders.media;
 
 import mir.media.*;
-import mir.entity.*;
 
 /**
  * Handles audio media, like mp3 and maybe it could also handle some other.
@@ -40,7 +39,7 @@ import mir.entity.*;
  * @see mir.media.MediaHandlerGeneric
  * @see mir.media.MirMedia
  * @author mh <mh@nadir.org>
- * @version $Id: MediaHandlerAudio.java,v 1.9 2003/04/29 02:36:50 zapata Exp $
+ * @version $Id: MediaHandlerAudio.java,v 1.10 2003/06/15 22:59:21 idfx Exp $
  */
 
 public class MediaHandlerAudio extends MediaHandlerGeneric implements MirMedia

diff --git a/source/mircoders/media/MediaHandlerGeneric.java b/source/mircoders/media/MediaHandlerGeneric.java
index c8cb194..ecc7fe9 100755 (executable)
--- a/source/mircoders/media/MediaHandlerGeneric.java
+++ b/source/mircoders/media/MediaHandlerGeneric.java
@@ -37,7 +37,7 @@ import javax.servlet.ServletContext;
 import freemarker.template.SimpleList;
 
 import mir.config.MirPropertiesConfiguration;
-import mir.config.MirPropertiesConfiguration$PropertiesConfigExc;
+import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;
 import mir.entity.Entity;
 import mir.log.LoggerWrapper;
 import mir.media.MediaExc;
@@ -64,7 +64,7 @@ import mir.misc.StringUtil;
  *
  * @see mir.media.MirMedia
  * @author mh <mh@nadir.org>
- * @version $Id: MediaHandlerGeneric.java,v 1.20 2003/04/29 02:36:50 zapata Exp $
+ * @version $Id: MediaHandlerGeneric.java,v 1.21 2003/06/15 22:59:21 idfx Exp $
  */
 
 public class MediaHandlerGeneric implements MirMedia

diff --git a/source/mircoders/media/MediaHandlerImagesExtern.java b/source/mircoders/media/MediaHandlerImagesExtern.java
index e8b623a..2d24e83 100755 (executable)
--- a/source/mircoders/media/MediaHandlerImagesExtern.java
+++ b/source/mircoders/media/MediaHandlerImagesExtern.java
@@ -40,7 +40,6 @@ import mir.log.LoggerWrapper;
 import mir.media.MediaExc;
 import mir.media.MediaFailure;
 import mir.misc.StringUtil;
-import mircoders.storage.DatabaseUploadedMedia;
 
 
 /**