From 3a661e8f0f659ab5ed2ac0e4d982ac0b398d11f1 Mon Sep 17 00:00:00 2001 From: rk Date: Wed, 29 Aug 2001 01:41:51 +0000 Subject: [PATCH] mass update mir codeswitch --- source/mircoders/entity/EntityArticleType.java | 6 +- source/mircoders/entity/EntityBreaking.java | 6 +- source/mircoders/entity/EntityComment.java | 6 +- source/mircoders/entity/EntityContent.java | 8 +- source/mircoders/entity/EntityFeature.java | 8 +- source/mircoders/entity/EntityGruppen.java | 8 +- source/mircoders/entity/EntityImage.java | 6 +- source/mircoders/entity/EntityImageColor.java | 6 +- source/mircoders/entity/EntityImageFormat.java | 6 +- source/mircoders/entity/EntityImageLayout.java | 6 +- source/mircoders/entity/EntityImageType.java | 6 +- source/mircoders/entity/EntityLanguage.java | 6 +- source/mircoders/entity/EntityMediafolder.java | 6 +- source/mircoders/entity/EntityMessage.java | 6 +- source/mircoders/entity/EntityRights.java | 6 +- source/mircoders/entity/EntityTopics.java | 8 +- source/mircoders/entity/EntityUsers.java | 6 +- source/mircoders/entity/EntityVideo.java | 6 +- source/mircoders/input/XmlInputParser.java | 6 +- source/mircoders/module/ModuleBreaking.java | 10 +- source/mircoders/module/ModuleComment.java | 11 +- source/mircoders/module/ModuleContent.java | 12 +- source/mircoders/module/ModuleFeature.java | 11 +- source/mircoders/module/ModuleGruppen.java | 11 +- source/mircoders/module/ModuleImages.java | 11 +- source/mircoders/module/ModuleMediafolder.java | 11 +- source/mircoders/module/ModuleMessage.java | 10 +- source/mircoders/module/ModuleSchwerpunkt.java | 14 +- source/mircoders/module/ModuleTopics.java | 11 +- source/mircoders/module/ModuleUsers.java | 12 +- source/mircoders/producer/Producer.java | 12 +- source/mircoders/producer/ProducerAll.java | 12 +- source/mircoders/producer/ProducerContent.java | 432 +++++++++++++-------- source/mircoders/producer/ProducerFeature.java | 12 +- source/mircoders/producer/ProducerImages.java | 9 +- source/mircoders/producer/ProducerList.java | 12 +- source/mircoders/producer/ProducerNavigation.java | 12 +- source/mircoders/producer/ProducerOpenPosting.java | 10 +- source/mircoders/producer/ProducerOverview.java | 12 +- source/mircoders/producer/ProducerStartPage.java | 12 +- source/mircoders/producer/ProducerTopics.java | 11 +- source/mircoders/producer/ProducerWap.java | 12 +- .../mircoders/servlet/ServletModuleBreaking.java | 12 +- source/mircoders/servlet/ServletModuleComment.java | 14 +- source/mircoders/servlet/ServletModuleContent.java | 12 +- source/mircoders/servlet/ServletModuleGroups.java | 14 +- source/mircoders/servlet/ServletModuleImages.java | 16 +- .../servlet/ServletModuleMediafolder.java | 8 +- source/mircoders/servlet/ServletModuleMessage.java | 12 +- .../mircoders/servlet/ServletModuleOpenIndy.java | 16 +- .../mircoders/servlet/ServletModuleProducer.java | 8 +- .../servlet/ServletModuleSchwerpunkt.java | 14 +- source/mircoders/servlet/ServletModuleTopics.java | 14 +- source/mircoders/servlet/ServletModuleUsers.java | 16 +- source/mircoders/storage/DatabaseArticleType.java | 6 +- source/mircoders/storage/DatabaseBreaking.java | 6 +- source/mircoders/storage/DatabaseComment.java | 6 +- source/mircoders/storage/DatabaseContent.java | 8 +- .../mircoders/storage/DatabaseContentToTopics.java | 8 +- source/mircoders/storage/DatabaseFeature.java | 6 +- source/mircoders/storage/DatabaseGroups.java | 6 +- source/mircoders/storage/DatabaseImageColor.java | 6 +- source/mircoders/storage/DatabaseImageFormat.java | 6 +- source/mircoders/storage/DatabaseImageLayout.java | 6 +- source/mircoders/storage/DatabaseImageType.java | 6 +- source/mircoders/storage/DatabaseImages.java | 6 +- source/mircoders/storage/DatabaseLanguage.java | 6 +- source/mircoders/storage/DatabaseMediafolder.java | 6 +- source/mircoders/storage/DatabaseMessages.java | 6 +- source/mircoders/storage/DatabaseRights.java | 6 +- source/mircoders/storage/DatabaseTopics.java | 6 +- source/mircoders/storage/DatabaseUsers.java | 6 +- source/mircoders/storage/DatabaseVideos.java | 6 +- 73 files changed, 594 insertions(+), 484 deletions(-) diff --git a/source/mircoders/entity/EntityArticleType.java b/source/mircoders/entity/EntityArticleType.java index 69ee99f5..60082e21 100755 --- a/source/mircoders/entity/EntityArticleType.java +++ b/source/mircoders/entity/EntityArticleType.java @@ -14,9 +14,9 @@ import java.io.*; import java.util.*; import java.sql.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; +import mir.entity.*; +import mir.misc.*; +import mir.storage.*; public class EntityArticleType extends AbstractEntity implements Entity { diff --git a/source/mircoders/entity/EntityBreaking.java b/source/mircoders/entity/EntityBreaking.java index bb8016f5..12276017 100755 --- a/source/mircoders/entity/EntityBreaking.java +++ b/source/mircoders/entity/EntityBreaking.java @@ -14,9 +14,9 @@ import java.io.*; import java.util.*; import java.sql.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; +import mir.entity.*; +import mir.misc.*; +import mir.storage.*; public class EntityBreaking extends AbstractEntity implements Entity { diff --git a/source/mircoders/entity/EntityComment.java b/source/mircoders/entity/EntityComment.java index 462a636b..4e5aa035 100755 --- a/source/mircoders/entity/EntityComment.java +++ b/source/mircoders/entity/EntityComment.java @@ -5,9 +5,9 @@ import java.io.*; import java.util.*; import java.sql.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; +import mir.entity.*; +import mir.misc.*; +import mir.storage.*; import mir.storage.*; diff --git a/source/mircoders/entity/EntityContent.java b/source/mircoders/entity/EntityContent.java index 0345cea2..e08494ed 100755 --- a/source/mircoders/entity/EntityContent.java +++ b/source/mircoders/entity/EntityContent.java @@ -7,12 +7,12 @@ import java.sql.*; import freemarker.template.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; - +import mir.entity.*; +import mir.misc.*; import mir.storage.*; +import mircoders.storage.*; + /** * this class implements mapping of one line of the database table content * to a java object diff --git a/source/mircoders/entity/EntityFeature.java b/source/mircoders/entity/EntityFeature.java index 5f85c9fd..de1f0de1 100755 --- a/source/mircoders/entity/EntityFeature.java +++ b/source/mircoders/entity/EntityFeature.java @@ -5,11 +5,11 @@ import java.io.*; import java.util.*; import java.sql.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; - +import mir.entity.*; +import mir.misc.*; import mir.storage.*; + +import mircoders.storage.*; /** * Diese Klasse enthält die Daten eines MetaObjekts * diff --git a/source/mircoders/entity/EntityGruppen.java b/source/mircoders/entity/EntityGruppen.java index 7c0a217c..4cc289dd 100755 --- a/source/mircoders/entity/EntityGruppen.java +++ b/source/mircoders/entity/EntityGruppen.java @@ -5,12 +5,12 @@ import java.io.*; import java.util.*; import java.sql.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; - +import mir.entity.*; +import mir.misc.*; import mir.storage.*; +import mircoders.storage.*; + /** * Diese Klasse enthält die Daten eines MetaObjekts * diff --git a/source/mircoders/entity/EntityImage.java b/source/mircoders/entity/EntityImage.java index 6ab1a8f8..7126fbfd 100755 --- a/source/mircoders/entity/EntityImage.java +++ b/source/mircoders/entity/EntityImage.java @@ -5,9 +5,9 @@ import java.io.*; import java.util.*; import java.sql.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; +import mir.entity.*; +import mir.misc.*; +import mir.storage.*; /** * Diese Klasse enthält die Daten eines MetaObjekts diff --git a/source/mircoders/entity/EntityImageColor.java b/source/mircoders/entity/EntityImageColor.java index 0f42e8c3..54da507f 100755 --- a/source/mircoders/entity/EntityImageColor.java +++ b/source/mircoders/entity/EntityImageColor.java @@ -14,9 +14,9 @@ import java.io.*; import java.util.*; import java.sql.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; +import mir.entity.*; +import mir.misc.*; +import mir.storage.*; public class EntityImageColor extends AbstractEntity implements Entity { diff --git a/source/mircoders/entity/EntityImageFormat.java b/source/mircoders/entity/EntityImageFormat.java index 7e2b3bc7..d633fccd 100755 --- a/source/mircoders/entity/EntityImageFormat.java +++ b/source/mircoders/entity/EntityImageFormat.java @@ -5,9 +5,9 @@ import java.io.*; import java.util.*; import java.sql.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; +import mir.entity.*; +import mir.misc.*; +import mir.storage.*; /** * Diese Klasse enthält die Daten eines MetaObjekts diff --git a/source/mircoders/entity/EntityImageLayout.java b/source/mircoders/entity/EntityImageLayout.java index f67591c1..51d8768e 100755 --- a/source/mircoders/entity/EntityImageLayout.java +++ b/source/mircoders/entity/EntityImageLayout.java @@ -5,9 +5,9 @@ import java.io.*; import java.util.*; import java.sql.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; +import mir.entity.*; +import mir.misc.*; +import mir.storage.*; /** * Diese Klasse enthält die Daten eines MetaObjekts diff --git a/source/mircoders/entity/EntityImageType.java b/source/mircoders/entity/EntityImageType.java index d86e6548..d3535aaa 100755 --- a/source/mircoders/entity/EntityImageType.java +++ b/source/mircoders/entity/EntityImageType.java @@ -5,9 +5,9 @@ import java.io.*; import java.util.*; import java.sql.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; +import mir.entity.*; +import mir.misc.*; +import mir.storage.*; /** * Diese Klasse enthält die Daten eines MetaObjekts diff --git a/source/mircoders/entity/EntityLanguage.java b/source/mircoders/entity/EntityLanguage.java index a34ef2a6..4868062a 100755 --- a/source/mircoders/entity/EntityLanguage.java +++ b/source/mircoders/entity/EntityLanguage.java @@ -14,9 +14,9 @@ import java.io.*; import java.util.*; import java.sql.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; +import mir.entity.*; +import mir.misc.*; +import mir.storage.*; public class EntityLanguage extends AbstractEntity implements Entity { diff --git a/source/mircoders/entity/EntityMediafolder.java b/source/mircoders/entity/EntityMediafolder.java index 53a747b8..4a397ab3 100755 --- a/source/mircoders/entity/EntityMediafolder.java +++ b/source/mircoders/entity/EntityMediafolder.java @@ -14,9 +14,9 @@ import java.io.*; import java.util.*; import java.sql.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; +import mir.entity.*; +import mir.misc.*; +import mir.storage.*; import mir.storage.*; diff --git a/source/mircoders/entity/EntityMessage.java b/source/mircoders/entity/EntityMessage.java index a2c96e53..b82da5d7 100755 --- a/source/mircoders/entity/EntityMessage.java +++ b/source/mircoders/entity/EntityMessage.java @@ -14,9 +14,9 @@ import java.io.*; import java.util.*; import java.sql.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; +import mir.entity.*; +import mir.misc.*; +import mir.storage.*; public class EntityMessage extends AbstractEntity implements Entity { diff --git a/source/mircoders/entity/EntityRights.java b/source/mircoders/entity/EntityRights.java index 7cae200c..a7cf82b8 100755 --- a/source/mircoders/entity/EntityRights.java +++ b/source/mircoders/entity/EntityRights.java @@ -5,9 +5,9 @@ import java.io.*; import java.util.*; import java.sql.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; +import mir.entity.*; +import mir.misc.*; +import mir.storage.*; /** * Diese Klasse enthält die Daten eines MetaObjekts diff --git a/source/mircoders/entity/EntityTopics.java b/source/mircoders/entity/EntityTopics.java index 0a736b3d..409e301b 100755 --- a/source/mircoders/entity/EntityTopics.java +++ b/source/mircoders/entity/EntityTopics.java @@ -5,11 +5,11 @@ import java.io.*; import java.util.*; import java.sql.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; - +import mir.entity.*; +import mir.misc.*; import mir.storage.*; + +import mircoders.storage.*; /** * Diese Klasse enthält die Daten eines MetaObjekts * diff --git a/source/mircoders/entity/EntityUsers.java b/source/mircoders/entity/EntityUsers.java index 8e9459b9..6527123f 100755 --- a/source/mircoders/entity/EntityUsers.java +++ b/source/mircoders/entity/EntityUsers.java @@ -5,9 +5,9 @@ import java.io.*; import java.util.*; import java.sql.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; +import mir.entity.*; +import mir.misc.*; +import mir.storage.*; /** * This class is objectmapping of database webdb_users diff --git a/source/mircoders/entity/EntityVideo.java b/source/mircoders/entity/EntityVideo.java index 802fc8f9..2adf427b 100755 --- a/source/mircoders/entity/EntityVideo.java +++ b/source/mircoders/entity/EntityVideo.java @@ -5,9 +5,9 @@ import java.io.*; import java.util.*; import java.sql.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; +import mir.entity.*; +import mir.misc.*; +import mir.storage.*; /** * Diese Klasse enthält die Daten eines MetaObjekts diff --git a/source/mircoders/input/XmlInputParser.java b/source/mircoders/input/XmlInputParser.java index f27902d3..3d851b79 100755 --- a/source/mircoders/input/XmlInputParser.java +++ b/source/mircoders/input/XmlInputParser.java @@ -15,9 +15,9 @@ package mircoders.input; import java.io.*; import java.util.*; import java.lang.reflect.*; -import webdb.misc.*; -import webdb.storage.*; -import webdb.module.*; +import mir.misc.*; +import mir.storage.*; +import mir.module.*; import mir.storage.*; import mir.module.*; import org.xml.sax.*; diff --git a/source/mircoders/module/ModuleBreaking.java b/source/mircoders/module/ModuleBreaking.java index 231b885f..72d70674 100755 --- a/source/mircoders/module/ModuleBreaking.java +++ b/source/mircoders/module/ModuleBreaking.java @@ -9,11 +9,11 @@ import javax.servlet.http.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; +import mir.servlet.*; +import mir.module.*; +import mir.entity.*; +import mir.misc.*; +import mir.storage.*; import mir.entity.*; import mir.storage.*; diff --git a/source/mircoders/module/ModuleComment.java b/source/mircoders/module/ModuleComment.java index e8173f79..5b64cfc7 100755 --- a/source/mircoders/module/ModuleComment.java +++ b/source/mircoders/module/ModuleComment.java @@ -9,15 +9,14 @@ import javax.servlet.http.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; - +import mir.servlet.*; +import mir.module.*; import mir.entity.*; +import mir.misc.*; import mir.storage.*; +import mircoders.storage.*; + /* * ModuleComment - methods and access for comments diff --git a/source/mircoders/module/ModuleContent.java b/source/mircoders/module/ModuleContent.java index b2b16477..b71dc56c 100755 --- a/source/mircoders/module/ModuleContent.java +++ b/source/mircoders/module/ModuleContent.java @@ -6,13 +6,13 @@ import java.sql.*; import javax.servlet.*; import javax.servlet.http.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; - +import mir.servlet.*; +import mir.module.*; import mir.entity.*; +import mir.misc.*; +import mir.storage.*; + +import mircoders.entity.*; /* * ContentObjekt - diff --git a/source/mircoders/module/ModuleFeature.java b/source/mircoders/module/ModuleFeature.java index 0532a7c6..1b29bac8 100755 --- a/source/mircoders/module/ModuleFeature.java +++ b/source/mircoders/module/ModuleFeature.java @@ -9,14 +9,13 @@ import javax.servlet.http.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; - +import mir.servlet.*; +import mir.module.*; import mir.entity.*; +import mir.misc.*; import mir.storage.*; + +import mircoders.storage.*; /* * SchwerpunktObjekt - * diff --git a/source/mircoders/module/ModuleGruppen.java b/source/mircoders/module/ModuleGruppen.java index fbf0e98f..52e8a07b 100755 --- a/source/mircoders/module/ModuleGruppen.java +++ b/source/mircoders/module/ModuleGruppen.java @@ -9,15 +9,14 @@ import javax.servlet.http.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; - +import mir.servlet.*; +import mir.module.*; import mir.entity.*; +import mir.misc.*; import mir.storage.*; +import mircoders.storage.*; + /* * ContentObjekt - diff --git a/source/mircoders/module/ModuleImages.java b/source/mircoders/module/ModuleImages.java index 5910da88..500887e2 100755 --- a/source/mircoders/module/ModuleImages.java +++ b/source/mircoders/module/ModuleImages.java @@ -9,15 +9,14 @@ import javax.servlet.http.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; - +import mir.servlet.*; +import mir.module.*; import mir.entity.*; +import mir.misc.*; import mir.storage.*; +import mircoders.storage.*; + public class ModuleImages extends AbstractModule { static Logfile theLog; diff --git a/source/mircoders/module/ModuleMediafolder.java b/source/mircoders/module/ModuleMediafolder.java index 28420d29..1e6a3cb7 100755 --- a/source/mircoders/module/ModuleMediafolder.java +++ b/source/mircoders/module/ModuleMediafolder.java @@ -18,15 +18,14 @@ import javax.servlet.http.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; - +import mir.servlet.*; +import mir.module.*; import mir.entity.*; +import mir.misc.*; import mir.storage.*; +import mircoders.storage.*; + public class ModuleMediafolder extends AbstractModule { diff --git a/source/mircoders/module/ModuleMessage.java b/source/mircoders/module/ModuleMessage.java index 223f05f2..f67ddfe6 100755 --- a/source/mircoders/module/ModuleMessage.java +++ b/source/mircoders/module/ModuleMessage.java @@ -9,11 +9,11 @@ import javax.servlet.http.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; +import mir.servlet.*; +import mir.module.*; +import mir.entity.*; +import mir.misc.*; +import mir.storage.*; import mir.entity.*; import mir.storage.*; diff --git a/source/mircoders/module/ModuleSchwerpunkt.java b/source/mircoders/module/ModuleSchwerpunkt.java index 4f2330d6..4bcfc8d5 100755 --- a/source/mircoders/module/ModuleSchwerpunkt.java +++ b/source/mircoders/module/ModuleSchwerpunkt.java @@ -9,16 +9,16 @@ import javax.servlet.http.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; - +import mir.servlet.*; +import mir.module.*; import mir.entity.*; +import mir.misc.*; import mir.storage.*; + +import mir.entity.*; +import mircoders.storage.*; /* - * SchwerpunktObjekt - + * Feature - * * * @author RK diff --git a/source/mircoders/module/ModuleTopics.java b/source/mircoders/module/ModuleTopics.java index 837c2e49..7c480256 100755 --- a/source/mircoders/module/ModuleTopics.java +++ b/source/mircoders/module/ModuleTopics.java @@ -9,15 +9,14 @@ import javax.servlet.http.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; - +import mir.servlet.*; +import mir.module.*; import mir.entity.*; +import mir.misc.*; import mir.storage.*; +import mircoders.storage.*; + /* * ThemenModule - * diff --git a/source/mircoders/module/ModuleUsers.java b/source/mircoders/module/ModuleUsers.java index 9ef8a135..f5c46997 100755 --- a/source/mircoders/module/ModuleUsers.java +++ b/source/mircoders/module/ModuleUsers.java @@ -9,15 +9,15 @@ import javax.servlet.http.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.entity.*; -import webdb.misc.*; -import webdb.storage.*; - +import mir.servlet.*; +import mir.module.*; import mir.entity.*; +import mir.misc.*; import mir.storage.*; +import mircoders.entity.*; +import mircoders.storage.*; + /* * Users Module - diff --git a/source/mircoders/producer/Producer.java b/source/mircoders/producer/Producer.java index d4807964..e5df0038 100755 --- a/source/mircoders/producer/Producer.java +++ b/source/mircoders/producer/Producer.java @@ -4,13 +4,13 @@ import java.io.*; import freemarker.template.*; -import webdb.misc.*; -import webdb.storage.*; -import webdb.module.*; - -import mir.module.*; -import mir.entity.*; +import mir.misc.*; import mir.storage.*; +import mir.module.*; + +import mircoders.module.*; +import mircoders.entity.*; +import mircoders.storage.*; abstract public class Producer { diff --git a/source/mircoders/producer/ProducerAll.java b/source/mircoders/producer/ProducerAll.java index c12e7060..d45feb96 100755 --- a/source/mircoders/producer/ProducerAll.java +++ b/source/mircoders/producer/ProducerAll.java @@ -6,14 +6,14 @@ import java.util.*; import freemarker.template.*; -import webdb.misc.*; -import webdb.storage.*; -import webdb.module.*; -import webdb.entity.*; - +import mir.misc.*; +import mir.storage.*; import mir.module.*; import mir.entity.*; -import mir.storage.*; + +import mircoders.module.*; +import mircoders.entity.*; +import mircoders.storage.*; public class ProducerAll extends Producer{ diff --git a/source/mircoders/producer/ProducerContent.java b/source/mircoders/producer/ProducerContent.java index c2a927c6..d773910c 100755 --- a/source/mircoders/producer/ProducerContent.java +++ b/source/mircoders/producer/ProducerContent.java @@ -1,157 +1,277 @@ -package mircoders.producer; - -import java.io.*; -import java.lang.*; -import java.util.*; - -import freemarker.template.*; - -import com.icl.saxon.trax.Transformer; - -import webdb.misc.*; -import webdb.storage.*; -import webdb.module.*; -import webdb.entity.*; - -import mir.module.*; -import mir.entity.*; -import mir.storage.*; - - -public class ProducerContent extends Producer { - - public static void main(String argv[]){ - Configuration.initConfig("config"); - System.out.println(Configuration.getProperty("Producer.DocRoot")); - try { - new ProducerContent().handle(new PrintWriter(System.out), null, false,false); - } catch(Exception e) { System.err.println(e.toString()); } - } - - public void handle(PrintWriter htmlout, EntityUsers user, boolean force, boolean sync) - throws StorageObjectException, ModuleException { - handle(htmlout,user,force,sync,null); - } - - - public void handle(PrintWriter htmlout, EntityUsers user, boolean force, boolean sync, String id) - throws StorageObjectException, ModuleException - { - - String contentTemplate = Configuration.getProperty("Producer.Content.Template"); - int contentBatchsize = Integer.parseInt(Configuration.getProperty("Producer.Content.Batchsize")); - String extLinkName = Configuration.getProperty("Producer.ExtLinkName"); - String intLinkName = Configuration.getProperty("Producer.IntLinkName"); - String mailLinkName = Configuration.getProperty("Producer.MailLinkName"); - String imageRoot = Configuration.getProperty("Producer.ImageRoot"); - - long sessionConnectTime = 0; - long startTime = (new java.util.Date()).getTime(); - String whereClause = " "; - String orderBy = " "; - String htmlFileName = null; - String currentMediaId; - EntityContent currentContent; - EntityList batchEntityList; - HashMap currentContentValues; - SimpleHash imageHash = new SimpleHash(); - EntityGruppen userEntity=null; - - // production of the content-pages - orderBy="date desc, webdb_lastchange desc"; - if(force==true){ - whereClause="is_published='1'"; - - // if true: produces a single content item - if(id !=null){ - whereClause += " AND id="+id; - } - batchEntityList = contentModule.getContent(whereClause, orderBy, 0, contentBatchsize, userEntity); - } else { - whereClause="is_produced='0' AND is_published='1'"; - - //if true produces a single contentitem - if(id !=null){ - whereClause += " AND id="+id; - } - batchEntityList = contentModule.getContent(whereClause, orderBy, 0, contentBatchsize, userEntity); - } - - while (batchEntityList != null) { - for(int i=0;i0){ - temp = StringUtil.createHTML(temp,imageRoot,mailLinkName,extLinkName,intLinkName); - temp = StringUtil.decodeHTMLinTags(temp); - currentContentValues.put("content_data",temp); - } - temp = (String)currentContentValues.get("description"); - if(temp!=null && temp.length()>0){ - temp = StringUtil.createHTML(temp,imageRoot,mailLinkName,extLinkName,intLinkName); - temp = StringUtil.decodeHTMLinTags(temp); - currentContentValues.put("description",temp); - } - } else { - String temp = (String)currentContentValues.get("content_data"); - if(temp!=null && temp.length()>0){ - temp = StringUtil.decodeHTMLinTags(temp); - currentContentValues.put("content_data",temp); - } - temp = (String)currentContentValues.get("description"); - if(temp!=null && temp.length()>0){ - temp = StringUtil.decodeHTMLinTags(temp); - currentContentValues.put("description",temp); - } - } - - SimpleHash mergeData = HTMLTemplateProcessor.makeSimpleHash(currentContentValues); - - // get the images - currentMediaId = currentContent.getValue("to_media"); - if (currentMediaId!=null && !currentMediaId.equals("")) { - imageHash.put(currentMediaId, HTMLTemplateProcessor.makeSimpleHash(imageModule.getById(currentMediaId))); - } - mergeData.put("images", imageHash); - - // get the comments for the article - mergeData.put("comments", currentContent.getComments()); - - // get the topics of this article - mergeData.put("topics",HTMLTemplateProcessor.makeSimpleList(DatabaseContentToTopics.getInstance().getTopics(currentContent))); - - boolean retVal = produce(contentTemplate, htmlFileName, mergeData, htmlout); - sessionConnectTime = new java.util.Date().getTime() - startTime; - if (retVal == true && !"1".equals(currentContent.getValue("is_produced"))) - currentContent.setProduced(true); - } - if (batchEntityList.hasNextBatch()){ - batchEntityList = contentModule.getContent(whereClause, orderBy, batchEntityList.getNextBatch(),contentBatchsize, userEntity); - //theLog.printDebugInfo("producing next batch"); - } else { - batchEntityList=null; - } - } - // Finish - sessionConnectTime = new java.util.Date().getTime() - startTime; - logHTML(htmlout, "Producer.Content finished: " + sessionConnectTime + " ms."); - - } - +package mircoders.producer; + +import java.io.*; +import java.lang.*; +import java.util.*; + + +import freemarker.template.*; + +import com.icl.saxon.trax.Transformer; + +import mir.misc.*; +import mir.storage.*; +import mir.module.*; +import mir.entity.*; + +import mircoders.entity.*; +import mircoders.storage.*; + + +public class ProducerContent extends Producer { + + + + public static void main(String argv[]){ + + Configuration.initConfig("config"); + + System.out.println(Configuration.getProperty("Producer.DocRoot")); + + try { + + new ProducerContent().handle(new PrintWriter(System.out), null, false,false); + + } catch(Exception e) { System.err.println(e.toString()); } + + } + + + + public void handle(PrintWriter htmlout, EntityUsers user, boolean force, boolean sync) + + throws StorageObjectException, ModuleException { + + handle(htmlout,user,force,sync,null); + + } + + + + + + public void handle(PrintWriter htmlout, EntityUsers user, boolean force, boolean sync, String id) + + throws StorageObjectException, ModuleException + + { + + + + String contentTemplate = Configuration.getProperty("Producer.Content.Template"); + + int contentBatchsize = Integer.parseInt(Configuration.getProperty("Producer.Content.Batchsize")); + + String extLinkName = Configuration.getProperty("Producer.ExtLinkName"); + + String intLinkName = Configuration.getProperty("Producer.IntLinkName"); + + String mailLinkName = Configuration.getProperty("Producer.MailLinkName"); + + String imageRoot = Configuration.getProperty("Producer.ImageRoot"); + + long sessionConnectTime = 0; + long startTime = (new java.util.Date()).getTime(); + String whereClause = " "; + String orderBy = " "; + String htmlFileName = null; + String currentMediaId; + EntityContent currentContent; + EntityList batchEntityList; + + HashMap currentContentValues; + + SimpleHash imageHash = new SimpleHash(); + + EntityGruppen userEntity=null; + + + + // production of the content-pages + + orderBy="date desc, webdb_lastchange desc"; + + if(force==true){ + + whereClause="is_published='1'"; + + + + // if true: produces a single content item + + if(id !=null){ + + whereClause += " AND id="+id; + + } + + batchEntityList = contentModule.getContent(whereClause, orderBy, 0, contentBatchsize, userEntity); + + } else { + + whereClause="is_produced='0' AND is_published='1'"; + + + + //if true produces a single contentitem + + if(id !=null){ + + whereClause += " AND id="+id; + + } + + batchEntityList = contentModule.getContent(whereClause, orderBy, 0, contentBatchsize, userEntity); + + } + + + + while (batchEntityList != null) { + + for(int i=0;i0){ + + temp = StringUtil.createHTML(temp,imageRoot,mailLinkName,extLinkName,intLinkName); + + temp = StringUtil.decodeHTMLinTags(temp); + + currentContentValues.put("content_data",temp); + + } + + temp = (String)currentContentValues.get("description"); + + if(temp!=null && temp.length()>0){ + + temp = StringUtil.createHTML(temp,imageRoot,mailLinkName,extLinkName,intLinkName); + + temp = StringUtil.decodeHTMLinTags(temp); + + currentContentValues.put("description",temp); + + } + + } else { + + String temp = (String)currentContentValues.get("content_data"); + + if(temp!=null && temp.length()>0){ + + temp = StringUtil.decodeHTMLinTags(temp); + + currentContentValues.put("content_data",temp); + + } + + temp = (String)currentContentValues.get("description"); + + if(temp!=null && temp.length()>0){ + + temp = StringUtil.decodeHTMLinTags(temp); + + currentContentValues.put("description",temp); + + } + + } + + + + SimpleHash mergeData = HTMLTemplateProcessor.makeSimpleHash(currentContentValues); + + + + // get the images + + currentMediaId = currentContent.getValue("to_media"); + + if (currentMediaId!=null && !currentMediaId.equals("")) { + + imageHash.put(currentMediaId, HTMLTemplateProcessor.makeSimpleHash(imageModule.getById(currentMediaId))); + + } + + mergeData.put("images", imageHash); + + + + // get the comments for the article + + mergeData.put("comments", currentContent.getComments()); + + + + // get the topics of this article + mergeData.put("topics",HTMLTemplateProcessor.makeSimpleList(DatabaseContentToTopics.getInstance().getTopics(currentContent))); + + boolean retVal = produce(contentTemplate, htmlFileName, mergeData, htmlout); + sessionConnectTime = new java.util.Date().getTime() - startTime; + if (retVal == true && !"1".equals(currentContent.getValue("is_produced"))) + currentContent.setProduced(true); + } + + if (batchEntityList.hasNextBatch()){ + + batchEntityList = contentModule.getContent(whereClause, orderBy, batchEntityList.getNextBatch(),contentBatchsize, userEntity); + + //theLog.printDebugInfo("producing next batch"); + + } else { + + batchEntityList=null; + + } + + } + + // Finish + + sessionConnectTime = new java.util.Date().getTime() - startTime; + + logHTML(htmlout, "Producer.Content finished: " + sessionConnectTime + " ms."); + + + + } + + + } \ No newline at end of file diff --git a/source/mircoders/producer/ProducerFeature.java b/source/mircoders/producer/ProducerFeature.java index 3df75f93..d62c1f3d 100755 --- a/source/mircoders/producer/ProducerFeature.java +++ b/source/mircoders/producer/ProducerFeature.java @@ -7,14 +7,14 @@ import java.sql.*; import freemarker.template.*; -import webdb.misc.*; -import webdb.storage.*; -import webdb.module.*; -import webdb.entity.*; - +import mir.misc.*; +import mir.storage.*; import mir.module.*; import mir.entity.*; -import mir.storage.*; + +import mircoders.module.*; +import mircoders.entity.*; +import mircoders.storage.*; diff --git a/source/mircoders/producer/ProducerImages.java b/source/mircoders/producer/ProducerImages.java index 526ae37b..760aebc4 100755 --- a/source/mircoders/producer/ProducerImages.java +++ b/source/mircoders/producer/ProducerImages.java @@ -6,13 +6,12 @@ import java.util.*; import freemarker.template.*; -import webdb.misc.*; -import webdb.storage.*; -import webdb.module.*; -import webdb.entity.*; - +import mir.misc.*; +import mir.storage.*; import mir.module.*; import mir.entity.*; + +import mircoders.entity.*; import mir.storage.*; diff --git a/source/mircoders/producer/ProducerList.java b/source/mircoders/producer/ProducerList.java index ff8aa708..af8bc7de 100755 --- a/source/mircoders/producer/ProducerList.java +++ b/source/mircoders/producer/ProducerList.java @@ -7,14 +7,14 @@ import java.sql.*; import freemarker.template.*; -import webdb.misc.*; -import webdb.storage.*; -import webdb.module.*; -import webdb.entity.*; - +import mir.misc.*; +import mir.storage.*; import mir.module.*; import mir.entity.*; -import mir.storage.*; + +import mircoders.module.*; +import mircoders.entity.*; +import mircoders.storage.*; diff --git a/source/mircoders/producer/ProducerNavigation.java b/source/mircoders/producer/ProducerNavigation.java index a26bbe78..1c6cd17f 100755 --- a/source/mircoders/producer/ProducerNavigation.java +++ b/source/mircoders/producer/ProducerNavigation.java @@ -6,15 +6,13 @@ import java.util.*; import freemarker.template.*; -import webdb.misc.*; -import webdb.storage.*; -import webdb.module.*; -import webdb.entity.*; - -import mir.module.*; +import mir.misc.*; import mir.storage.*; +import mir.module.*; import mir.entity.*; +import mircoders.entity.*; + /** * Title: mir - another content management system * Description: @@ -29,7 +27,7 @@ public class ProducerNavigation extends Producer { private static String naviPageTemplate = Configuration.getProperty("Producer.Navigation.Template"); public void handle(PrintWriter htmlout, EntityUsers user, boolean forced, boolean sync) - throws webdb.module.ModuleException, webdb.storage.StorageObjectException { + throws mir.module.ModuleException, mir.storage.StorageObjectException { printHTML(htmlout, "Producer.Navigation: started"); diff --git a/source/mircoders/producer/ProducerOpenPosting.java b/source/mircoders/producer/ProducerOpenPosting.java index 247d553f..a42f3ee9 100755 --- a/source/mircoders/producer/ProducerOpenPosting.java +++ b/source/mircoders/producer/ProducerOpenPosting.java @@ -7,13 +7,13 @@ import java.sql.*; import freemarker.template.*; -import webdb.misc.*; -import webdb.storage.*; -import webdb.module.*; -import webdb.entity.*; - +import mir.misc.*; +import mir.storage.*; import mir.module.*; import mir.entity.*; + +import mir.module.*; +import mircoders.entity.*; import mir.storage.*; diff --git a/source/mircoders/producer/ProducerOverview.java b/source/mircoders/producer/ProducerOverview.java index 45c1edec..4604686e 100755 --- a/source/mircoders/producer/ProducerOverview.java +++ b/source/mircoders/producer/ProducerOverview.java @@ -7,14 +7,14 @@ import java.sql.*; import freemarker.template.*; -import webdb.misc.*; -import webdb.storage.*; -import webdb.module.*; -import webdb.entity.*; - +import mir.misc.*; +import mir.storage.*; import mir.module.*; import mir.entity.*; -import mir.storage.*; + +import mircoders.module.*; +import mircoders.entity.*; +import mircoders.storage.*; diff --git a/source/mircoders/producer/ProducerStartPage.java b/source/mircoders/producer/ProducerStartPage.java index 20248da4..5c69f205 100755 --- a/source/mircoders/producer/ProducerStartPage.java +++ b/source/mircoders/producer/ProducerStartPage.java @@ -6,15 +6,15 @@ import java.util.*; import freemarker.template.*; -import webdb.misc.*; -import webdb.storage.*; -import webdb.module.*; -import webdb.entity.*; - -import mir.module.*; +import mir.misc.*; import mir.storage.*; +import mir.module.*; import mir.entity.*; +import mircoders.module.*; +import mircoders.storage.*; +import mircoders.entity.*; + public class ProducerStartPage extends Producer { diff --git a/source/mircoders/producer/ProducerTopics.java b/source/mircoders/producer/ProducerTopics.java index 55974426..e357ad41 100755 --- a/source/mircoders/producer/ProducerTopics.java +++ b/source/mircoders/producer/ProducerTopics.java @@ -7,14 +7,13 @@ import java.sql.*; import freemarker.template.*; -import webdb.misc.*; -import webdb.storage.*; -import webdb.module.*; -import webdb.entity.*; - +import mir.misc.*; +import mir.storage.*; import mir.module.*; import mir.entity.*; -import mir.storage.*; + +import mircoders.entity.*; +import mircoders.storage.*; diff --git a/source/mircoders/producer/ProducerWap.java b/source/mircoders/producer/ProducerWap.java index 68ff47f8..fc186c71 100755 --- a/source/mircoders/producer/ProducerWap.java +++ b/source/mircoders/producer/ProducerWap.java @@ -6,15 +6,15 @@ import java.util.*; import freemarker.template.*; -import webdb.misc.*; -import webdb.storage.*; -import webdb.module.*; -import webdb.entity.*; - -import mir.module.*; +import mir.misc.*; import mir.storage.*; +import mir.module.*; import mir.entity.*; +import mircoders.module.*; +import mircoders.storage.*; +import mircoders.entity.*; + public class ProducerWap extends Producer { diff --git a/source/mircoders/servlet/ServletModuleBreaking.java b/source/mircoders/servlet/ServletModuleBreaking.java index b31c7f0b..cd7d74e4 100755 --- a/source/mircoders/servlet/ServletModuleBreaking.java +++ b/source/mircoders/servlet/ServletModuleBreaking.java @@ -5,13 +5,13 @@ import java.net.*; import javax.servlet.http.*; import javax.servlet.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.misc.*; -import webdb.entity.*; -import webdb.storage.*; -import webdb.module.*; -import mir.module.*; +import mir.servlet.*; +import mir.misc.*; +import mir.entity.*; import mir.storage.*; +import mir.module.*; +import mircoders.module.*; +import mircoders.storage.*; /* * ServletModuleBreaking - diff --git a/source/mircoders/servlet/ServletModuleComment.java b/source/mircoders/servlet/ServletModuleComment.java index 3c1c6e4b..319ba100 100755 --- a/source/mircoders/servlet/ServletModuleComment.java +++ b/source/mircoders/servlet/ServletModuleComment.java @@ -9,15 +9,15 @@ import javax.servlet.http.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.misc.*; -import webdb.entity.*; -import webdb.storage.*; - +import mir.servlet.*; +import mir.module.*; +import mir.misc.*; import mir.entity.*; import mir.storage.*; -import mir.module.*; + +import mir.entity.*; +import mircoders.storage.*; +import mircoders.module.*; /* * ServletModuleComment - controls navigation for Comments diff --git a/source/mircoders/servlet/ServletModuleContent.java b/source/mircoders/servlet/ServletModuleContent.java index b70c29c1..658206ab 100755 --- a/source/mircoders/servlet/ServletModuleContent.java +++ b/source/mircoders/servlet/ServletModuleContent.java @@ -10,14 +10,14 @@ import javax.servlet.http.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.misc.*; -import webdb.entity.*; -import webdb.storage.*; +import mir.servlet.*; +import mircoders.module.*; +import mir.misc.*; +import mircoders.entity.*; +import mir.storage.*; import mir.entity.*; -import mir.storage.*; +import mircoders.storage.*; import mir.module.*; /* diff --git a/source/mircoders/servlet/ServletModuleGroups.java b/source/mircoders/servlet/ServletModuleGroups.java index ab895cbe..a8497ea2 100755 --- a/source/mircoders/servlet/ServletModuleGroups.java +++ b/source/mircoders/servlet/ServletModuleGroups.java @@ -6,15 +6,15 @@ import java.util.*; import javax.servlet.*; import javax.servlet.http.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.misc.*; -import webdb.entity.*; -import webdb.storage.*; - +import mir.servlet.*; +import mir.module.*; +import mir.misc.*; import mir.entity.*; import mir.storage.*; -import mir.module.*; + +import mircoders.entity.*; +import mircoders.storage.*; +import mircoders.module.*; /* * ServletModuleGruppen - diff --git a/source/mircoders/servlet/ServletModuleImages.java b/source/mircoders/servlet/ServletModuleImages.java index 8159cc4a..0f063807 100755 --- a/source/mircoders/servlet/ServletModuleImages.java +++ b/source/mircoders/servlet/ServletModuleImages.java @@ -11,15 +11,15 @@ import freemarker.template.*; import com.oreilly.servlet.multipart.*; import com.oreilly.servlet.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.misc.*; -import webdb.entity.*; -import webdb.storage.*; - +import mir.servlet.*; +import mir.module.*; +import mir.misc.*; import mir.entity.*; import mir.storage.*; -import mir.module.*; + +import mircoders.entity.*; +import mircoders.storage.*; +import mircoders.module.*; /* * ServletModuleBilder - @@ -29,7 +29,7 @@ import mir.module.*; * @author RK */ -public class ServletModuleImages extends webdb.servlet.ServletModule +public class ServletModuleImages extends mir.servlet.ServletModule { private static ModuleMediafolder mediafolderModule; diff --git a/source/mircoders/servlet/ServletModuleMediafolder.java b/source/mircoders/servlet/ServletModuleMediafolder.java index 711ad3c1..43501871 100755 --- a/source/mircoders/servlet/ServletModuleMediafolder.java +++ b/source/mircoders/servlet/ServletModuleMediafolder.java @@ -11,11 +11,11 @@ import java.util.*; import javax.servlet.http.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.misc.*; -import webdb.storage.*; +import mir.servlet.*; +import mir.misc.*; import mir.storage.*; -import mir.module.*; +import mircoders.storage.*; +import mircoders.module.*; public class ServletModuleMediafolder extends ServletModule diff --git a/source/mircoders/servlet/ServletModuleMessage.java b/source/mircoders/servlet/ServletModuleMessage.java index b065a91b..512e3918 100755 --- a/source/mircoders/servlet/ServletModuleMessage.java +++ b/source/mircoders/servlet/ServletModuleMessage.java @@ -5,13 +5,13 @@ import java.net.*; import javax.servlet.http.*; import javax.servlet.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.misc.*; -import webdb.entity.*; -import webdb.storage.*; -import webdb.module.*; -import mir.module.*; +import mir.servlet.*; +import mir.misc.*; +import mir.entity.*; import mir.storage.*; +import mir.module.*; +import mircoders.module.*; +import mircoders.storage.*; /** * Title: ServletModuleMessage diff --git a/source/mircoders/servlet/ServletModuleOpenIndy.java b/source/mircoders/servlet/ServletModuleOpenIndy.java index 6452a7eb..5d14c4af 100755 --- a/source/mircoders/servlet/ServletModuleOpenIndy.java +++ b/source/mircoders/servlet/ServletModuleOpenIndy.java @@ -10,16 +10,16 @@ import freemarker.template.*; import com.oreilly.servlet.multipart.*; import com.oreilly.servlet.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.misc.*; -import webdb.entity.*; -import webdb.storage.*; - +import mir.servlet.*; +import mir.module.*; +import mir.misc.*; import mir.entity.*; import mir.storage.*; -import mir.module.*; -import mir.producer.*; + +import mircoders.entity.*; +import mircoders.storage.*; +import mircoders.module.*; +import mircoders.producer.*; /* * ServletModuleOpenIndy - diff --git a/source/mircoders/servlet/ServletModuleProducer.java b/source/mircoders/servlet/ServletModuleProducer.java index 30957ed9..10e927c8 100755 --- a/source/mircoders/servlet/ServletModuleProducer.java +++ b/source/mircoders/servlet/ServletModuleProducer.java @@ -8,11 +8,11 @@ import javax.servlet.http.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.misc.*; +import mir.servlet.*; +import mir.misc.*; -import mir.producer.*; -import mir.entity.*; +import mircoders.producer.*; +import mircoders.entity.*; /* Verteilerservlet, dass je nach Parameter task die Klasse Producer"TASK" * ueber die Methode handle(); aufruft diff --git a/source/mircoders/servlet/ServletModuleSchwerpunkt.java b/source/mircoders/servlet/ServletModuleSchwerpunkt.java index 234be0a5..8b7645e5 100755 --- a/source/mircoders/servlet/ServletModuleSchwerpunkt.java +++ b/source/mircoders/servlet/ServletModuleSchwerpunkt.java @@ -8,15 +8,15 @@ import javax.servlet.http.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.misc.*; -import webdb.entity.*; -import webdb.storage.*; - +import mir.servlet.*; +import mir.module.*; +import mir.misc.*; import mir.entity.*; import mir.storage.*; -import mir.module.*; + +import mircoders.entity.*; +import mircoders.storage.*; +import mircoders.module.*; /* * ServletModuleSchwerpunkt - diff --git a/source/mircoders/servlet/ServletModuleTopics.java b/source/mircoders/servlet/ServletModuleTopics.java index 3df42f09..3b408126 100755 --- a/source/mircoders/servlet/ServletModuleTopics.java +++ b/source/mircoders/servlet/ServletModuleTopics.java @@ -6,15 +6,15 @@ import java.util.*; import javax.servlet.*; import javax.servlet.http.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.misc.*; -import webdb.entity.*; -import webdb.storage.*; - +import mir.servlet.*; +import mir.module.*; +import mir.misc.*; import mir.entity.*; import mir.storage.*; -import mir.module.*; + +import mircoders.entity.*; +import mircoders.storage.*; +import mircoders.module.*; /* * ServletModuleThemen - diff --git a/source/mircoders/servlet/ServletModuleUsers.java b/source/mircoders/servlet/ServletModuleUsers.java index 163f674f..e487513d 100755 --- a/source/mircoders/servlet/ServletModuleUsers.java +++ b/source/mircoders/servlet/ServletModuleUsers.java @@ -8,15 +8,15 @@ import javax.servlet.http.*; import freemarker.template.*; -import webdb.servlet.*; -import webdb.module.*; -import webdb.misc.*; -import webdb.entity.*; -import webdb.storage.*; - +import mir.servlet.*; +import mir.module.*; +import mir.misc.*; import mir.entity.*; import mir.storage.*; -import mir.module.*; + +import mircoders.entity.*; +import mircoders.storage.*; +import mircoders.module.*; /* * ServletModuleUsers - @@ -26,7 +26,7 @@ import mir.module.*; * @author RK */ -public class ServletModuleUsers extends webdb.servlet.ServletModule +public class ServletModuleUsers extends mir.servlet.ServletModule { // Singelton / Kontruktor private static ServletModuleUsers instance = new ServletModuleUsers(); diff --git a/source/mircoders/storage/DatabaseArticleType.java b/source/mircoders/storage/DatabaseArticleType.java index e7119e7b..12eef866 100755 --- a/source/mircoders/storage/DatabaseArticleType.java +++ b/source/mircoders/storage/DatabaseArticleType.java @@ -16,9 +16,9 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; +import mir.storage.*; +import mir.entity.*; +import mir.misc.*; public class DatabaseArticleType extends Database implements StorageObject{ diff --git a/source/mircoders/storage/DatabaseBreaking.java b/source/mircoders/storage/DatabaseBreaking.java index 1a8790af..2a9ad581 100755 --- a/source/mircoders/storage/DatabaseBreaking.java +++ b/source/mircoders/storage/DatabaseBreaking.java @@ -7,9 +7,9 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; +import mir.storage.*; +import mir.entity.*; +import mir.misc.*; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseComment.java b/source/mircoders/storage/DatabaseComment.java index 7787a58e..d819b114 100755 --- a/source/mircoders/storage/DatabaseComment.java +++ b/source/mircoders/storage/DatabaseComment.java @@ -7,9 +7,9 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; +import mir.storage.*; +import mir.entity.*; +import mir.misc.*; /** * This class implements the access to the comment-table for the diff --git a/source/mircoders/storage/DatabaseContent.java b/source/mircoders/storage/DatabaseContent.java index 7725d970..63468268 100755 --- a/source/mircoders/storage/DatabaseContent.java +++ b/source/mircoders/storage/DatabaseContent.java @@ -7,11 +7,11 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; - +import mir.storage.*; import mir.entity.*; +import mir.misc.*; + +import mircoders.entity.*; /** * this class implements the access to the content-table diff --git a/source/mircoders/storage/DatabaseContentToTopics.java b/source/mircoders/storage/DatabaseContentToTopics.java index fadadf89..073ecd28 100755 --- a/source/mircoders/storage/DatabaseContentToTopics.java +++ b/source/mircoders/storage/DatabaseContentToTopics.java @@ -7,11 +7,11 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; - +import mir.storage.*; import mir.entity.*; +import mir.misc.*; + +import mircoders.entity.*; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseFeature.java b/source/mircoders/storage/DatabaseFeature.java index e51bbf76..6c4eff78 100755 --- a/source/mircoders/storage/DatabaseFeature.java +++ b/source/mircoders/storage/DatabaseFeature.java @@ -7,9 +7,9 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; +import mir.storage.*; +import mir.entity.*; +import mir.misc.*; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseGroups.java b/source/mircoders/storage/DatabaseGroups.java index 666fcd2d..9d69b21e 100755 --- a/source/mircoders/storage/DatabaseGroups.java +++ b/source/mircoders/storage/DatabaseGroups.java @@ -7,9 +7,9 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; +import mir.storage.*; +import mir.entity.*; +import mir.misc.*; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseImageColor.java b/source/mircoders/storage/DatabaseImageColor.java index 15200f86..05b895cf 100755 --- a/source/mircoders/storage/DatabaseImageColor.java +++ b/source/mircoders/storage/DatabaseImageColor.java @@ -7,9 +7,9 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; +import mir.storage.*; +import mir.entity.*; +import mir.misc.*; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseImageFormat.java b/source/mircoders/storage/DatabaseImageFormat.java index 0616549d..854c406b 100755 --- a/source/mircoders/storage/DatabaseImageFormat.java +++ b/source/mircoders/storage/DatabaseImageFormat.java @@ -7,9 +7,9 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; +import mir.storage.*; +import mir.entity.*; +import mir.misc.*; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseImageLayout.java b/source/mircoders/storage/DatabaseImageLayout.java index 3151bcc6..cb2a736e 100755 --- a/source/mircoders/storage/DatabaseImageLayout.java +++ b/source/mircoders/storage/DatabaseImageLayout.java @@ -7,9 +7,9 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; +import mir.storage.*; +import mir.entity.*; +import mir.misc.*; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseImageType.java b/source/mircoders/storage/DatabaseImageType.java index b74df246..ca159cd8 100755 --- a/source/mircoders/storage/DatabaseImageType.java +++ b/source/mircoders/storage/DatabaseImageType.java @@ -7,9 +7,9 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; +import mir.storage.*; +import mir.entity.*; +import mir.misc.*; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseImages.java b/source/mircoders/storage/DatabaseImages.java index 8890c0d7..b14b0c02 100755 --- a/source/mircoders/storage/DatabaseImages.java +++ b/source/mircoders/storage/DatabaseImages.java @@ -7,9 +7,9 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; +import mir.storage.*; +import mir.entity.*; +import mir.misc.*; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseLanguage.java b/source/mircoders/storage/DatabaseLanguage.java index 221ffffc..f6c39725 100755 --- a/source/mircoders/storage/DatabaseLanguage.java +++ b/source/mircoders/storage/DatabaseLanguage.java @@ -16,9 +16,9 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; +import mir.storage.*; +import mir.entity.*; +import mir.misc.*; public class DatabaseLanguage extends Database implements StorageObject{ diff --git a/source/mircoders/storage/DatabaseMediafolder.java b/source/mircoders/storage/DatabaseMediafolder.java index e6377ea5..d2609f75 100755 --- a/source/mircoders/storage/DatabaseMediafolder.java +++ b/source/mircoders/storage/DatabaseMediafolder.java @@ -16,9 +16,9 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; +import mir.storage.*; +import mir.entity.*; +import mir.misc.*; diff --git a/source/mircoders/storage/DatabaseMessages.java b/source/mircoders/storage/DatabaseMessages.java index 0950f90b..9878c794 100755 --- a/source/mircoders/storage/DatabaseMessages.java +++ b/source/mircoders/storage/DatabaseMessages.java @@ -7,9 +7,9 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; +import mir.storage.*; +import mir.entity.*; +import mir.misc.*; /** diff --git a/source/mircoders/storage/DatabaseRights.java b/source/mircoders/storage/DatabaseRights.java index 39906fcc..638449eb 100755 --- a/source/mircoders/storage/DatabaseRights.java +++ b/source/mircoders/storage/DatabaseRights.java @@ -7,9 +7,9 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; +import mir.storage.*; +import mir.entity.*; +import mir.misc.*; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseTopics.java b/source/mircoders/storage/DatabaseTopics.java index 55731a5f..5814b9b6 100755 --- a/source/mircoders/storage/DatabaseTopics.java +++ b/source/mircoders/storage/DatabaseTopics.java @@ -7,9 +7,9 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; +import mir.storage.*; +import mir.entity.*; +import mir.misc.*; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseUsers.java b/source/mircoders/storage/DatabaseUsers.java index 03e38d77..edd53625 100755 --- a/source/mircoders/storage/DatabaseUsers.java +++ b/source/mircoders/storage/DatabaseUsers.java @@ -7,9 +7,9 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; +import mir.storage.*; +import mir.entity.*; +import mir.misc.*; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseVideos.java b/source/mircoders/storage/DatabaseVideos.java index 2cfa8e55..29d4662e 100755 --- a/source/mircoders/storage/DatabaseVideos.java +++ b/source/mircoders/storage/DatabaseVideos.java @@ -7,9 +7,9 @@ import java.util.*; import freemarker.template.*; -import webdb.storage.*; -import webdb.entity.*; -import webdb.misc.*; +import mir.storage.*; +import mir.entity.*; +import mir.misc.*; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle -- 2.11.0