From d90c1bbdd5e1823253436f24dce80de4f0abbfcb Mon Sep 17 00:00:00 2001 From: idfx Date: Sat, 25 Jan 2003 17:50:34 +0000 Subject: [PATCH] code cleaning, new config --- source/Mir.java | 86 ++++---- source/OpenMir.java | 61 +++--- source/mircoders/entity/EntityAudio.java | 26 +-- source/mircoders/entity/EntityBreaking.java | 9 +- source/mircoders/entity/EntityComment.java | 16 +- source/mircoders/entity/EntityContent.java | 86 ++++---- source/mircoders/entity/EntityFeature.java | 18 +- source/mircoders/entity/EntityImages.java | 46 +++-- source/mircoders/entity/EntityLinksImcs.java | 11 +- source/mircoders/entity/EntityMedia.java | 31 ++- source/mircoders/entity/EntityOther.java | 24 +-- source/mircoders/entity/EntityTopics.java | 14 +- source/mircoders/entity/EntityUploadedMedia.java | 33 ++-- source/mircoders/entity/EntityUsers.java | 6 +- source/mircoders/entity/EntityVideo.java | 15 +- source/mircoders/global/JobQueue.java | 8 +- source/mircoders/global/MirGlobal.java | 34 ++-- source/mircoders/global/ProducerEngine.java | 18 +- source/mircoders/input/XmlFilenameFilter.java | 4 +- source/mircoders/input/XmlHandler.java | 7 +- .../localizer/MirAdminInterfaceLocalizer.java | 7 +- .../mircoders/localizer/MirDataModelLocalizer.java | 2 +- .../mircoders/localizer/MirGeneratorLocalizer.java | 3 +- .../localizer/MirOpenPostingLocalizer.java | 6 +- .../localizer/MirProducerAssistantLocalizer.java | 3 +- .../mircoders/localizer/MirProducerLocalizer.java | 1 + .../basic/MirBasicAdminInterfaceLocalizer.java | 58 +++--- .../basic/MirBasicDataModelLocalizer.java | 47 ++++- .../basic/MirBasicGeneratorLocalizer.java | 14 +- .../localizer/basic/MirBasicLocalizer.java | 12 +- .../basic/MirBasicOpenPostingLocalizer.java | 17 +- .../basic/MirBasicProducerAssistantLocalizer.java | 40 ++-- .../localizer/basic/MirBasicProducerLocalizer.java | 42 ++-- .../localizer/basic/MirBasicWriterEngine.java | 11 +- source/mircoders/media/ImageProcessor.java | 22 ++- source/mircoders/media/MediaHandlerAudio.java | 19 +- source/mircoders/media/MediaHandlerGeneric.java | 53 +++-- source/mircoders/media/MediaHandlerImages.java | 57 +++--- .../mircoders/media/MediaHandlerImagesExtern.java | 35 ++-- source/mircoders/media/MediaHandlerImagesJpeg.java | 4 +- source/mircoders/media/MediaHandlerImagesPng.java | 4 +- source/mircoders/media/MediaHandlerMp3.java | 15 +- source/mircoders/media/MediaHandlerRealAudio.java | 25 ++- source/mircoders/media/MediaHandlerRealVideo.java | 25 ++- source/mircoders/media/MediaHandlerVideo.java | 19 +- source/mircoders/media/MediaRequest.java | 41 ++-- source/mircoders/module/ModuleArticleType.java | 20 +- source/mircoders/module/ModuleBreaking.java | 19 +- source/mircoders/module/ModuleComment.java | 39 ++-- source/mircoders/module/ModuleCommentStatus.java | 20 +- source/mircoders/module/ModuleContent.java | 41 ++-- source/mircoders/module/ModuleFeature.java | 26 +-- source/mircoders/module/ModuleImages.java | 27 +-- source/mircoders/module/ModuleLanguage.java | 20 +- source/mircoders/module/ModuleLinksImcs.java | 23 +-- source/mircoders/module/ModuleMediafolder.java | 23 +-- source/mircoders/module/ModuleMessage.java | 18 +- source/mircoders/module/ModuleSchwerpunkt.java | 26 +-- source/mircoders/module/ModuleTopics.java | 13 +- source/mircoders/module/ModuleUploadedMedia.java | 20 +- source/mircoders/module/ModuleUsers.java | 32 ++- source/mircoders/producer/CompositeProducer.java | 11 +- .../producer/CompositeProducerFactory.java | 12 +- .../producer/ContentMarkingProducerNode.java | 15 +- .../producer/ContentModifyingProducerNode.java | 21 +- .../mircoders/producer/IndexingProducerNode.java | 41 ++-- .../producer/MediaGeneratingProducerNode.java | 26 ++- source/mircoders/producer/OldProducerAdapter.java | 7 +- .../producer/OldProducerAdapterFactory.java | 9 +- .../producer/PDFGeneratingProducerNode.java | 9 +- .../producer/PDFPreFormattingProducerNode.java | 29 +-- source/mircoders/producer/Producer.java | 71 ++++--- source/mircoders/producer/ProducerAudio.java | 18 +- source/mircoders/producer/ProducerImages.java | 18 +- source/mircoders/producer/ProducerMedia.java | 34 ++-- source/mircoders/producer/ProducerOther.java | 18 +- source/mircoders/producer/ProducerVideo.java | 18 +- .../mircoders/producer/UnIndexingProducerNode.java | 27 ++- .../reader/SupplementalProducerNodeBuilders.java | 22 ++- source/mircoders/search/AudioSearchTerm.java | 20 +- source/mircoders/search/ContentSearchTerm.java | 10 +- source/mircoders/search/ImagesSearchTerm.java | 21 +- source/mircoders/search/IndexUtil.java | 10 +- source/mircoders/search/KeywordSearchTerm.java | 11 +- source/mircoders/search/SearchTerm.java | 12 +- source/mircoders/search/TextSearchTerm.java | 11 +- source/mircoders/search/TopicSearchTerm.java | 19 +- source/mircoders/search/UnIndexedSearchTerm.java | 11 +- source/mircoders/search/UnStoredSearchTerm.java | 10 +- source/mircoders/search/VideoSearchTerm.java | 20 +- source/mircoders/servlet/ServletHelper.java | 20 +- source/mircoders/servlet/ServletModuleAdmin.java | 29 +-- .../servlet/ServletModuleArticleType.java | 32 +-- source/mircoders/servlet/ServletModuleAudio.java | 15 +- .../mircoders/servlet/ServletModuleBreaking.java | 40 ++-- source/mircoders/servlet/ServletModuleComment.java | 65 +++--- .../servlet/ServletModuleCommentStatus.java | 33 ++-- source/mircoders/servlet/ServletModuleContent.java | 95 +++++---- .../mircoders/servlet/ServletModuleFileEdit.java | 41 ++-- source/mircoders/servlet/ServletModuleHidden.java | 39 ++-- source/mircoders/servlet/ServletModuleImages.java | 41 ++-- .../mircoders/servlet/ServletModuleLanguage.java | 30 +-- .../mircoders/servlet/ServletModuleLinksImcs.java | 19 +- .../mircoders/servlet/ServletModuleLocalizer.java | 35 ++-- .../servlet/ServletModuleMediafolder.java | 32 +-- source/mircoders/servlet/ServletModuleMessage.java | 42 ++-- .../mircoders/servlet/ServletModuleOpenIndy.java | 217 ++++++++++++--------- .../mircoders/servlet/ServletModuleOtherMedia.java | 15 +- .../mircoders/servlet/ServletModuleProducer.java | 38 ++-- .../servlet/ServletModuleSchwerpunkt.java | 32 +-- source/mircoders/servlet/ServletModuleTopics.java | 30 +-- .../servlet/ServletModuleUploadedMedia.java | 73 ++++--- source/mircoders/servlet/ServletModuleUsers.java | 36 ++-- source/mircoders/servlet/ServletModuleVideo.java | 16 +- source/mircoders/storage/DatabaseArticleType.java | 20 +- source/mircoders/storage/DatabaseAudio.java | 28 ++- source/mircoders/storage/DatabaseBreaking.java | 19 +- source/mircoders/storage/DatabaseComment.java | 28 ++- .../mircoders/storage/DatabaseCommentStatus.java | 20 +- source/mircoders/storage/DatabaseContent.java | 33 ++-- .../mircoders/storage/DatabaseContentToMedia.java | 107 +++++----- .../mircoders/storage/DatabaseContentToTopics.java | 39 ++-- source/mircoders/storage/DatabaseFeature.java | 22 +-- source/mircoders/storage/DatabaseImageColor.java | 20 +- source/mircoders/storage/DatabaseImageFormat.java | 20 +- source/mircoders/storage/DatabaseImageLayout.java | 20 +- source/mircoders/storage/DatabaseImageType.java | 20 +- source/mircoders/storage/DatabaseImages.java | 28 ++- source/mircoders/storage/DatabaseLanguage.java | 22 +-- source/mircoders/storage/DatabaseLinksImcs.java | 31 +-- source/mircoders/storage/DatabaseMedia.java | 29 ++- source/mircoders/storage/DatabaseMediaType.java | 19 +- source/mircoders/storage/DatabaseMediafolder.java | 20 +- source/mircoders/storage/DatabaseMessages.java | 17 +- source/mircoders/storage/DatabaseOther.java | 28 ++- source/mircoders/storage/DatabaseRights.java | 20 +- source/mircoders/storage/DatabaseTopics.java | 22 +-- .../mircoders/storage/DatabaseUploadedMedia.java | 31 ++- source/mircoders/storage/DatabaseUsers.java | 22 +-- source/mircoders/storage/DatabaseVideo.java | 28 ++- 140 files changed, 1802 insertions(+), 2039 deletions(-) diff --git a/source/Mir.java b/source/Mir.java index 1d4eecac..5dcca0e2 100755 --- a/source/Mir.java +++ b/source/Mir.java @@ -34,8 +34,11 @@ import java.io.PrintWriter; import java.lang.reflect.Method; import java.util.GregorianCalendar; import java.util.HashMap; +import java.util.Iterator; +import java.util.List; import java.util.Locale; -import java.util.*; +import java.util.Map; +import java.util.Vector; import javax.servlet.ServletException; import javax.servlet.UnavailableException; @@ -43,30 +46,36 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import freemarker.template.*; - -import org.apache.struts.util.MessageResources; - -import mir.misc.*; -import mir.servlet.*; -import mir.util.*; -import mir.generator.*; -//import mir.log.Log; - -import mircoders.global.*; -import mircoders.localizer.*; +import mir.config.MirPropertiesConfiguration; +import mir.generator.FreemarkerGenerator; +import mir.misc.HTMLTemplateProcessor; +import mir.misc.StringUtil; +import mir.servlet.AbstractServlet; +import mir.servlet.ServletModule; +import mir.servlet.ServletModuleDispatch; +import mir.servlet.ServletModuleException; +import mir.servlet.ServletModuleUserException; +import mir.util.StringRoutines; import mircoders.entity.EntityUsers; +import mircoders.global.MirGlobal; import mircoders.module.ModuleMessage; import mircoders.module.ModuleUsers; import mircoders.storage.DatabaseArticleType; import mircoders.storage.DatabaseMessages; import mircoders.storage.DatabaseUsers; +import org.apache.struts.util.MessageResources; + +import freemarker.template.SimpleHash; +import freemarker.template.SimpleList; +import freemarker.template.SimpleScalar; +import freemarker.template.TemplateModel; + /** * Mir.java - main servlet, that dispatches to servletmodules * - * @author $Author: mh $ - * @version $Id: Mir.java,v 1.26 2003/01/18 08:32:07 mh Exp $ + * @author $Author: idfx $ + * @version $Id: Mir.java,v 1.27 2003/01/25 17:50:34 idfx Exp $ * */ @@ -81,6 +90,8 @@ public class Mir extends AbstractServlet { private static List loginLanguages = null; public HttpSession session; + + public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { @@ -146,11 +157,7 @@ public class Mir extends AbstractServlet { EntityUsers userEntity; String http = ""; - if (getServletContext().getAttribute("mir.confed") == null) { - getConfig(req); - } - - MirConfig.setServletName(getServletName()); + configuration.addProperty("ServletName",getServletName()); //*** test // Log.info(this, "blalalala"); @@ -189,25 +196,25 @@ public class Mir extends AbstractServlet { if ( (moduleName != null && moduleName.equals("login")) || (userEntity == null)) { String user = req.getParameter("login"); String passwd = req.getParameter("password"); - theLog.printDebugInfo("--login: evaluating for user: " + user); + logger.debug("--login: evaluating for user: " + user); userEntity = allowedUser(user, passwd); if (userEntity == null) { // login failed: redirecting to login - theLog.printWarning("--login: failed!"); + logger.warn("--login: failed!"); _sendLoginPage(res, req, res.getWriter()); return; } else if (moduleName != null && moduleName.equals("login")) { // login successful - theLog.printInfo("--login: successful! setting uid: " + + logger.info("--login: successful! setting uid: " + userEntity.getId()); session.setAttribute("login.uid", userEntity); - theLog.printDebugInfo("--login: trying to retrieve login.target"); + logger.debug("--login: trying to retrieve login.target"); String target = (String) session.getAttribute("login.target"); if (target != null) { - theLog.printDebugInfo("Redirect: " + target); + logger.debug("Redirect: " + target); int serverPort = req.getServerPort(); String redirect = ""; String redirectString = ""; @@ -237,7 +244,7 @@ public class Mir extends AbstractServlet { } else { // redirecting to default target - theLog.printDebugInfo("--login: no target - redirecting to default"); + logger.debug("--login: no target - redirecting to default"); _sendStartPage(res, req, res.getWriter(), userEntity); } return; @@ -245,7 +252,7 @@ public class Mir extends AbstractServlet { } // if login if (moduleName != null && moduleName.equals("logout")) { - theLog.printDebugInfo("--logout"); + logger.info("--logout"); session.invalidate(); //session = req.getSession(true); @@ -261,7 +268,7 @@ public class Mir extends AbstractServlet { String queryString = req.getQueryString(); if (queryString != null && !queryString.equals("")) { redirectString += "?" + req.getQueryString(); - theLog.printDebugInfo("STORING: " + redirectString); + logger.debug("STORING: " + redirectString); session.setAttribute("login.target", redirectString); } _sendLoginPage(res, req, res.getWriter()); @@ -270,7 +277,7 @@ public class Mir extends AbstractServlet { // If no module is specified goto standard startpage if (moduleName == null || moduleName.equals("")) { - theLog.printDebugInfo("no module: redirect to standardpage"); + logger.debug("no module: redirect to standardpage"); _sendStartPage(res, req, res.getWriter(), userEntity); return; } @@ -293,7 +300,7 @@ public class Mir extends AbstractServlet { // timing... sessionConnectTime = System.currentTimeMillis() - startTime; - theLog.printInfo("EXECTIME (" + moduleName + "): " + sessionConnectTime + + logger.info("EXECTIME (" + moduleName + "): " + sessionConnectTime + " ms"); } @@ -342,12 +349,12 @@ public class Mir extends AbstractServlet { PrintWriter out, String errorString) { try { - theLog.printError(errorString); + logger.error(errorString); SimpleHash modelRoot = new SimpleHash(); modelRoot.put("errorstring", new SimpleScalar(errorString)); modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar()))); - HTMLTemplateProcessor.process(res, MirConfig.getProp("Mir.ErrorTemplate"), + HTMLTemplateProcessor.process(res, MirPropertiesConfiguration.instance().getString("Mir.ErrorTemplate"), modelRoot, out, getLocale(req)); out.close(); } @@ -360,13 +367,13 @@ public class Mir extends AbstractServlet { private void handleUserError(HttpServletRequest req, HttpServletResponse res, PrintWriter out, String errorString) { try { - theLog.printError(errorString); + logger.error(errorString); SimpleHash modelRoot = new SimpleHash(); modelRoot.put("errorstring", new SimpleScalar(errorString)); modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar()))); HTMLTemplateProcessor.process(res, - MirConfig.getProp("Mir.UserErrorTemplate"), + MirPropertiesConfiguration.instance().getString("Mir.UserErrorTemplate"), modelRoot, out, getLocale(req)); out.close(); } @@ -386,7 +393,7 @@ public class Mir extends AbstractServlet { return usersModule.getUserForLogin(user, password); } catch (Exception e) { - theLog.printDebugInfo(e.getMessage()); + logger.debug(e.getMessage()); e.printStackTrace(); return null; } @@ -395,7 +402,8 @@ public class Mir extends AbstractServlet { // Redirect-methods private void _sendLoginPage(HttpServletResponse res, HttpServletRequest req, PrintWriter out) { - String loginTemplate = MirConfig.getProp("Mir.LoginTemplate"); + String loginTemplate = + configuration.getString("Mir.LoginTemplate"); String sessionUrl = res.encodeURL(""); try { @@ -443,20 +451,20 @@ public class Mir extends AbstractServlet { } public String getServletInfo() { - return "Mir " + MirConfig.getProp("Mir.Version"); + return "Mir " + configuration.getString("Mir.Version"); } private void checkLanguage(HttpSession session, HttpServletRequest req) { // a lang parameter always sets the language String lang = req.getParameter("language"); if (lang != null) { - theLog.printInfo("selected language " + lang + " overrides accept-language"); + logger.info("selected language " + lang + " overrides accept-language"); setLanguage(session, lang); setLocale(session, new Locale(lang, "")); } // otherwise store language from accept header in session else if (session.getAttribute("Language") == null) { - theLog.printInfo("accept-language is " + req.getLocale().getLanguage()); + logger.info("accept-language is " + req.getLocale().getLanguage()); setLanguage(session, req.getLocale().getLanguage()); setLocale(session, req.getLocale()); } diff --git a/source/OpenMir.java b/source/OpenMir.java index 8d073c6d..0982e115 100755 --- a/source/OpenMir.java +++ b/source/OpenMir.java @@ -29,29 +29,32 @@ * not wish to do so, delete this exception statement from your version. */ -import java.io.*; -import java.util.*; -import java.net.*; -import java.lang.reflect.*; -import javax.servlet.*; -import javax.servlet.http.*; -import java.sql.*; - -import freemarker.template.*; - -import mir.misc.*; -import mir.servlet.*; - -import mircoders.servlet.*; -import mircoders.module.*; -import mircoders.entity.*; -import mircoders.storage.*; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.GregorianCalendar; +import java.util.Locale; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import mir.config.MirPropertiesConfiguration; +import mir.misc.HTMLTemplateProcessor; +import mir.misc.StringUtil; +import mir.servlet.AbstractServlet; +import mir.servlet.ServletModuleDispatch; +import mir.servlet.ServletModuleException; +import mir.servlet.ServletModuleUserException; +import mircoders.servlet.ServletModuleOpenIndy; +import freemarker.template.SimpleHash; +import freemarker.template.SimpleScalar; /** * 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.18 2003/01/18 08:38:06 mh Exp $ + * @version $Id: OpenMir.java,v 1.19 2003/01/25 17:50:34 idfx Exp $ * */ @@ -72,14 +75,6 @@ public class OpenMir extends AbstractServlet { long startTime = (new java.util.Date()).getTime(); long sessionConnectTime=0; - - // get the configration - this could conflict if 2 mirs are in the - // VM maybe? to be checked. -mh - // -- they would have different servlet contexts, so the following is - // no problem (br1) - if(getServletContext().getAttribute("mir.confed") == null) { - getConfig(req); - } session = req.getSession(); @@ -99,7 +94,7 @@ public class OpenMir extends AbstractServlet { setNoCaching(res); res.setContentType("text/html"); - //res.setContentType("text/html; charset="+MirConfig.getProp("Mir.DefaultHTMLCharset")); + //res.setContentType("text/html; charset="+MirPropertiesConfiguration.instance().getString("Mir.DefaultHTMLCharset")); try { ServletModuleDispatch.dispatch(ServletModuleOpenIndy.getInstance(),req,res); } @@ -112,17 +107,17 @@ public class OpenMir extends AbstractServlet { } // timing... sessionConnectTime = new java.util.Date().getTime() - startTime; - theLog.printInfo("EXECTIME (ServletModuleOpenIndy): " + sessionConnectTime + " ms"); + logger.debug("EXECTIME (ServletModuleOpenIndy): " + sessionConnectTime + " ms"); } private void handleUserError(HttpServletRequest req, HttpServletResponse res, PrintWriter out, String errorString) { try { - theLog.printError(errorString); + logger.error(errorString); SimpleHash modelRoot = new SimpleHash(); modelRoot.put("errorstring", new SimpleScalar(errorString)); modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar()))); - HTMLTemplateProcessor.process(res,MirConfig.getProp("Mir.UserErrorTemplate"), + HTMLTemplateProcessor.process(res,MirPropertiesConfiguration.instance().getString("Mir.UserErrorTemplate"), modelRoot, out, req.getLocale() ); out.close(); } @@ -135,12 +130,12 @@ public class OpenMir extends AbstractServlet { private void handleError(HttpServletRequest req, HttpServletResponse res,PrintWriter out, String errorString) { try { - theLog.printError(errorString); + logger.error(errorString); SimpleHash modelRoot = new SimpleHash(); modelRoot.put("errorstring", new SimpleScalar(errorString)); modelRoot.put("date", new SimpleScalar(StringUtil.date2readableDateTime( new GregorianCalendar()))); - HTMLTemplateProcessor.process(res,MirConfig.getProp("Mir.ErrorTemplate"), + HTMLTemplateProcessor.process(res,MirPropertiesConfiguration.instance().getString("Mir.ErrorTemplate"), modelRoot,out, req.getLocale()); out.close(); } @@ -151,7 +146,7 @@ public class OpenMir extends AbstractServlet { } public String getServletInfo(){ - return "OpenMir "+MirConfig.getProp("Mir.Version"); + return "OpenMir "+configuration.getString("Mir.Version"); } } diff --git a/source/mircoders/entity/EntityAudio.java b/source/mircoders/entity/EntityAudio.java index 8cc7f760..db69ef91 100755 --- a/source/mircoders/entity/EntityAudio.java +++ b/source/mircoders/entity/EntityAudio.java @@ -31,29 +31,17 @@ package mircoders.entity; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.sql.*; +import java.sql.SQLException; +import java.util.HashMap; -/* - * kind of hack for postgres non-standard LargeObjects that Poolman - * doesn't know about. see all the casting, LargeObj stuff in getIcon, getAudio - * at some point when postgres has normal BLOB support, this should go. - */ -import org.postgresql.Connection; -import org.postgresql.largeobject.LargeObject; -import org.postgresql.largeobject.LargeObjectManager; - -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; /** * This class handles storage of audio data and meta data * * @author mh - * @version $Id: EntityAudio.java,v 1.4 2002/11/04 04:35:21 mh Exp $ + * @version $Id: EntityAudio.java,v 1.5 2003/01/25 17:50:34 idfx Exp $ */ @@ -69,12 +57,12 @@ public class EntityAudio extends EntityUploadedMedia setStorage(theStorage); } - public void update() throws StorageObjectException { + public void update() throws StorageObjectFailure { super.update(); try { theStorageObject.executeUpdate("update content set is_produced='0' where to_media="+getId()); } catch (SQLException e) { - throwStorageObjectException(e, "EntityAudio :: update :: failed!! "); + throwStorageObjectFailure(e, "EntityAudio :: update :: failed!! "); } } diff --git a/source/mircoders/entity/EntityBreaking.java b/source/mircoders/entity/EntityBreaking.java index 7928653d..cce0b573 100755 --- a/source/mircoders/entity/EntityBreaking.java +++ b/source/mircoders/entity/EntityBreaking.java @@ -41,11 +41,12 @@ package mircoders.entity; */ -import java.util.*; +import java.util.Set; -import mir.entity.*; -import mir.storage.*; -import mir.storage.store.*; +import mir.entity.Entity; +import mir.storage.StorageObject; +import mir.storage.store.StorableObject; +import mir.storage.store.StoreIdentifier; public class EntityBreaking extends Entity implements StorableObject diff --git a/source/mircoders/entity/EntityComment.java b/source/mircoders/entity/EntityComment.java index bfdbd2ea..0a8659b8 100755 --- a/source/mircoders/entity/EntityComment.java +++ b/source/mircoders/entity/EntityComment.java @@ -31,22 +31,16 @@ package mircoders.entity; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.sql.*; +import java.util.HashMap; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; - -import mir.storage.*; +import mir.entity.Entity; +import mir.storage.StorageObject; /** * This class maps one line of the comment-table to a java-object. * - * @author $Author: zapata $ - * @version $Revision: 1.12 $ $Date: 2002/12/02 12:33:23 $ + * @author $Author: idfx $ + * @version $Revision: 1.13 $ $Date: 2003/01/25 17:50:34 $ */ diff --git a/source/mircoders/entity/EntityContent.java b/source/mircoders/entity/EntityContent.java index 7935b53e..1a43eae4 100755 --- a/source/mircoders/entity/EntityContent.java +++ b/source/mircoders/entity/EntityContent.java @@ -31,26 +31,28 @@ package mircoders.entity; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.sql.*; -import java.lang.reflect.*; - -import freemarker.template.*; - -import mir.entity.*; -import mir.misc.*; -import mir.media.*; -import mir.storage.*; - -import mircoders.storage.*; +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.HashMap; + +import mir.entity.Entity; +import mir.entity.EntityList; +import mir.storage.StorageObject; +import mir.storage.StorageObjectExc; +import mir.storage.StorageObjectFailure; +import mircoders.storage.DatabaseContent; +import mircoders.storage.DatabaseContentToMedia; +import mircoders.storage.DatabaseContentToTopics; +import freemarker.template.SimpleScalar; +import freemarker.template.TemplateModel; +import freemarker.template.TemplateModelException; /** * this class implements mapping of one line of the database table content * to a java object * - * @version $Id: EntityContent.java,v 1.13 2002/12/02 12:33:23 zapata Exp $ + * @version $Id: EntityContent.java,v 1.14 2003/01/25 17:50:34 idfx Exp $ * @author mir-coders group * */ @@ -59,10 +61,10 @@ import mircoders.storage.*; public class EntityContent extends Entity { - String mirconf_extLinkName = MirConfig.getProp("Producer.ExtLinkName"); - String mirconf_intLinkName = MirConfig.getProp("Producer.IntLinkName"); - String mirconf_mailLinkName = MirConfig.getProp("Producer.MailLinkName"); - String mirconf_imageRoot = MirConfig.getProp("Producer.ImageRoot"); + String mirconf_extLinkName = configuration.getString("Producer.ExtLinkName"); + String mirconf_intLinkName = configuration.getString("Producer.IntLinkName"); + String mirconf_mailLinkName = configuration.getString("Producer.MailLinkName"); + String mirconf_imageRoot = configuration.getString("Producer.ImageRoot"); //this should always be transient i.e it can never be stored in the db //or ObjectStore. (so the ObjectStore should only be caching what comes @@ -92,7 +94,7 @@ public class EntityContent extends Entity * set is_produced flag for the article */ - public void setProduced(boolean yesno) throws StorageObjectException + public void setProduced(boolean yesno) throws StorageObjectFailure { String value = (yesno) ? "1":"0"; if (value.equals( getValue("is_produced") )) return; @@ -105,11 +107,11 @@ public class EntityContent extends Entity stmt = con.createStatement(); theStorageObject.executeUpdate(stmt,sql); } - catch (StorageObjectException e) { - throwStorageObjectException(e, "\n -- set produced failed"); + catch (StorageObjectFailure e) { + throwStorageObjectFailure(e, "\n -- set produced failed"); } catch (SQLException e) { - throwStorageObjectException(e, "\n -- set produced failed"); + throwStorageObjectFailure(e, "\n -- set produced failed"); } finally { theStorageObject.freeConnection(con,stmt); @@ -121,15 +123,15 @@ public class EntityContent extends Entity * make openposting to newswire */ - public void newswire() throws StorageObjectException + public void newswire() throws StorageObjectFailure { String sql = "update content set to_article_type='1', is_produced='0' where id='" + getId()+"'"; try { theStorageObject.executeUpdate(sql); - } catch (StorageObjectException e) { - throwStorageObjectException(e, "\n -- newswire failed"); + } catch (StorageObjectFailure e) { + throwStorageObjectFailure(e, "\n -- newswire failed"); } catch (SQLException e) { - throwStorageObjectException(e, "\n -- newswire failed"); + throwStorageObjectFailure(e, "\n -- newswire failed"); } } @@ -137,14 +139,14 @@ public class EntityContent extends Entity /** * dettach from media */ - public void dettach(String cid,String mid) throws StorageObjectException + public void dettach(String cid,String mid) throws StorageObjectFailure { if (mid!=null){ try{ DatabaseContentToMedia.getInstance().delete(cid,mid); } catch (Exception e){ - throwStorageObjectException(e, "\n -- failed to get instance"); + throwStorageObjectFailure(e, "\n -- failed to get instance"); } //set Content to unproduced @@ -156,14 +158,14 @@ public class EntityContent extends Entity * attach to media */ - public void attach(String mid) throws StorageObjectException + public void attach(String mid) throws StorageObjectFailure { if (mid!=null) { //write media-id mid and content-id in table content_x_media try{ DatabaseContentToMedia.getInstance().addMedia(getId(),mid); - } catch(StorageObjectException e){ - throwStorageObjectException(e, "attach: could not get the instance"); + } catch(StorageObjectFailure e){ + throwStorageObjectFailure(e, "attach: could not get the instance"); } //set Content to unproduced setProduced(false); @@ -275,15 +277,19 @@ public class EntityContent extends Entity * * @return freemarker.template.SimpleList */ - private EntityList getComments() throws StorageObjectException { + private EntityList getComments() throws StorageObjectFailure { return ((DatabaseContent)theStorageObject).getComments(this); } - private boolean hasMedia() throws StorageObjectException + private boolean hasMedia() throws StorageObjectFailure { if (_hasMedia == null) { - _hasMedia = - new Boolean(DatabaseContentToMedia.getInstance().hasMedia(this)); + try { + _hasMedia = + new Boolean(DatabaseContentToMedia.getInstance().hasMedia(this)); + } catch (StorageObjectExc e) { + throw new StorageObjectFailure(e); + } } return _hasMedia.booleanValue(); } @@ -291,7 +297,7 @@ public class EntityContent extends Entity //######## @todo all of the following getBlahForContent should have // and optimized version where LIMIT=1 sql for list view. private EntityList getImagesForContent() - throws StorageObjectException, TemplateModelException + throws StorageObjectFailure, TemplateModelException { if (hasMedia()) return DatabaseContentToMedia.getInstance().getImages(this); @@ -300,7 +306,7 @@ public class EntityContent extends Entity } private EntityList getAudioForContent() - throws StorageObjectException, TemplateModelException + throws StorageObjectFailure, TemplateModelException { if (hasMedia()) return DatabaseContentToMedia.getInstance().getAudio(this) ; @@ -309,7 +315,7 @@ public class EntityContent extends Entity } private EntityList getVideoForContent() - throws StorageObjectException, TemplateModelException + throws StorageObjectFailure, TemplateModelException { if (hasMedia()) return DatabaseContentToMedia.getInstance().getVideo(this) ; @@ -318,7 +324,7 @@ public class EntityContent extends Entity } private EntityList getOtherMediaForContent() - throws StorageObjectException, TemplateModelException + throws StorageObjectFailure, TemplateModelException { if (hasMedia()) return DatabaseContentToMedia.getInstance().getOther(this); diff --git a/source/mircoders/entity/EntityFeature.java b/source/mircoders/entity/EntityFeature.java index d6d116d7..77a200c9 100755 --- a/source/mircoders/entity/EntityFeature.java +++ b/source/mircoders/entity/EntityFeature.java @@ -31,18 +31,12 @@ package mircoders.entity; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.sql.*; - -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; - -import mircoders.storage.*; +import mir.entity.Entity; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import mircoders.storage.DatabaseContent; /** - * Diese Klasse enthält die Daten eines MetaObjekts + * Diese Klasse enth?lt die Daten eines MetaObjekts * * @author RK * @version 29.6.1999 @@ -61,7 +55,7 @@ public class EntityFeature extends Entity setStorage(theStorage); } - public void update() throws StorageObjectException{ + public void update() throws StorageObjectFailure{ super.update(); DatabaseContent dbContent = DatabaseContent.getInstance(); dbContent.setUnproduced("to_feature="+getId()); diff --git a/source/mircoders/entity/EntityImages.java b/source/mircoders/entity/EntityImages.java index 6d0e6c6e..a19577d9 100755 --- a/source/mircoders/entity/EntityImages.java +++ b/source/mircoders/entity/EntityImages.java @@ -31,30 +31,28 @@ package mircoders.entity; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.sql.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.Statement; + +import mir.config.MirPropertiesConfiguration; +import mir.misc.FileUtil; +import mir.misc.WebdbImage; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; -/* - * kind of hack for postgres non-standard LargeObjects that Poolman - * doesn't know about. see all the casting, LargeObj stuff in getIcon, getImage - * at some point when postgres has normal BLOB support, this should go. - */ -import org.postgresql.Connection; +import org.postgresql.largeobject.BlobInputStream; import org.postgresql.largeobject.LargeObject; import org.postgresql.largeobject.LargeObjectManager; -import org.postgresql.largeobject.BlobInputStream; - -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; /** - * Diese Klasse enthält die Daten eines MetaObjekts + * Diese Klasse enth?lt die Daten eines MetaObjekts * * @author RK, mh, mir-coders - * @version $Id: EntityImages.java,v 1.13 2002/12/17 19:20:31 zapata Exp $ + * @version $Id: EntityImages.java,v 1.14 2003/01/25 17:50:34 idfx Exp $ */ @@ -75,7 +73,7 @@ public class EntityImages extends EntityUploadedMedia // methods - public InputStream getImage() throws StorageObjectException + public InputStream getImage() throws StorageObjectFailure { theLog.printDebugInfo("--getimage started"); java.sql.Connection con=null;Statement stmt=null; @@ -113,14 +111,14 @@ public class EntityImages extends EntityUploadedMedia +e2.toString()); } theStorageObject.freeConnection(con,stmt); - throwStorageObjectException(e, "EntityImages -- getImage failed: "); + throwStorageObjectFailure(e, "EntityImages -- getImage failed: "); } //} return img_in; } public void setImage(InputStream in, String type) - throws StorageObjectException { + throws StorageObjectFailure { if (in!=null) { java.sql.Connection con=null;PreparedStatement pstmt=null; @@ -129,7 +127,7 @@ public class EntityImages extends EntityUploadedMedia theLog.printDebugInfo("settimage :: making internal representation of image"); - File tempDir = new File(MirConfig.getProp("TempDir")); + File tempDir = new File(MirPropertiesConfiguration.instance().getString("TempDir")); f = File.createTempFile("mir", ".tmp", tempDir); FileUtil.write(f, in); WebdbImage webdbImage= new WebdbImage(f, type); @@ -169,7 +167,7 @@ public class EntityImages extends EntityUploadedMedia update(); } catch (Exception e) { - throwStorageObjectException(e, "settimage :: setImage gescheitert: "); + throwStorageObjectFailure(e, "settimage :: setImage gescheitert: "); } finally { try { @@ -193,7 +191,7 @@ public class EntityImages extends EntityUploadedMedia * * It will also take care of closing the OutputStream. */ - public InputStream getIcon() throws StorageObjectException + public InputStream getIcon() throws StorageObjectFailure { java.sql.Connection con=null;Statement stmt=null; BlobInputStream in=null;ImageInputStream img_in=null; @@ -232,7 +230,7 @@ public class EntityImages extends EntityUploadedMedia +e2.toString()); } theStorageObject.freeConnection(con,stmt); - throwStorageObjectException(e, "EntityImages -- getIcon failed:"); + throwStorageObjectFailure(e, "EntityImages -- getIcon failed:"); } return img_in; diff --git a/source/mircoders/entity/EntityLinksImcs.java b/source/mircoders/entity/EntityLinksImcs.java index 0b4b741b..c714ab1a 100755 --- a/source/mircoders/entity/EntityLinksImcs.java +++ b/source/mircoders/entity/EntityLinksImcs.java @@ -31,14 +31,15 @@ package mircoders.entity; -import java.util.*; +import java.util.Set; -import mir.entity.*; -import mir.storage.*; -import mir.storage.store.*; +import mir.entity.Entity; +import mir.storage.StorageObject; +import mir.storage.store.StorableObject; +import mir.storage.store.StoreIdentifier; /** - * Diese Klasse enthält die Daten eines MetaObjekts + * Diese Klasse enth?lt die Daten eines MetaObjekts * * @author RK * @version 29.6.1999 diff --git a/source/mircoders/entity/EntityMedia.java b/source/mircoders/entity/EntityMedia.java index e6320465..cf8f801b 100755 --- a/source/mircoders/entity/EntityMedia.java +++ b/source/mircoders/entity/EntityMedia.java @@ -31,18 +31,13 @@ package mircoders.entity; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.sql.*; - -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; - -import mircoders.storage.*; +import mir.entity.Entity; +import mir.storage.StorageObject; +import mir.storage.StorageObjectExc; +import mir.storage.StorageObjectFailure; +import mircoders.storage.DatabaseMedia; /** - * Diese Klasse enthält die Daten eines MetaObjekts + * Diese Klasse enth?lt die Daten eines MetaObjekts * * @author RK * @version 29.6.1999 @@ -67,12 +62,14 @@ public class EntityMedia extends Entity * * @return mir.entity.Entity */ - public Entity getMediaType() throws StorageObjectException { - try { - return ((DatabaseMedia)theStorageObject).getMediaType(this); - } catch (StorageObjectException e) { - throw new StorageObjectException("getMediaType(): "+e.toString()); - } + public Entity getMediaType() throws StorageObjectFailure { + try { + return ((DatabaseMedia)theStorageObject).getMediaType(this); + } catch (StorageObjectFailure e) { + throw new StorageObjectFailure("getMediaType(): ",e); + } catch (StorageObjectExc e) { + throw new StorageObjectFailure("getMediaType(): ",e); + } } } diff --git a/source/mircoders/entity/EntityOther.java b/source/mircoders/entity/EntityOther.java index de1334b6..ba293d0c 100755 --- a/source/mircoders/entity/EntityOther.java +++ b/source/mircoders/entity/EntityOther.java @@ -31,23 +31,11 @@ package mircoders.entity; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.sql.*; +import java.sql.SQLException; +import java.util.HashMap; -/* - * kind of hack for postgres non-standard LargeObjects that Poolman - * doesn't know about. see all the casting, LargeObj stuff in getIcon, getOther - * at some point when postgres has normal BLOB support, this should go. - */ -import org.postgresql.Connection; -import org.postgresql.largeobject.LargeObject; -import org.postgresql.largeobject.LargeObjectManager; - -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; /** * This class handles storage of other data and meta data @@ -69,12 +57,12 @@ public class EntityOther extends EntityUploadedMedia setStorage(theStorage); } - public void update() throws StorageObjectException { + public void update() throws StorageObjectFailure { super.update(); try { theStorageObject.executeUpdate("update content set is_produced='0' where to_media="+getId()); } catch (SQLException e) { - throwStorageObjectException(e, "EntityOther :: update :: failed!! "); + throwStorageObjectFailure(e, "EntityOther :: update :: failed!! "); } } diff --git a/source/mircoders/entity/EntityTopics.java b/source/mircoders/entity/EntityTopics.java index 1cd20f88..2956d70e 100755 --- a/source/mircoders/entity/EntityTopics.java +++ b/source/mircoders/entity/EntityTopics.java @@ -31,18 +31,10 @@ package mircoders.entity; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.sql.*; - -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; - -import mircoders.storage.*; +import mir.entity.Entity; +import mir.storage.StorageObject; /** - * Diese Klasse enthält die Daten eines MetaObjekts + * Diese Klasse enth?lt die Daten eines MetaObjekts * * @author RK * @version 29.6.1999 diff --git a/source/mircoders/entity/EntityUploadedMedia.java b/source/mircoders/entity/EntityUploadedMedia.java index ef9d3a78..26666127 100755 --- a/source/mircoders/entity/EntityUploadedMedia.java +++ b/source/mircoders/entity/EntityUploadedMedia.java @@ -31,29 +31,28 @@ package mircoders.entity; -import freemarker.template.SimpleList; -import freemarker.template.SimpleScalar; -import freemarker.template.TemplateModel; -import freemarker.template.TemplateModelException; +import java.util.HashMap; import mir.entity.Entity; import mir.entity.EntityList; import mir.media.MediaHelper; import mir.media.MirMedia; -import mir.storage.StorageObject; -import mir.storage.StorageObjectException; import mir.misc.NumberUtils; -import mircoders.storage.DatabaseUploadedMedia; +import mir.storage.StorageObject; +import mir.storage.StorageObjectExc; +import mir.storage.StorageObjectFailure; import mircoders.storage.DatabaseContentToMedia; - -import java.sql.SQLException; -import java.util.HashMap; +import mircoders.storage.DatabaseUploadedMedia; +import freemarker.template.SimpleList; +import freemarker.template.SimpleScalar; +import freemarker.template.TemplateModel; +import freemarker.template.TemplateModelException; /** - * Diese Klasse enthält die Daten eines MetaObjekts + * Diese Klasse enth?lt die Daten eines MetaObjekts * * @author mh, mir-coders group - * @version $Id: EntityUploadedMedia.java,v 1.16 2002/12/06 08:09:51 mh Exp $ + * @version $Id: EntityUploadedMedia.java,v 1.17 2003/01/25 17:50:34 idfx Exp $ */ @@ -69,7 +68,7 @@ public class EntityUploadedMedia extends Entity { setStorage(theStorage); } - public void update() throws StorageObjectException { + public void update() throws StorageObjectFailure { super.update(); EntityList contentList = DatabaseContentToMedia.getInstance().getContent(this); if (contentList!=null && contentList.size()>0) { @@ -94,13 +93,15 @@ public class EntityUploadedMedia extends Entity { * * @return mir.entity.Entity */ - public Entity getMediaType() throws StorageObjectException { + public Entity getMediaType() throws StorageObjectFailure { Entity ent = null; try { ent = DatabaseUploadedMedia.getInstance().getMediaType(this); } - catch (StorageObjectException e) { - throwStorageObjectException(e, "get MediaType failed -- "); + catch (StorageObjectFailure e) { + throwStorageObjectFailure(e, "get MediaType failed -- "); + } catch (StorageObjectExc e) { + throwStorageObjectFailure(e, "get MediaType failed -- "); } return ent; } diff --git a/source/mircoders/entity/EntityUsers.java b/source/mircoders/entity/EntityUsers.java index 9d8b1e3b..f385a08d 100755 --- a/source/mircoders/entity/EntityUsers.java +++ b/source/mircoders/entity/EntityUsers.java @@ -31,10 +31,8 @@ package mircoders.entity; -import java.util.*; - -import mir.entity.*; -import mir.storage.*; +import mir.entity.Entity; +import mir.storage.StorageObject; /** * This class is objectmapping of database webdb_users diff --git a/source/mircoders/entity/EntityVideo.java b/source/mircoders/entity/EntityVideo.java index 65397b5b..afd94a7d 100755 --- a/source/mircoders/entity/EntityVideo.java +++ b/source/mircoders/entity/EntityVideo.java @@ -31,17 +31,14 @@ package mircoders.entity; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.sql.*; +import java.sql.SQLException; +import java.util.HashMap; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; /** - * Diese Klasse enthält die Daten eines MetaObjekts + * Diese Klasse enth?lt die Daten eines MetaObjekts * * @author RK * @version 11.11.2000 @@ -64,7 +61,7 @@ public class EntityVideo extends EntityUploadedMedia // // methods - public void update() throws StorageObjectException { + public void update() throws StorageObjectFailure { super.update(); try { theStorageObject.executeUpdate("update content set is_produced='0' where to_media="+getId()); diff --git a/source/mircoders/global/JobQueue.java b/source/mircoders/global/JobQueue.java index 34dd7b09..0f0ca8f2 100755 --- a/source/mircoders/global/JobQueue.java +++ b/source/mircoders/global/JobQueue.java @@ -31,7 +31,13 @@ package mircoders.global; -import java.util.*; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Vector; // important: objects passed as data must not be altered once put into a job diff --git a/source/mircoders/global/MirGlobal.java b/source/mircoders/global/MirGlobal.java index 578c94d6..f66719d5 100755 --- a/source/mircoders/global/MirGlobal.java +++ b/source/mircoders/global/MirGlobal.java @@ -31,11 +31,13 @@ package mircoders.global; +import mir.config.MirPropertiesConfiguration; +import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; import mir.misc.*; import mircoders.localizer.*; public class MirGlobal { - static private MirConfig configuration; + static private MirPropertiesConfiguration configuration; static private MirLocalizer localizer; static private ProducerEngine producerEngine; @@ -71,12 +73,13 @@ public class MirGlobal { return localizer; } - public static MirConfig config() { - if (configuration == null) { - configuration = new MirConfig(); + public static MirPropertiesConfiguration config() { + try { + return MirPropertiesConfiguration.instance(); + } catch (PropertiesConfigExc e) { + e.printStackTrace(); + throw new RuntimeException(e.getMessage()); } - - return configuration; } public static ProducerEngine producerEngine() { @@ -94,7 +97,7 @@ public class MirGlobal { //instead of MirConfig, we can get rid of the Runtime exception we through //in getProp, and deal with it here.. needs more thinking.. -mh try { - result = config().getProp(aPropertyName); + result = config().getString(aPropertyName); } catch (Throwable t) { result = aDefault; } @@ -109,7 +112,7 @@ public class MirGlobal { public static String getConfigProperty(String aPropertyName) { String result; - result = config().getProp(aPropertyName); + result = config().getString(aPropertyName); if (result==null) throw new ConfigException("Property '" + aPropertyName + "' not present"); @@ -118,21 +121,10 @@ public class MirGlobal { } public static int getConfigIntegerProperty(String aPropertyName) { - String result; - - result = config().getProp(aPropertyName); - - return Integer.parseInt(result); + return config().getInt(aPropertyName); } public static boolean getConfigBooleanProperty(String aPropertyName) { - String result; - - result = config().getProp(aPropertyName); - - if (result==null) - throw new ConfigException("Boolean property '" + aPropertyName + "' not present"); - - return (result.equals("yes") || result.equals("1")); + return config().getBoolean(aPropertyName); } } diff --git a/source/mircoders/global/ProducerEngine.java b/source/mircoders/global/ProducerEngine.java index 69d18a91..ecccfdbd 100755 --- a/source/mircoders/global/ProducerEngine.java +++ b/source/mircoders/global/ProducerEngine.java @@ -31,13 +31,21 @@ package mircoders.global; -import java.util.*; -import java.io.*; -import mir.producer.*; -import mir.util.*; +import java.io.PrintWriter; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Vector; + +import mir.log.LoggerToWriterAdapter; +import mir.log.LoggerWrapper; +import mir.producer.Producer; +import mir.producer.ProducerFactory; +import mir.util.DateToMapAdapter; +import mir.util.StringRoutines; import multex.Exc; import multex.Failure; -import mir.log.*; public class ProducerEngine { // private Map producers; diff --git a/source/mircoders/input/XmlFilenameFilter.java b/source/mircoders/input/XmlFilenameFilter.java index 4688f689..5e2ebae2 100755 --- a/source/mircoders/input/XmlFilenameFilter.java +++ b/source/mircoders/input/XmlFilenameFilter.java @@ -31,8 +31,8 @@ package mircoders.input; -import java.io.FilenameFilter; -import java.io.File; +import java.io.File; +import java.io.FilenameFilter; /** diff --git a/source/mircoders/input/XmlHandler.java b/source/mircoders/input/XmlHandler.java index 22155c55..67793ae5 100755 --- a/source/mircoders/input/XmlHandler.java +++ b/source/mircoders/input/XmlHandler.java @@ -43,9 +43,10 @@ package mircoders.input; -import org.xml.sax.helpers.DefaultHandler; -import org.xml.sax.Attributes; -import java.util.HashMap; +import java.util.HashMap; + +import org.xml.sax.Attributes; +import org.xml.sax.helpers.DefaultHandler; /** diff --git a/source/mircoders/localizer/MirAdminInterfaceLocalizer.java b/source/mircoders/localizer/MirAdminInterfaceLocalizer.java index 7c381651..dd8f195b 100755 --- a/source/mircoders/localizer/MirAdminInterfaceLocalizer.java +++ b/source/mircoders/localizer/MirAdminInterfaceLocalizer.java @@ -31,12 +31,9 @@ package mircoders.localizer; -import java.util.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import java.util.List; -import mir.entity.*; -import mir.entity.adapter.*; +import mir.entity.adapter.EntityAdapter; public interface MirAdminInterfaceLocalizer { public List simpleCommentOperations(); diff --git a/source/mircoders/localizer/MirDataModelLocalizer.java b/source/mircoders/localizer/MirDataModelLocalizer.java index cb8d87e1..3b5994c8 100755 --- a/source/mircoders/localizer/MirDataModelLocalizer.java +++ b/source/mircoders/localizer/MirDataModelLocalizer.java @@ -31,7 +31,7 @@ package mircoders.localizer; -import mir.entity.adapter.*; +import mir.entity.adapter.EntityAdapterModel; public interface MirDataModelLocalizer { public EntityAdapterModel adapterModel() throws MirLocalizerExc, MirLocalizerFailure; diff --git a/source/mircoders/localizer/MirGeneratorLocalizer.java b/source/mircoders/localizer/MirGeneratorLocalizer.java index 7cd27cfe..7301d8c5 100755 --- a/source/mircoders/localizer/MirGeneratorLocalizer.java +++ b/source/mircoders/localizer/MirGeneratorLocalizer.java @@ -31,7 +31,8 @@ package mircoders.localizer; -import mir.generator.*; +import mir.generator.Generator; +import mir.generator.WriterEngine; public interface MirGeneratorLocalizer { public WriterEngine makeWriterEngine() throws MirLocalizerExc, MirLocalizerFailure; diff --git a/source/mircoders/localizer/MirOpenPostingLocalizer.java b/source/mircoders/localizer/MirOpenPostingLocalizer.java index 5c827461..49601623 100755 --- a/source/mircoders/localizer/MirOpenPostingLocalizer.java +++ b/source/mircoders/localizer/MirOpenPostingLocalizer.java @@ -31,10 +31,10 @@ package mircoders.localizer; -import java.util.*; -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; -import mircoders.entity.*; +import mircoders.entity.EntityComment; +import mircoders.entity.EntityContent; public interface MirOpenPostingLocalizer { public void afterContentPosting(EntityContent aContent); diff --git a/source/mircoders/localizer/MirProducerAssistantLocalizer.java b/source/mircoders/localizer/MirProducerAssistantLocalizer.java index 86044d5f..e4c57d68 100755 --- a/source/mircoders/localizer/MirProducerAssistantLocalizer.java +++ b/source/mircoders/localizer/MirProducerAssistantLocalizer.java @@ -31,8 +31,7 @@ package mircoders.localizer; -import java.util.*; -import java.io.*; +import java.util.Map; public interface MirProducerAssistantLocalizer { public void initializeGenerationValueSet(Map aValueSet) throws MirLocalizerExc, MirLocalizerFailure; diff --git a/source/mircoders/localizer/MirProducerLocalizer.java b/source/mircoders/localizer/MirProducerLocalizer.java index 8434e68d..0b1e040e 100755 --- a/source/mircoders/localizer/MirProducerLocalizer.java +++ b/source/mircoders/localizer/MirProducerLocalizer.java @@ -32,6 +32,7 @@ package mircoders.localizer; import java.util.List; + import mir.producer.ProducerFactory; public interface MirProducerLocalizer { diff --git a/source/mircoders/localizer/basic/MirBasicAdminInterfaceLocalizer.java b/source/mircoders/localizer/basic/MirBasicAdminInterfaceLocalizer.java index b385ed20..0336b73a 100755 --- a/source/mircoders/localizer/basic/MirBasicAdminInterfaceLocalizer.java +++ b/source/mircoders/localizer/basic/MirBasicAdminInterfaceLocalizer.java @@ -31,17 +31,23 @@ package mircoders.localizer.basic; -import java.util.*; -import java.text.*; - -import mir.entity.adapter.*; -import mir.storage.*; -import mir.entity.*; -import mir.util.*; - -import mircoders.localizer.*; -import mircoders.entity.*; -import mircoders.storage.*; +import java.text.SimpleDateFormat; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Vector; + +import mir.entity.Entity; +import mir.entity.adapter.EntityAdapter; +import mir.storage.StorageObjectFailure; +import mir.util.StringRoutines; +import mircoders.entity.EntityComment; +import mircoders.entity.EntityContent; +import mircoders.localizer.MirAdminInterfaceLocalizer; +import mircoders.localizer.MirLocalizerExc; +import mircoders.localizer.MirLocalizerFailure; +import mircoders.storage.DatabaseContent; public class MirBasicAdminInterfaceLocalizer implements MirAdminInterfaceLocalizer { @@ -134,8 +140,8 @@ public class MirBasicAdminInterfaceLocalizer implements MirAdminInterfaceLocaliz } }; - protected abstract boolean isAvailable(Entity anEntity) throws StorageObjectException ; - protected abstract void performModification(EntityAdapter aUser, Entity anEntity) throws StorageObjectException ; + protected abstract boolean isAvailable(Entity anEntity) throws StorageObjectFailure ; + protected abstract void performModification(EntityAdapter aUser, Entity anEntity) throws StorageObjectFailure ; } public static abstract class CommentModifyingOperation extends EntityModifyingOperation { @@ -143,17 +149,17 @@ public class MirBasicAdminInterfaceLocalizer implements MirAdminInterfaceLocaliz super(aName); } - protected boolean isAvailable(Entity anEntity) throws StorageObjectException { + protected boolean isAvailable(Entity anEntity) throws StorageObjectFailure { return anEntity instanceof EntityComment && isAvailable((EntityComment) anEntity); } - protected void performModification(EntityAdapter aUser, Entity anEntity) throws StorageObjectException { + protected void performModification(EntityAdapter aUser, Entity anEntity) throws StorageObjectFailure { performModification(aUser, (EntityComment) anEntity); DatabaseContent.getInstance().setUnproduced("id="+anEntity.getValue("to_media")); }; - protected abstract boolean isAvailable(EntityComment aComment) throws StorageObjectException ; - protected abstract void performModification(EntityAdapter aUser, EntityComment aComment) throws StorageObjectException ; + protected abstract boolean isAvailable(EntityComment aComment) throws StorageObjectFailure ; + protected abstract void performModification(EntityAdapter aUser, EntityComment aComment) throws StorageObjectFailure ; } public static abstract class ArticleModifyingOperation extends EntityModifyingOperation { @@ -165,11 +171,11 @@ public class MirBasicAdminInterfaceLocalizer implements MirAdminInterfaceLocaliz logOperation = aLogOperation; } - protected boolean isAvailable(Entity anEntity) throws StorageObjectException { + protected boolean isAvailable(Entity anEntity) throws StorageObjectFailure { return anEntity instanceof EntityContent && isAvailable((EntityContent) anEntity); } - protected void performModification(EntityAdapter aUser, Entity anEntity) throws StorageObjectException { + protected void performModification(EntityAdapter aUser, Entity anEntity) throws StorageObjectFailure { performModification(aUser, (EntityContent) anEntity); anEntity.setValueForProperty("is_produced", "0"); @@ -196,8 +202,8 @@ public class MirBasicAdminInterfaceLocalizer implements MirAdminInterfaceLocaliz } }; - protected abstract boolean isAvailable(EntityContent anArticle) throws StorageObjectException ; - protected abstract void performModification(EntityAdapter aUser, EntityContent anArticle) throws StorageObjectException ; + protected abstract boolean isAvailable(EntityContent anArticle) throws StorageObjectFailure ; + protected abstract void performModification(EntityAdapter aUser, EntityContent anArticle) throws StorageObjectFailure ; } protected static class SetCommentFieldOperation extends CommentModifyingOperation { @@ -215,7 +221,7 @@ public class MirBasicAdminInterfaceLocalizer implements MirAdminInterfaceLocaliz return true; } - protected void performModification(EntityAdapter aUser, EntityComment aComment) throws StorageObjectException { + protected void performModification(EntityAdapter aUser, EntityComment aComment) throws StorageObjectFailure { aComment.setValueForProperty(field, value); } } @@ -235,7 +241,7 @@ public class MirBasicAdminInterfaceLocalizer implements MirAdminInterfaceLocaliz return aComment.getValue(field) == null || !aComment.getValue(field).equals(value); } - protected void performModification(EntityAdapter aUser, EntityComment aComment) throws StorageObjectException { + protected void performModification(EntityAdapter aUser, EntityComment aComment) throws StorageObjectFailure { aComment.setValueForProperty(field, value); } } @@ -255,7 +261,7 @@ public class MirBasicAdminInterfaceLocalizer implements MirAdminInterfaceLocaliz return true; } - protected void performModification(EntityAdapter aUser, EntityContent anArticle) throws StorageObjectException { + protected void performModification(EntityAdapter aUser, EntityContent anArticle) throws StorageObjectFailure { anArticle.setValueForProperty(field, value); } } @@ -275,7 +281,7 @@ public class MirBasicAdminInterfaceLocalizer implements MirAdminInterfaceLocaliz return anArticle.getValue(field) == null || !anArticle.getValue(field).equals(value); } - protected void performModification(EntityAdapter aUser, EntityContent anArticle) throws StorageObjectException { + protected void performModification(EntityAdapter aUser, EntityContent anArticle) throws StorageObjectFailure { anArticle.setValueForProperty(field, value); } } @@ -297,7 +303,7 @@ public class MirBasicAdminInterfaceLocalizer implements MirAdminInterfaceLocaliz return anArticle.getValue(field) != null && anArticle.getValue(field).equals(oldValue); } - protected void performModification(EntityAdapter aUser, EntityContent anArticle) throws StorageObjectException { + protected void performModification(EntityAdapter aUser, EntityContent anArticle) throws StorageObjectFailure { anArticle.setValueForProperty(field, newValue); } } diff --git a/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java b/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java index ac79c549..92a5a0a6 100755 --- a/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java +++ b/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java @@ -31,16 +31,43 @@ package mircoders.localizer.basic; -import java.util.*; -import mir.entity.*; -import mir.entity.adapter.*; -import mir.media.*; -import mir.misc.*; -import mir.util.*; -import mircoders.storage.*; -import mircoders.global.*; -import mircoders.entity.*; -import mircoders.localizer.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Vector; + +import mir.entity.Entity; +import mir.entity.adapter.EntityAdapter; +import mir.entity.adapter.EntityAdapterDefinition; +import mir.entity.adapter.EntityAdapterModel; +import mir.media.MediaHelper; +import mir.media.MirMedia; +import mir.util.RewindableIterator; +import mircoders.entity.EntityUploadedMedia; +import mircoders.global.MirGlobal; +import mircoders.localizer.MirAdminInterfaceLocalizer; +import mircoders.localizer.MirDataModelLocalizer; +import mircoders.localizer.MirLocalizerFailure; +import mircoders.storage.DatabaseArticleType; +import mircoders.storage.DatabaseAudio; +import mircoders.storage.DatabaseBreaking; +import mircoders.storage.DatabaseComment; +import mircoders.storage.DatabaseCommentStatus; +import mircoders.storage.DatabaseContent; +import mircoders.storage.DatabaseFeature; +import mircoders.storage.DatabaseImageType; +import mircoders.storage.DatabaseImages; +import mircoders.storage.DatabaseLanguage; +import mircoders.storage.DatabaseMedia; +import mircoders.storage.DatabaseMediaType; +import mircoders.storage.DatabaseMediafolder; +import mircoders.storage.DatabaseMessages; +import mircoders.storage.DatabaseOther; +import mircoders.storage.DatabaseTopics; +import mircoders.storage.DatabaseUploadedMedia; +import mircoders.storage.DatabaseUsers; +import mircoders.storage.DatabaseVideo; public class MirBasicDataModelLocalizer implements MirDataModelLocalizer { private EntityAdapterModel model; diff --git a/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java b/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java index 4bccee09..6a012e89 100755 --- a/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java +++ b/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java @@ -31,11 +31,15 @@ package mircoders.localizer.basic; -import freemarker.template.*; -import mir.misc.*; -import mir.generator.*; -import mircoders.localizer.*; -import mircoders.global.*; +import mir.generator.FreemarkerGenerator; +import mir.generator.Generator; +import mir.generator.GeneratorLibraryRepository; +import mir.generator.WriterEngine; +import mir.misc.Logfile; +import mircoders.global.MirGlobal; +import mircoders.localizer.MirGeneratorLocalizer; +import mircoders.localizer.MirLocalizerExc; +import mircoders.localizer.MirLocalizerFailure; public class MirBasicGeneratorLocalizer implements MirGeneratorLocalizer { protected static Logfile logger = Logfile.getInstance( MirGlobal.getConfigProperty("Home") + "/" + MirGlobal.getConfigProperty("Mir.Localizer.Logfile")); diff --git a/source/mircoders/localizer/basic/MirBasicLocalizer.java b/source/mircoders/localizer/basic/MirBasicLocalizer.java index 5130b6a0..83f7ec45 100755 --- a/source/mircoders/localizer/basic/MirBasicLocalizer.java +++ b/source/mircoders/localizer/basic/MirBasicLocalizer.java @@ -31,9 +31,15 @@ package mircoders.localizer.basic; -import mir.misc.*; -import mircoders.global.*; -import mircoders.localizer.*; +import mircoders.localizer.MirAdminInterfaceLocalizer; +import mircoders.localizer.MirDataModelLocalizer; +import mircoders.localizer.MirGeneratorLocalizer; +import mircoders.localizer.MirLocalizer; +import mircoders.localizer.MirLocalizerExc; +import mircoders.localizer.MirLocalizerFailure; +import mircoders.localizer.MirOpenPostingLocalizer; +import mircoders.localizer.MirProducerAssistantLocalizer; +import mircoders.localizer.MirProducerLocalizer; public class MirBasicLocalizer implements MirLocalizer { // protected static Logfile logger = Logfile.getInstance( MirGlobal.getConfigProperty("Home") + "/" + MirGlobal.getConfigProperty("Mir.Localizer.Logfile")); diff --git a/source/mircoders/localizer/basic/MirBasicOpenPostingLocalizer.java b/source/mircoders/localizer/basic/MirBasicOpenPostingLocalizer.java index 55fa5eed..35b2deb4 100755 --- a/source/mircoders/localizer/basic/MirBasicOpenPostingLocalizer.java +++ b/source/mircoders/localizer/basic/MirBasicOpenPostingLocalizer.java @@ -31,14 +31,17 @@ package mircoders.localizer.basic; -import java.util.*; -import javax.servlet.http.*; +import java.util.List; +import java.util.Locale; -import mir.misc.*; -import mir.util.*; -import mircoders.global.*; -import mircoders.localizer.*; -import mircoders.entity.*; +import javax.servlet.http.HttpServletRequest; + +import mir.misc.Logfile; +import mircoders.entity.EntityComment; +import mircoders.entity.EntityContent; +import mircoders.global.MirGlobal; +import mircoders.global.ProducerEngine; +import mircoders.localizer.MirOpenPostingLocalizer; public class MirBasicOpenPostingLocalizer implements MirOpenPostingLocalizer { private List afterContentProducerTasks; diff --git a/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java b/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java index 64763571..c227e92c 100755 --- a/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java +++ b/source/mircoders/localizer/basic/MirBasicProducerAssistantLocalizer.java @@ -31,17 +31,29 @@ package mircoders.localizer.basic; -import java.util.*; -import java.io.*; -import freemarker.template.utility.*; -import mir.misc.*; -import mir.entity.*; -import mir.entity.adapter.*; -import mir.util.*; -import mircoders.module.*; -import mircoders.storage.*; -import mircoders.localizer.*; -import mircoders.global.*; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import mir.config.MirPropertiesConfiguration; +import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; +import mir.entity.EntityList; +import mir.entity.adapter.EntityAdapter; +import mir.entity.adapter.EntityIteratorAdapter; +import mir.misc.Logfile; +import mir.misc.StringUtil; +import mir.util.DateToMapAdapter; +import mir.util.GeneratorHTMLFunctions; +import mir.util.GeneratorIntegerFunctions; +import mir.util.GeneratorListFunctions; +import mir.util.GeneratorStringFunctions; +import mircoders.global.MirGlobal; +import mircoders.localizer.MirProducerAssistantLocalizer; +import mircoders.module.ModuleLanguage; +import mircoders.module.ModuleTopics; +import mircoders.storage.DatabaseLanguage; +import mircoders.storage.DatabaseTopics; public class MirBasicProducerAssistantLocalizer implements MirProducerAssistantLocalizer { protected static Logfile logger = Logfile.getInstance( MirGlobal.getConfigProperty("Home") + "/" + MirGlobal.getConfigProperty("Mir.Localizer.Logfile")); @@ -68,7 +80,11 @@ public class MirBasicProducerAssistantLocalizer implements MirProducerAssistantL configMap.put("defEncoding", MirGlobal.getConfigProperty("Mir.DefaultEncoding")); // "new": - configMap.putAll( MirConfig.allSettings() ); + try { + configMap.putAll( MirPropertiesConfiguration.instance().allSettings() ); + } catch (PropertiesConfigExc e) { + e.printStackTrace(System.err); + } utilityMap.put("compressWhitespace", new freemarker.template.utility.CompressWhitespace() ); utilityMap.put("encodeHTML", new GeneratorHTMLFunctions.encodeHTMLGeneratorFunction()); diff --git a/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java b/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java index 30db6f4f..96480bbf 100755 --- a/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java +++ b/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java @@ -31,19 +31,35 @@ package mircoders.localizer.basic; -import java.util.*; -import java.io.*; -import mir.producer.*; -import mir.generator.*; -import mir.producer.reader.*; -import mir.misc.*; -import mir.util.*; -import mir.entity.adapter.*; -import mircoders.global.*; -import mircoders.global.*; -import mircoders.localizer.*; -import mircoders.producer.reader.*; -import mircoders.producer.*; +import java.io.File; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Vector; + +import mir.entity.adapter.EntityAdapterModel; +import mir.generator.Generator; +import mir.generator.WriterEngine; +import mir.misc.Logfile; +import mir.producer.CompositeProducerNode; +import mir.producer.ProducerFactory; +import mir.producer.reader.DefaultProducerNodeBuilders; +import mir.producer.reader.ProducerConfigReader; +import mir.producer.reader.ProducerNodeBuilderLibrary; +import mir.util.FileMonitor; +import mircoders.global.MirGlobal; +import mircoders.global.ProducerEngine; +import mircoders.localizer.MirLocalizerExc; +import mircoders.localizer.MirLocalizerFailure; +import mircoders.localizer.MirProducerLocalizer; +import mircoders.producer.CompositeProducerFactory; +import mircoders.producer.OldProducerAdapterFactory; +import mircoders.producer.ProducerAudio; +import mircoders.producer.ProducerImages; +import mircoders.producer.ProducerOther; +import mircoders.producer.ProducerVideo; +import mircoders.producer.reader.SupplementalProducerNodeBuilders; public class MirBasicProducerLocalizer implements MirProducerLocalizer { private List producerFactories; diff --git a/source/mircoders/localizer/basic/MirBasicWriterEngine.java b/source/mircoders/localizer/basic/MirBasicWriterEngine.java index 34cac2bb..14f43f4f 100755 --- a/source/mircoders/localizer/basic/MirBasicWriterEngine.java +++ b/source/mircoders/localizer/basic/MirBasicWriterEngine.java @@ -31,10 +31,13 @@ package mircoders.localizer.basic; -import java.util.*; -import java.io.*; -import mir.generator.*; -import mircoders.localizer.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; + +import mir.generator.WriterEngine; +import mircoders.localizer.MirLocalizerFailure; public class MirBasicWriterEngine implements WriterEngine { private String defaultEncoding; diff --git a/source/mircoders/media/ImageProcessor.java b/source/mircoders/media/ImageProcessor.java index 95c22afa..2e1352d1 100755 --- a/source/mircoders/media/ImageProcessor.java +++ b/source/mircoders/media/ImageProcessor.java @@ -31,12 +31,22 @@ package mircoders.media; -import java.io.*; -import java.awt.image.renderable.ParameterBlock; -import javax.media.jai.*; -import com.sun.media.jai.codec.*; - -import mir.log.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; + +import javax.media.jai.InterpolationBilinear; +import javax.media.jai.JAI; +import javax.media.jai.ParameterBlockJAI; +import javax.media.jai.PlanarImage; + +import mir.log.LoggerWrapper; + +import com.sun.media.jai.codec.ByteArraySeekableStream; +import com.sun.media.jai.codec.FileSeekableStream; +import com.sun.media.jai.codec.SeekableStream; /** * diff --git a/source/mircoders/media/MediaHandlerAudio.java b/source/mircoders/media/MediaHandlerAudio.java index 6717d2e2..6f91273e 100755 --- a/source/mircoders/media/MediaHandlerAudio.java +++ b/source/mircoders/media/MediaHandlerAudio.java @@ -31,13 +31,7 @@ package mircoders.media; -import java.util.*; - -import mir.media.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; - +import mir.media.MirMedia; /** * Handles audio media, like mp3 and maybe it could also handle some other. @@ -46,14 +40,19 @@ import mir.storage.*; * @see mir.media.MediaHandlerGeneric * @see mir.media.MirMedia * @author mh - * @version $Id: MediaHandlerAudio.java,v 1.6 2002/11/28 07:28:24 mh Exp $ + * @version $Id: MediaHandlerAudio.java,v 1.7 2003/01/25 17:50:35 idfx Exp $ */ public class MediaHandlerAudio extends MediaHandlerGeneric implements MirMedia { - private static String tinyIcon = MirConfig.getProp("Producer.Icon.TinyAudio"); - private static String bigIcon = MirConfig.getProp("Producer.Icon.BigAudio"); + private static String tinyIcon; + private static String bigIcon; + + static { + tinyIcon = configuration.getString("Producer.Icon.TinyAudio"); + bigIcon = configuration.getString("Producer.Icon.BigAudio"); + } public String getTinyIcon() { diff --git a/source/mircoders/media/MediaHandlerGeneric.java b/source/mircoders/media/MediaHandlerGeneric.java index 0c351583..04e3cd0d 100755 --- a/source/mircoders/media/MediaHandlerGeneric.java +++ b/source/mircoders/media/MediaHandlerGeneric.java @@ -31,16 +31,21 @@ package mircoders.media; -import java.util.*; -import java.io.*; - +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; + +import mir.config.MirPropertiesConfiguration; +import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; +import mir.entity.Entity; +import mir.media.MirMedia; +import mir.media.MirMediaException; +import mir.misc.FileUtil; +import mir.misc.Logfile; +import mir.misc.StringUtil; import freemarker.template.SimpleList; -import mir.media.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; - /** * This is the Generic MediaHandler. It stores the media data on @@ -59,17 +64,27 @@ import mir.storage.*; * * @see mir.media.MirMedia * @author mh - * @version $Id: MediaHandlerGeneric.java,v 1.12 2003/01/17 17:34:52 zapata Exp $ + * @version $Id: MediaHandlerGeneric.java,v 1.13 2003/01/25 17:50:35 idfx Exp $ */ public class MediaHandlerGeneric implements MirMedia { - protected static String imageHost = MirConfig.getProp("Producer.Image.Host"); - protected static String imageRoot = MirConfig.getProp("Producer.ImageRoot"); - protected static Logfile theLog = Logfile.getInstance( - MirConfig.getProp("Home")+ - "log/media.log"); + protected static MirPropertiesConfiguration configuration; + protected static String imageHost; + protected static String imageRoot; + protected static Logfile theLog; private final String sepChar = File.separator; + + static { + try { + configuration = MirPropertiesConfiguration.instance(); + } catch (PropertiesConfigExc e) { + e.printStackTrace(); + } + imageHost = configuration.getString("Producer.Image.Host"); + imageRoot = configuration.getString("Producer.ImageRoot"); + theLog = Logfile.getInstance(configuration.getStringWithHome("log/media.log")); + } public void set (InputStream in, Entity ent, Entity mediaTypeEnt ) throws MirMediaException { @@ -128,27 +143,27 @@ public class MediaHandlerGeneric implements MirMedia public String getStoragePath() { - return MirConfig.getProp("Producer.Media.Path"); + return configuration.getString("Producer.Media.Path"); } public String getIconStoragePath() { - return MirConfig.getProp("Producer.Image.IconPath"); + return configuration.getString("Producer.Image.IconPath"); } public String getPublishHost() { - return StringUtil.removeSlash(MirConfig.getProp("Producer.Media.Host")); + return StringUtil.removeSlash(configuration.getString("Producer.Media.Host")); } public String getTinyIconName() { - return MirConfig.getProp("Producer.Icon.TinyText"); + return configuration.getString("Producer.Icon.TinyText"); } public String getBigIconName() { - return MirConfig.getProp("Producer.Icon.BigText"); + return configuration.getString("Producer.Icon.BigText"); } public String getIconAltName() diff --git a/source/mircoders/media/MediaHandlerImages.java b/source/mircoders/media/MediaHandlerImages.java index 50952583..7f1fe971 100755 --- a/source/mircoders/media/MediaHandlerImages.java +++ b/source/mircoders/media/MediaHandlerImages.java @@ -32,18 +32,20 @@ package mircoders.media; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.lang.reflect.*; - -import freemarker.template.SimpleList; - -import mir.media.*; -import mir.misc.*; -import mir.entity.*; -import mir.storage.StorageObjectException; +import java.io.File; +import java.io.InputStream; + +import mir.config.MirPropertiesConfiguration; +import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; +import mir.entity.Entity; +import mir.media.MirMedia; +import mir.media.MirMediaException; +import mir.misc.FileUtil; +import mir.misc.Logfile; +import mir.misc.StringUtil; +import mir.storage.StorageObjectFailure; import mircoders.entity.EntityImages; +import freemarker.template.SimpleList; /** * This class handles saving, fetching creating representations @@ -59,17 +61,26 @@ import mircoders.entity.EntityImages; * * @see mir.media.MirMedia * @author mh - * @version $Id: MediaHandlerImages.java,v 1.15 2002/12/17 19:20:31 zapata Exp $ + * @version $Id: MediaHandlerImages.java,v 1.16 2003/01/25 17:50:35 idfx Exp $ */ public abstract class MediaHandlerImages implements MirMedia { - static Logfile theLog = Logfile.getInstance(MirConfig.getProp("Home")+ - "log/media.log"); + static MirPropertiesConfiguration configuration; + static Logfile theLog; static final String PNG = "PNG"; static final String JPEG = "JPEG"; + static { + try { + configuration = MirPropertiesConfiguration.instance(); + } catch (PropertiesConfigExc e) { + e.printStackTrace(); + } + theLog = Logfile.getInstance(configuration.getString("Home")+"log/media.log"); + } + abstract String getType(); public InputStream getMedia(Entity ent, Entity mediaTypeEnt) @@ -78,7 +89,7 @@ public abstract class MediaHandlerImages implements MirMedia InputStream in; try { in = ((EntityImages)ent).getImage(); - } catch ( StorageObjectException e) { + } catch ( StorageObjectFailure e) { theLog.printDebugInfo("MediaHandlerImages.getImage: "+e.toString()); throw new MirMediaException(e.toString()); } @@ -92,7 +103,7 @@ public abstract class MediaHandlerImages implements MirMedia try { ((EntityImages)ent).setImage(in, getType()); } - catch ( StorageObjectException e) { + catch ( StorageObjectFailure e) { e.printStackTrace(System.out); theLog.printError("MediaHandlerImages.set: "+e.getMessage()); throw new MirMediaException(e.getMessage()); @@ -105,7 +116,7 @@ public abstract class MediaHandlerImages implements MirMedia String datePath = StringUtil.webdbDate2path(date); String ext = "."+mediaTypeEnt.getValue("name"); String filepath = datePath+ent.getId()+ext; - String iconFilePath = MirConfig.getProp("Producer.StorageRoot") + String iconFilePath = configuration.getString("Producer.StorageRoot") +getIconStoragePath() + filepath; String productionFilePath = getStoragePath() + File.separator + filepath; @@ -140,7 +151,7 @@ public abstract class MediaHandlerImages implements MirMedia InputStream in; try { in = ((EntityImages)ent).getIcon(); - } catch ( StorageObjectException e) { + } catch ( StorageObjectFailure e) { theLog.printDebugInfo("MediaHandlerImages.getIcon: "+e.toString()); throw new MirMediaException(e.toString()); } @@ -157,27 +168,27 @@ public abstract class MediaHandlerImages implements MirMedia public String getStoragePath() { - return MirConfig.getProp("Producer.Image.Path"); + return configuration.getString("Producer.Image.Path"); } public String getIconStoragePath() { - return MirConfig.getProp("Producer.Image.IconPath"); + return configuration.getString("Producer.Image.IconPath"); } public String getPublishHost() { - return StringUtil.removeSlash(MirConfig.getProp("Producer.Image.Host")); + return StringUtil.removeSlash(configuration.getString("Producer.Image.Host")); } public String getTinyIconName() { - return MirConfig.getProp("Producer.Icon.TinyImage"); + return configuration.getString("Producer.Icon.TinyImage"); } public String getBigIconName() { - return MirConfig.getProp("Producer.Icon.BigImage"); + return configuration.getString("Producer.Icon.BigImage"); } public String getIconAltName() diff --git a/source/mircoders/media/MediaHandlerImagesExtern.java b/source/mircoders/media/MediaHandlerImagesExtern.java index f529ae6d..74da6700 100755 --- a/source/mircoders/media/MediaHandlerImagesExtern.java +++ b/source/mircoders/media/MediaHandlerImagesExtern.java @@ -32,20 +32,15 @@ package mircoders.media; -import java.lang.*; -import java.io.*; -import java.util.*; -import java.lang.reflect.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; -import freemarker.template.SimpleList; - -import mir.media.*; -import mir.misc.*; -import mir.entity.*; -import mir.storage.*; - -import mircoders.entity.*; -import mircoders.storage.*; +import mir.config.MirPropertiesConfiguration; +import mir.entity.Entity; +import mir.media.MirMediaException; +import mir.misc.StringUtil; +import mircoders.storage.DatabaseUploadedMedia; /** @@ -64,7 +59,7 @@ public class MediaHandlerImagesExtern extends MediaHandlerGeneric String datePath = StringUtil.webdbDate2path(date); String ext = "." + mediaTypeEnt.getValue("name"); String filePath = datePath + anImageEntity.getId() + ext; - String iconFilePath = MirConfig.getProp("Producer.StorageRoot") + getIconStoragePath() + filePath; + String iconFilePath = MirPropertiesConfiguration.instance().getString("Producer.StorageRoot") + getIconStoragePath() + filePath; String imageFilePath = getStoragePath() + File.separator + filePath; File imageFile = new File(imageFilePath); @@ -111,7 +106,7 @@ public class MediaHandlerImagesExtern extends MediaHandlerGeneric String date = anImageEntity.getValue("date"); String datePath = StringUtil.webdbDate2path(date); String ext = "." + mediaType.getValue("name"); - String filePath = MirConfig.getProp("Producer.StorageRoot") + + String filePath = MirPropertiesConfiguration.instance().getString("Producer.StorageRoot") + getIconStoragePath() + datePath + anImageEntity.getId() + ext; return new FileInputStream(new File(filePath)); @@ -123,27 +118,27 @@ public class MediaHandlerImagesExtern extends MediaHandlerGeneric public String getStoragePath() { - return MirConfig.getProp("Producer.Image.Path"); + return configuration.getString("Producer.Image.Path"); } public String getIconStoragePath() { - return MirConfig.getProp("Producer.Image.IconPath"); + return configuration.getString("Producer.Image.IconPath"); } public String getPublishHost() { - return StringUtil.removeSlash(MirConfig.getProp("Producer.Image.Host")); + return StringUtil.removeSlash(configuration.getString("Producer.Image.Host")); } public String getTinyIconName() { - return MirConfig.getProp("Producer.Icon.TinyImage"); + return configuration.getString("Producer.Icon.TinyImage"); } public String getBigIconName() { - return MirConfig.getProp("Producer.Icon.BigImage"); + return configuration.getString("Producer.Icon.BigImage"); } public String getIconAltName() diff --git a/source/mircoders/media/MediaHandlerImagesJpeg.java b/source/mircoders/media/MediaHandlerImagesJpeg.java index bc34b477..f1c7ca75 100755 --- a/source/mircoders/media/MediaHandlerImagesJpeg.java +++ b/source/mircoders/media/MediaHandlerImagesJpeg.java @@ -32,8 +32,8 @@ package mircoders.media; -import mir.media.*; import mir.entity.Entity; +import mir.media.MirMedia; /** * This class handles saving, fetching creating representations @@ -45,7 +45,7 @@ import mir.entity.Entity; * @see mir.media.MirMedia * @see mircoders.media.MediaHandlerImages * @author mh, mir-coders group - * @version $Id: MediaHandlerImagesJpeg.java,v 1.3 2002/11/27 08:57:32 mh Exp $ + * @version $Id: MediaHandlerImagesJpeg.java,v 1.4 2003/01/25 17:50:35 idfx Exp $ */ diff --git a/source/mircoders/media/MediaHandlerImagesPng.java b/source/mircoders/media/MediaHandlerImagesPng.java index 631b47b4..e60ceaa8 100755 --- a/source/mircoders/media/MediaHandlerImagesPng.java +++ b/source/mircoders/media/MediaHandlerImagesPng.java @@ -32,8 +32,8 @@ package mircoders.media; -import mir.media.*; import mir.entity.Entity; +import mir.media.MirMedia; /** * This class handles saving, fetching creating representations @@ -45,7 +45,7 @@ import mir.entity.Entity; * @see mir.media.MirMedia * @see mircoders.media.MediaHandlerImages * @author mh ,mir-coders - * @version $Id: MediaHandlerImagesPng.java,v 1.4 2002/11/28 07:28:24 mh Exp $ + * @version $Id: MediaHandlerImagesPng.java,v 1.5 2003/01/25 17:50:35 idfx Exp $ */ diff --git a/source/mircoders/media/MediaHandlerMp3.java b/source/mircoders/media/MediaHandlerMp3.java index 11442070..4861a217 100755 --- a/source/mircoders/media/MediaHandlerMp3.java +++ b/source/mircoders/media/MediaHandlerMp3.java @@ -31,16 +31,15 @@ package mircoders.media; -import java.util.*; import java.io.StringReader; -import freemarker.template.SimpleList; +import mir.entity.Entity; +import mir.media.MirMedia; +import mir.media.MirMediaException; +import mir.misc.FileUtil; +import mir.misc.StringUtil; import freemarker.template.SimpleHash; - -import mir.media.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; +import freemarker.template.SimpleList; /** @@ -67,7 +66,7 @@ import mir.storage.*; * * @see mir.media.MirMedia * @author mh - * @version $Id: MediaHandlerMp3.java,v 1.9 2002/11/28 07:28:24 mh Exp $ + * @version $Id: MediaHandlerMp3.java,v 1.10 2003/01/25 17:50:35 idfx Exp $ */ public class MediaHandlerMp3 extends MediaHandlerAudio implements MirMedia diff --git a/source/mircoders/media/MediaHandlerRealAudio.java b/source/mircoders/media/MediaHandlerRealAudio.java index 23416a83..2c669b77 100755 --- a/source/mircoders/media/MediaHandlerRealAudio.java +++ b/source/mircoders/media/MediaHandlerRealAudio.java @@ -31,16 +31,15 @@ package mircoders.media; -import java.util.*; import java.io.StringReader; -import freemarker.template.SimpleList; +import mir.entity.Entity; +import mir.media.MirMedia; +import mir.media.MirMediaException; +import mir.misc.FileUtil; +import mir.misc.StringUtil; import freemarker.template.SimpleHash; - -import mir.media.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; +import freemarker.template.SimpleList; @@ -52,7 +51,7 @@ import mir.storage.*; * @see mir.media.MediaHandlerGeneric * @see mir.media.MirMedia * @author john , mh - * @version $Id: MediaHandlerRealAudio.java,v 1.13 2002/11/28 07:28:24 mh Exp $ + * @version $Id: MediaHandlerRealAudio.java,v 1.14 2003/01/25 17:50:35 idfx Exp $ */ @@ -68,8 +67,8 @@ public class MediaHandlerRealAudio extends MediaHandlerAudio implements String baseName = ent.getId(); String date = ent.getValue("date"); String datePath = StringUtil.webdbDate2path(date); - String rtspDir = MirConfig.getProp("Producer.RealMedia.Path"); - String rtspMediaHost = MirConfig.getProp("Producer.RealMedia.Host"); + String rtspDir = configuration.getString("Producer.RealMedia.Path"); + String rtspMediaHost = configuration.getString("Producer.RealMedia.Host"); String RealMediaPointer = rtspMediaHost+ent.getValue("publish_path"); String RealMediaFile = datePath+ent.getId()+".ram"; @@ -98,7 +97,7 @@ public class MediaHandlerRealAudio extends MediaHandlerAudio implements // somehow SimpleHash ramHash = new SimpleHash(); ramHash.put("publish_path", basePath+".ram"); - ramHash.put("publish_server", MirConfig.getProp("Producer.Media.Host")); + ramHash.put("publish_server", configuration.getString("Producer.Media.Host")); ramHash.put("title", "stream URL"); theList.add(ramHash); @@ -108,7 +107,7 @@ public class MediaHandlerRealAudio extends MediaHandlerAudio implements public String getStoragePath() { - return MirConfig.getProp("Producer.RealMedia.Path"); + return configuration.getString("Producer.RealMedia.Path"); } public String getDescr(Entity mediaType) @@ -118,7 +117,7 @@ public class MediaHandlerRealAudio extends MediaHandlerAudio implements public String getPublishHost() { - return StringUtil.removeSlash(MirConfig.getProp("Producer.RealMedia.Host")); + return StringUtil.removeSlash(configuration.getString("Producer.RealMedia.Host")); } } diff --git a/source/mircoders/media/MediaHandlerRealVideo.java b/source/mircoders/media/MediaHandlerRealVideo.java index c93d3338..3fa2826c 100755 --- a/source/mircoders/media/MediaHandlerRealVideo.java +++ b/source/mircoders/media/MediaHandlerRealVideo.java @@ -31,16 +31,15 @@ package mircoders.media; -import java.util.*; import java.io.StringReader; -import freemarker.template.SimpleList; +import mir.entity.Entity; +import mir.media.MirMedia; +import mir.media.MirMediaException; +import mir.misc.FileUtil; +import mir.misc.StringUtil; import freemarker.template.SimpleHash; - -import mir.media.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; +import freemarker.template.SimpleList; @@ -52,7 +51,7 @@ import mir.storage.*; * @see mir.media.MediaHandlerGeneric * @see mir.media.MirMedia * @author john , mh - * @version $Id: MediaHandlerRealVideo.java,v 1.13 2002/11/28 07:28:24 mh Exp $ + * @version $Id: MediaHandlerRealVideo.java,v 1.14 2003/01/25 17:50:35 idfx Exp $ */ @@ -68,8 +67,8 @@ public class MediaHandlerRealVideo extends MediaHandlerVideo implements String baseName = ent.getId(); String date = ent.getValue("date"); String datePath = StringUtil.webdbDate2path(date); - String rtspDir = MirConfig.getProp("Producer.RealMedia.Path"); - String rtspMediaHost = MirConfig.getProp("Producer.RealMedia.Host"); + String rtspDir = configuration.getString("Producer.RealMedia.Path"); + String rtspMediaHost = configuration.getString("Producer.RealMedia.Host"); String RealMediaPointer = rtspMediaHost+ent.getValue("publish_path"); String RealMediaFile = datePath+ent.getId()+".ram"; @@ -98,7 +97,7 @@ public class MediaHandlerRealVideo extends MediaHandlerVideo implements // somehow SimpleHash ramHash = new SimpleHash(); ramHash.put("publish_path", basePath+".ram"); - ramHash.put("publish_server", MirConfig.getProp("Producer.Media.Host")); + ramHash.put("publish_server", configuration.getString("Producer.Media.Host")); ramHash.put("title", "stream URL"); theList.add(ramHash); @@ -108,7 +107,7 @@ public class MediaHandlerRealVideo extends MediaHandlerVideo implements public String getStoragePath() { - return MirConfig.getProp("Producer.RealMedia.Path"); + return configuration.getString("Producer.RealMedia.Path"); } public String getDescr(Entity mediaType) @@ -118,7 +117,7 @@ public class MediaHandlerRealVideo extends MediaHandlerVideo implements public String getPublishHost() { - return StringUtil.removeSlash(MirConfig.getProp("Producer.RealMedia.Host")); + return StringUtil.removeSlash(configuration.getString("Producer.RealMedia.Host")); } } diff --git a/source/mircoders/media/MediaHandlerVideo.java b/source/mircoders/media/MediaHandlerVideo.java index 4c1ca4a8..451eb876 100755 --- a/source/mircoders/media/MediaHandlerVideo.java +++ b/source/mircoders/media/MediaHandlerVideo.java @@ -31,12 +31,7 @@ package mircoders.media; -import java.util.*; - -import mir.media.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; +import mir.media.MirMedia; /** @@ -47,15 +42,21 @@ import mir.storage.*; * @see mir.media.MediaHandlerGeneric * @see mir.media.MirMedia * @author john - * @version $Id: MediaHandlerVideo.java,v 1.5 2002/11/28 07:28:24 mh Exp $ + * @version $Id: MediaHandlerVideo.java,v 1.6 2003/01/25 17:50:35 idfx Exp $ */ public class MediaHandlerVideo extends MediaHandlerGeneric implements MirMedia { - private static String tinyIcon = MirConfig.getProp("Producer.Icon.TinyVideo"); - private static String bigIcon = MirConfig.getProp("Producer.Icon.BigVideo"); + private static String tinyIcon; + private static String bigIcon; + static { + tinyIcon = configuration.getString("Producer.Icon.TinyVideo"); + bigIcon = configuration.getString("Producer.Icon.BigVideo"); + + } + public String getTinyIcon() { return tinyIcon; diff --git a/source/mircoders/media/MediaRequest.java b/source/mircoders/media/MediaRequest.java index a07bbd34..dbfd8fca 100755 --- a/source/mircoders/media/MediaRequest.java +++ b/source/mircoders/media/MediaRequest.java @@ -31,22 +31,30 @@ package mircoders.media; -import java.util.*; -import java.io.*; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.Iterator; -import javax.servlet.http.HttpServletRequest; import javax.servlet.ServletContext; -import com.oreilly.servlet.multipart.FilePart; - -import mircoders.storage.DatabaseMediaType; -import mircoders.producer.ProducerMedia; -import mir.storage.StorageObjectException; -import mir.storage.Database; +import mir.config.MirPropertiesConfiguration; +import mir.entity.Entity; +import mir.entity.EntityList; +import mir.media.MediaHelper; +import mir.media.MirMedia; +import mir.media.MirMediaException; +import mir.misc.FileHandler; +import mir.misc.FileHandlerException; +import mir.misc.FileHandlerUserException; +import mir.misc.StringUtil; import mir.module.ModuleException; -import mir.entity.*; -import mir.misc.*; -import mir.media.*; +import mir.storage.Database; +import mir.storage.StorageObjectExc; +import mir.storage.StorageObjectFailure; +import mircoders.producer.ProducerMedia; +import mircoders.storage.DatabaseMediaType; + +import com.oreilly.servlet.multipart.FilePart; /* * MediaRequest.java - @@ -55,7 +63,7 @@ import mir.media.*; * appropriate media objects are set. * * @author mh - * @version $Id: MediaRequest.java,v 1.11 2002/12/23 03:38:32 mh Exp $ + * @version $Id: MediaRequest.java,v 1.12 2003/01/25 17:50:35 idfx Exp $ * */ @@ -130,8 +138,7 @@ public class MediaRequest implements FileHandler * So if you support a new media type you have to make sure that * it is in this file -mh */ - ServletContext ctx = - (ServletContext)MirConfig.getPropAsObject("ServletContext"); + ServletContext ctx = MirPropertiesConfiguration.getContext(); contentType = ctx.getMimeType(fileName); if (contentType==null) contentType = "text/plain"; // rfc1867 says this is the default @@ -271,10 +278,12 @@ public class MediaRequest implements FileHandler _returnList.add(mediaEnt); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { // first try to delete it.. don't catch exception as we've already.. try { mediaStorage.delete(mediaId); } catch (Exception e2) {} throw new FileHandlerException("error in MediaRequest: "+e.toString()); + } catch (StorageObjectExc e) { + throw new FileHandlerException("error in MediaRequest: "+e.toString()); } //end try/catch block } // method setFile() diff --git a/source/mircoders/module/ModuleArticleType.java b/source/mircoders/module/ModuleArticleType.java index 9ef8c941..38050c2b 100755 --- a/source/mircoders/module/ModuleArticleType.java +++ b/source/mircoders/module/ModuleArticleType.java @@ -31,23 +31,9 @@ package mircoders.module; -import java.io.*; -import java.lang.*; -import java.util.*; -import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import freemarker.template.*; - -import mir.servlet.*; -import mir.module.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; -import mir.entity.*; -import mir.storage.*; -import mir.log.*; +import mir.log.LoggerWrapper; +import mir.module.AbstractModule; +import mir.storage.StorageObject; public class ModuleArticleType extends AbstractModule { static LoggerWrapper logger = new LoggerWrapper("Module.ArticleType"); diff --git a/source/mircoders/module/ModuleBreaking.java b/source/mircoders/module/ModuleBreaking.java index 7a116bd2..e90f2652 100755 --- a/source/mircoders/module/ModuleBreaking.java +++ b/source/mircoders/module/ModuleBreaking.java @@ -31,21 +31,10 @@ package mircoders.module; -import java.io.*; -import java.lang.*; -import java.util.*; -import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import freemarker.template.*; - -import mir.servlet.*; -import mir.module.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; -import mir.log.*; +import mir.entity.EntityList; +import mir.log.LoggerWrapper; +import mir.module.AbstractModule; +import mir.storage.StorageObject; diff --git a/source/mircoders/module/ModuleComment.java b/source/mircoders/module/ModuleComment.java index 2a2c280e..c9a6e4aa 100755 --- a/source/mircoders/module/ModuleComment.java +++ b/source/mircoders/module/ModuleComment.java @@ -31,23 +31,20 @@ package mircoders.module; -import java.io.*; -import java.lang.*; -import java.util.*; -import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.PrintWriter; +import java.util.HashMap; -import freemarker.template.*; - -import mir.servlet.*; -import mir.module.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; -import mir.log.*; - -import mircoders.storage.*; +import mir.entity.Entity; +import mir.log.LoggerToWriterAdapter; +import mir.log.LoggerWrapper; +import mir.module.AbstractModule; +import mir.module.ModuleException; +import mir.storage.StorageObject; +import mir.storage.StorageObjectExc; +import mir.storage.StorageObjectFailure; +import mircoders.storage.DatabaseComment; +import mircoders.storage.DatabaseContent; +import freemarker.template.SimpleList; /* @@ -72,7 +69,7 @@ public class ModuleComment extends AbstractModule try { return ((DatabaseComment)theStorage).getPopupData(); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { throw new ModuleException(e.toString()); } } @@ -85,7 +82,9 @@ public class ModuleComment extends AbstractModule super.deleteById(anId); } - catch (StorageObjectException e){ + catch (StorageObjectFailure e){ + throw new ModuleException(e.toString()); + } catch (StorageObjectExc e) { throw new ModuleException(e.toString()); } } @@ -103,11 +102,13 @@ public class ModuleComment extends AbstractModule theEntity.update(); return theEntity.getId(); } - catch (StorageObjectException e){ + catch (StorageObjectFailure e){ logger.error("ModuleComment.set: " + e.getMessage()); e.printStackTrace(new PrintWriter(new LoggerToWriterAdapter(logger, LoggerWrapper.DEBUG_MESSAGE))); throw new ModuleException(e.toString()); + } catch (StorageObjectExc e) { + throw new ModuleException(e.toString()); } } } diff --git a/source/mircoders/module/ModuleCommentStatus.java b/source/mircoders/module/ModuleCommentStatus.java index ff9bf0b8..5ddd9bdf 100755 --- a/source/mircoders/module/ModuleCommentStatus.java +++ b/source/mircoders/module/ModuleCommentStatus.java @@ -31,23 +31,9 @@ package mircoders.module; -import java.io.*; -import java.lang.*; -import java.util.*; -import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import freemarker.template.*; - -import mir.servlet.*; -import mir.module.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; -import mir.entity.*; -import mir.storage.*; -import mir.log.*; +import mir.log.LoggerWrapper; +import mir.module.AbstractModule; +import mir.storage.StorageObject; public class ModuleCommentStatus extends AbstractModule { static LoggerWrapper logger = new LoggerWrapper("Module.CommentStatus"); diff --git a/source/mircoders/module/ModuleContent.java b/source/mircoders/module/ModuleContent.java index 3c929305..0e5c305e 100755 --- a/source/mircoders/module/ModuleContent.java +++ b/source/mircoders/module/ModuleContent.java @@ -31,28 +31,25 @@ package mircoders.module; -import java.io.*; -import java.util.*; -import java.sql.*; - -import javax.servlet.*; -import javax.servlet.http.*; - -import mir.servlet.*; -import mir.module.*; -import mir.entity.*; -import mir.misc.*; -import mir.util.*; -import mir.storage.*; -import mir.log.*; - -import mircoders.entity.*; -import mircoders.storage.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Set; +import java.util.StringTokenizer; + +import mir.entity.EntityList; +import mir.log.LoggerWrapper; +import mir.module.AbstractModule; +import mir.module.ModuleException; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import mir.util.JDBCStringRoutines; +import mircoders.entity.EntityUsers; +import mircoders.storage.DatabaseContentToMedia; /* * ContentObjekt - * - * @version $Id: ModuleContent.java,v 1.13 2002/12/14 01:37:43 zapata Exp $ + * @version $Id: ModuleContent.java,v 1.14 2003/01/25 17:50:35 idfx Exp $ * * @author RK, mir-coders * @@ -148,7 +145,7 @@ public class ModuleContent extends AbstractModule } return theStorage.selectByWhereClause(whereClause, offset); } - catch (StorageObjectException e){ + catch (StorageObjectFailure e){ throw new ModuleException(e.toString()); } @@ -171,14 +168,14 @@ public class ModuleContent extends AbstractModule } return theStorage.selectByWhereClause(whereClause, orderBy, offset, limit); } - catch (StorageObjectException e){ throw new ModuleException(e.toString()); } + catch (StorageObjectFailure e){ throw new ModuleException(e.toString()); } } public EntityList getContent(String whereClause, String orderBy,int offset, int limit) throws ModuleException { try { return theStorage.selectByWhereClause(whereClause, orderBy, offset, limit); - } catch (StorageObjectException e){ + } catch (StorageObjectFailure e){ throw new ModuleException(e.toString()); } } @@ -226,7 +223,7 @@ public class ModuleContent extends AbstractModule } return theStorage.selectByWhereClause(whereClause, orderBy, offset); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { throw new ModuleException(e.toString()); } } diff --git a/source/mircoders/module/ModuleFeature.java b/source/mircoders/module/ModuleFeature.java index 25c25e2a..f7ef77ea 100755 --- a/source/mircoders/module/ModuleFeature.java +++ b/source/mircoders/module/ModuleFeature.java @@ -31,23 +31,13 @@ package mircoders.module; -import java.io.*; -import java.lang.*; -import java.util.*; -import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import freemarker.template.*; - -import mir.servlet.*; -import mir.module.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; -import mir.log.*; - -import mircoders.storage.*; +import mir.log.LoggerWrapper; +import mir.module.AbstractModule; +import mir.module.ModuleException; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import mircoders.storage.DatabaseFeature; +import freemarker.template.SimpleList; /* * SchwerpunktObjekt - * @@ -68,7 +58,7 @@ public class ModuleFeature extends AbstractModule try { return ((DatabaseFeature)theStorage).getPopupData(); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { throw new ModuleException(e.toString()); } } diff --git a/source/mircoders/module/ModuleImages.java b/source/mircoders/module/ModuleImages.java index c9c308e7..172ed1c0 100755 --- a/source/mircoders/module/ModuleImages.java +++ b/source/mircoders/module/ModuleImages.java @@ -31,24 +31,13 @@ package mircoders.module; -import java.io.*; -import java.lang.*; -import java.util.*; -import java.sql.*; - -import javax.servlet.*; -import javax.servlet.http.*; - -import freemarker.template.*; - -import mir.servlet.*; -import mir.module.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; -import mir.log.*; - -import mircoders.storage.*; +import mir.log.LoggerWrapper; +import mir.module.AbstractModule; +import mir.module.ModuleException; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import mircoders.storage.DatabaseImages; +import freemarker.template.SimpleList; public class ModuleImages extends AbstractModule { static LoggerWrapper logger = new LoggerWrapper("Module.Images"); @@ -68,7 +57,7 @@ public class ModuleImages extends AbstractModule { // String sql = "select id, name from Bilder order by name"; try { return ((DatabaseImages)theStorage).getPopupData(); - } catch (StorageObjectException e) { + } catch (StorageObjectFailure e) { throw new ModuleException(e.toString()); } } diff --git a/source/mircoders/module/ModuleLanguage.java b/source/mircoders/module/ModuleLanguage.java index 432d3a0c..6287258b 100755 --- a/source/mircoders/module/ModuleLanguage.java +++ b/source/mircoders/module/ModuleLanguage.java @@ -31,23 +31,9 @@ package mircoders.module; -import java.io.*; -import java.lang.*; -import java.util.*; -import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import freemarker.template.*; - -import mir.servlet.*; -import mir.module.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; -import mir.entity.*; -import mir.storage.*; -import mir.log.*; +import mir.log.LoggerWrapper; +import mir.module.AbstractModule; +import mir.storage.StorageObject; /** * Title: mir - another content management system diff --git a/source/mircoders/module/ModuleLinksImcs.java b/source/mircoders/module/ModuleLinksImcs.java index 573e24c3..a72185a3 100755 --- a/source/mircoders/module/ModuleLinksImcs.java +++ b/source/mircoders/module/ModuleLinksImcs.java @@ -31,24 +31,11 @@ package mircoders.module; -import java.io.*; -import java.lang.*; -import java.util.*; -import java.sql.*; - -import javax.servlet.*; -import javax.servlet.http.*; - -import freemarker.template.*; - -import mir.servlet.*; -import mir.module.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; -import mir.log.*; - -import mircoders.storage.*; +import mir.log.LoggerWrapper; +import mir.module.AbstractModule; +import mir.storage.StorageObject; +import mircoders.storage.DatabaseLinksImcs; +import freemarker.template.SimpleHash; /* * ModuleLinksImcs - diff --git a/source/mircoders/module/ModuleMediafolder.java b/source/mircoders/module/ModuleMediafolder.java index 5d1d85ba..5b05e2b8 100755 --- a/source/mircoders/module/ModuleMediafolder.java +++ b/source/mircoders/module/ModuleMediafolder.java @@ -40,23 +40,12 @@ package mircoders.module; * @version */ -import java.io.*; -import java.lang.*; -import java.util.*; -import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import freemarker.template.*; - -import mir.servlet.*; -import mir.module.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; -import mir.log.*; - -import mircoders.storage.*; +import mir.log.LoggerWrapper; +import mir.module.AbstractModule; +import mir.module.ModuleException; +import mir.storage.StorageObject; +import mircoders.storage.DatabaseMediafolder; +import freemarker.template.SimpleList; public class ModuleMediafolder extends AbstractModule diff --git a/source/mircoders/module/ModuleMessage.java b/source/mircoders/module/ModuleMessage.java index 431e071d..624f8979 100755 --- a/source/mircoders/module/ModuleMessage.java +++ b/source/mircoders/module/ModuleMessage.java @@ -31,21 +31,9 @@ package mircoders.module; -import java.io.*; -import java.lang.*; -import java.util.*; -import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import freemarker.template.*; - -import mir.servlet.*; -import mir.module.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; -import mir.log.*; +import mir.log.LoggerWrapper; +import mir.module.AbstractModule; +import mir.storage.StorageObject; /** * Title: ModuleMessage diff --git a/source/mircoders/module/ModuleSchwerpunkt.java b/source/mircoders/module/ModuleSchwerpunkt.java index 139c4f0f..6b9df4e4 100755 --- a/source/mircoders/module/ModuleSchwerpunkt.java +++ b/source/mircoders/module/ModuleSchwerpunkt.java @@ -31,23 +31,13 @@ package mircoders.module; -import java.io.*; -import java.lang.*; -import java.util.*; -import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import freemarker.template.*; - -import mir.servlet.*; -import mir.module.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; -import mir.log.*; - -import mircoders.storage.*; +import mir.log.LoggerWrapper; +import mir.module.AbstractModule; +import mir.module.ModuleException; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import mircoders.storage.DatabaseFeature; +import freemarker.template.SimpleList; /* * Feature - @@ -69,7 +59,7 @@ public class ModuleSchwerpunkt extends AbstractModule try { return ((DatabaseFeature)theStorage).getPopupData(); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { throw new ModuleException(e.toString()); } } diff --git a/source/mircoders/module/ModuleTopics.java b/source/mircoders/module/ModuleTopics.java index 1f0a3946..ffa4a895 100755 --- a/source/mircoders/module/ModuleTopics.java +++ b/source/mircoders/module/ModuleTopics.java @@ -37,11 +37,11 @@ import freemarker.template.SimpleList; import mir.entity.Entity; import mir.entity.EntityList; -import mir.misc.MirConfig; import mir.module.AbstractModule; import mir.module.ModuleException; import mir.storage.StorageObject; -import mir.storage.StorageObjectException; +import mir.storage.StorageObjectExc; +import mir.storage.StorageObjectFailure; import mir.log.*; import mircoders.entity.EntityContent; @@ -69,7 +69,7 @@ public class ModuleTopics extends AbstractModule { try { return ((DatabaseTopics) theStorage).getPopupData(); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { throw new ModuleException(e.toString()); } } @@ -95,7 +95,7 @@ public class ModuleTopics extends AbstractModule { * Overrides the AbstractModule.set(), * All dependent ContentEntities are set unproduced. * @param theValues Hash mit Spalte/Wert-Paaren - * @return Id des eingefügten Objekts + * @return Id des eingef?gten Objekts * @exception ModuleException */ public String set(HashMap theValues) throws ModuleException { @@ -116,7 +116,10 @@ public class ModuleTopics extends AbstractModule { theEntity.update(); return theEntity.getId(); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { + e.printStackTrace(System.err); + throw new ModuleException(e.toString()); + } catch (StorageObjectExc e) { e.printStackTrace(System.err); throw new ModuleException(e.toString()); } diff --git a/source/mircoders/module/ModuleUploadedMedia.java b/source/mircoders/module/ModuleUploadedMedia.java index 45ceb14f..e875ce86 100755 --- a/source/mircoders/module/ModuleUploadedMedia.java +++ b/source/mircoders/module/ModuleUploadedMedia.java @@ -31,23 +31,9 @@ package mircoders.module; -import java.io.*; -import java.lang.*; -import java.util.*; -import java.sql.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import freemarker.template.*; - -import mir.servlet.*; -import mir.module.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; -import mir.log.*; - -import mircoders.storage.*; +import mir.log.LoggerWrapper; +import mir.module.AbstractModule; +import mir.storage.StorageObject; /* * ThemenModule - diff --git a/source/mircoders/module/ModuleUsers.java b/source/mircoders/module/ModuleUsers.java index 2003151d..07bf5b2f 100755 --- a/source/mircoders/module/ModuleUsers.java +++ b/source/mircoders/module/ModuleUsers.java @@ -31,25 +31,15 @@ package mircoders.module; -import java.io.*; -import java.lang.*; -import java.util.*; -import java.sql.*; - -import javax.servlet.*; -import javax.servlet.http.*; - -import freemarker.template.*; - -import mir.servlet.*; -import mir.module.*; -import mir.entity.*; -import mir.misc.*; -import mir.storage.*; -import mir.log.*; - -import mircoders.entity.*; -import mircoders.storage.*; +import mir.entity.EntityList; +import mir.log.LoggerWrapper; +import mir.module.AbstractModule; +import mir.module.ModuleException; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import mircoders.entity.EntityUsers; +import mircoders.storage.DatabaseUsers; +import freemarker.template.SimpleList; /* @@ -90,7 +80,7 @@ public class ModuleUsers extends AbstractModule try { return theStorage.selectByWhereClause(whereClause, null, offset, limit); } - catch (StorageObjectException e){ + catch (StorageObjectFailure e){ throw new ModuleException(e.toString()); } } @@ -99,7 +89,7 @@ public class ModuleUsers extends AbstractModule try { return ((DatabaseUsers)theStorage).getPopupData(); } - catch(StorageObjectException e) { + catch(StorageObjectFailure e) { throw new ModuleException(e.toString()); } } diff --git a/source/mircoders/producer/CompositeProducer.java b/source/mircoders/producer/CompositeProducer.java index e6b90c91..b64a3cce 100755 --- a/source/mircoders/producer/CompositeProducer.java +++ b/source/mircoders/producer/CompositeProducer.java @@ -31,10 +31,13 @@ package mircoders.producer; -import java.util.*; -import java.io.*; -import mir.producer.*; -import mir.log.*; +import java.util.Iterator; +import java.util.List; +import java.util.Vector; + +import mir.log.LoggerWrapper; +import mir.producer.ProducerExc; +import mir.producer.ProducerFailure; public class CompositeProducer implements mir.producer.Producer { private List producers; diff --git a/source/mircoders/producer/CompositeProducerFactory.java b/source/mircoders/producer/CompositeProducerFactory.java index 1a38be9c..23acbe1f 100755 --- a/source/mircoders/producer/CompositeProducerFactory.java +++ b/source/mircoders/producer/CompositeProducerFactory.java @@ -31,9 +31,15 @@ package mircoders.producer; -import java.util.*; -import mir.entity.*; -import mir.producer.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Vector; + +import mir.producer.ProducerExc; +import mir.producer.ProducerFactory; +import mir.producer.ProducerFailure; public class CompositeProducerFactory implements ProducerFactory { private Map factories; // verb -> Vector ( ProducerFactory ) diff --git a/source/mircoders/producer/ContentMarkingProducerNode.java b/source/mircoders/producer/ContentMarkingProducerNode.java index 4430a5a6..aba7408f 100755 --- a/source/mircoders/producer/ContentMarkingProducerNode.java +++ b/source/mircoders/producer/ContentMarkingProducerNode.java @@ -31,14 +31,15 @@ package mircoders.producer; -import java.util.*; +import java.util.Map; -import mir.log.*; -import mir.util.*; -import mir.producer.*; -import mir.entity.*; -import mir.entity.adapter.*; -import mircoders.entity.*; +import mir.entity.Entity; +import mir.entity.adapter.EntityAdapter; +import mir.log.LoggerWrapper; +import mir.producer.ProducerFailure; +import mir.producer.ProducerNode; +import mir.util.ParameterExpander; +import mircoders.entity.EntityContent; public class ContentMarkingProducerNode implements ProducerNode { diff --git a/source/mircoders/producer/ContentModifyingProducerNode.java b/source/mircoders/producer/ContentModifyingProducerNode.java index e65c6593..5fd0b7b4 100755 --- a/source/mircoders/producer/ContentModifyingProducerNode.java +++ b/source/mircoders/producer/ContentModifyingProducerNode.java @@ -31,18 +31,17 @@ package mircoders.producer; -import java.util.*; -import java.io.*; +import java.util.Map; -import mir.util.*; -import mir.producer.*; -import mir.entity.*; -import mir.entity.adapter.*; -import mir.log.*; - -import mircoders.entity.*; -import mircoders.module.*; -import mircoders.storage.*; +import mir.entity.Entity; +import mir.entity.adapter.EntityAdapter; +import mir.log.LoggerWrapper; +import mir.producer.ProducerFailure; +import mir.producer.ProducerNode; +import mir.util.ParameterExpander; +import mircoders.entity.EntityContent; +import mircoders.module.ModuleContent; +import mircoders.storage.DatabaseContent; public class ContentModifyingProducerNode implements ProducerNode { diff --git a/source/mircoders/producer/IndexingProducerNode.java b/source/mircoders/producer/IndexingProducerNode.java index 650c5285..b6523d28 100755 --- a/source/mircoders/producer/IndexingProducerNode.java +++ b/source/mircoders/producer/IndexingProducerNode.java @@ -30,29 +30,34 @@ package mircoders.producer; -import java.util.*; -import java.io.*; +import java.io.PrintWriter; +import java.util.Map; + +import mir.entity.Entity; +import mir.entity.adapter.EntityAdapter; +import mir.log.LoggerToWriterAdapter; +import mir.log.LoggerWrapper; +import mir.misc.StringUtil; +import mir.producer.ProducerFailure; +import mir.producer.ProducerNode; +import mir.util.ParameterExpander; +import mircoders.entity.EntityContent; +import mircoders.search.AudioSearchTerm; +import mircoders.search.ContentSearchTerm; +import mircoders.search.ImagesSearchTerm; +import mircoders.search.IndexUtil; +import mircoders.search.KeywordSearchTerm; +import mircoders.search.TextSearchTerm; +import mircoders.search.TopicSearchTerm; +import mircoders.search.UnIndexedSearchTerm; +import mircoders.search.VideoSearchTerm; import org.apache.lucene.analysis.standard.StandardAnalyzer; -import org.apache.lucene.index.*; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.FSDirectory; - -import mir.util.*; -import mir.misc.*; -import mir.log.*; -import mir.entity.*; -import mir.entity.adapter.*; -import mir.producer.*; -import mircoders.global.*; -import mircoders.localizer.*; -import mircoders.entity.*; -import mircoders.storage.*; -import mircoders.search.*; - - public class IndexingProducerNode implements ProducerNode { private String contentKey; private String indexPath; diff --git a/source/mircoders/producer/MediaGeneratingProducerNode.java b/source/mircoders/producer/MediaGeneratingProducerNode.java index ad9281ac..539a17b2 100755 --- a/source/mircoders/producer/MediaGeneratingProducerNode.java +++ b/source/mircoders/producer/MediaGeneratingProducerNode.java @@ -31,20 +31,18 @@ package mircoders.producer; -import java.util.*; -import java.io.*; - -import mir.util.*; -import mir.log.*; -import mir.misc.*; -import mir.media.*; -import mir.producer.*; -import mir.generator.*; -import mir.entity.*; -import mir.entity.adapter.*; - -import mircoders.entity.*; -import mircoders.storage.*; +import java.util.Map; + +import mir.entity.Entity; +import mir.entity.adapter.EntityAdapter; +import mir.log.LoggerWrapper; +import mir.media.MediaHelper; +import mir.media.MirMedia; +import mir.producer.ProducerExc; +import mir.producer.ProducerNode; +import mir.util.ParameterExpander; +import mircoders.entity.EntityUploadedMedia; +import mircoders.storage.DatabaseUploadedMedia; public class MediaGeneratingProducerNode implements ProducerNode { private String mediaEntityKey; diff --git a/source/mircoders/producer/OldProducerAdapter.java b/source/mircoders/producer/OldProducerAdapter.java index a9d2803f..fb4f1d8d 100755 --- a/source/mircoders/producer/OldProducerAdapter.java +++ b/source/mircoders/producer/OldProducerAdapter.java @@ -31,10 +31,11 @@ package mircoders.producer; -import java.io.*; +import java.io.PrintWriter; -import mir.producer.*; -import mir.log.*; +import mir.log.LoggerToWriterAdapter; +import mir.log.LoggerWrapper; +import mir.producer.ProducerFailure; public class OldProducerAdapter implements mir.producer.Producer { diff --git a/source/mircoders/producer/OldProducerAdapterFactory.java b/source/mircoders/producer/OldProducerAdapterFactory.java index 5d702092..9e009582 100755 --- a/source/mircoders/producer/OldProducerAdapterFactory.java +++ b/source/mircoders/producer/OldProducerAdapterFactory.java @@ -31,8 +31,13 @@ package mircoders.producer; -import mir.producer.*; -import java.util.*; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Vector; + +import mir.producer.ProducerFactory; +import mir.producer.SimpleProducerVerb; public class OldProducerAdapterFactory implements ProducerFactory { private List verbs; diff --git a/source/mircoders/producer/PDFGeneratingProducerNode.java b/source/mircoders/producer/PDFGeneratingProducerNode.java index 05dd2518..6a2b063e 100755 --- a/source/mircoders/producer/PDFGeneratingProducerNode.java +++ b/source/mircoders/producer/PDFGeneratingProducerNode.java @@ -31,13 +31,12 @@ package mircoders.producer; -import java.util.*; -import java.io.*; +import java.util.Map; -import mir.log.*; -import mir.util.*; -import mir.producer.*; +import mir.log.LoggerWrapper; import mir.misc.PDFUtil; +import mir.producer.ProducerNode; +import mir.util.ParameterExpander; public class PDFGeneratingProducerNode implements ProducerNode { private String generatorExpression; diff --git a/source/mircoders/producer/PDFPreFormattingProducerNode.java b/source/mircoders/producer/PDFPreFormattingProducerNode.java index 84e7e62c..1ae82e34 100755 --- a/source/mircoders/producer/PDFPreFormattingProducerNode.java +++ b/source/mircoders/producer/PDFPreFormattingProducerNode.java @@ -31,20 +31,25 @@ package mircoders.producer; -import java.util.*; -import java.io.*; - -import mir.util.*; -import mir.producer.*; -import mir.entity.*; -import mir.entity.adapter.*; -import mir.log.*; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import mir.entity.Entity; +import mir.entity.EntityList; +import mir.entity.adapter.EntityAdapter; +import mir.log.LoggerToWriterAdapter; +import mir.log.LoggerWrapper; import mir.misc.StringUtil; +import mir.producer.ProducerFailure; +import mir.producer.ProducerNode; +import mir.util.CachingRewindableIterator; import mir.util.HTMLRoutines; - - -import mircoders.entity.*; -import mircoders.storage.*; +import mir.util.ParameterExpander; +import mircoders.entity.EntityContent; +import mircoders.entity.EntityImages; +import mircoders.storage.DatabaseContentToMedia; //because images are returned as a template model!(maybe not needed after all!) //import freemarker.template.*; diff --git a/source/mircoders/producer/Producer.java b/source/mircoders/producer/Producer.java index 94e08e53..4c096482 100755 --- a/source/mircoders/producer/Producer.java +++ b/source/mircoders/producer/Producer.java @@ -31,28 +31,43 @@ package mircoders.producer; -import java.io.*; - -import freemarker.template.*; - -import mir.misc.*; -import mir.storage.*; -import mir.module.*; - -import mircoders.module.*; -import mircoders.entity.*; -import mircoders.storage.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; + +import mir.config.MirPropertiesConfiguration; +import mir.misc.HTMLParseException; +import mir.misc.HTMLTemplateProcessor; +import mir.misc.LineFilterWriter; +import mir.misc.Logfile; +import mir.module.ModuleException; +import mir.storage.StorageObjectFailure; +import mircoders.entity.EntityUsers; +import mircoders.module.ModuleContent; +import mircoders.module.ModuleFeature; +import mircoders.module.ModuleImages; +import mircoders.module.ModuleLinksImcs; +import mircoders.module.ModuleSchwerpunkt; +import mircoders.module.ModuleTopics; +import mircoders.module.ModuleUploadedMedia; +import mircoders.storage.DatabaseContent; +import mircoders.storage.DatabaseFeature; +import mircoders.storage.DatabaseImages; +import mircoders.storage.DatabaseLinksImcs; +import mircoders.storage.DatabaseTopics; +import freemarker.template.TemplateModelRoot; abstract public class Producer { - protected static String producerDocRoot = MirConfig.getProp("Producer.DocRoot"); - protected static String producerStorageRoot = MirConfig.getProp("Producer.StorageRoot"); - protected static String producerProductionHost = MirConfig.getProp("Producer.ProductionHost"); - protected static String producerOpenAction = MirConfig.getProp("Producer.OpenAction");; - - protected static String actionRoot = MirConfig.getProp("RootUri") + "/Mir"; - - protected static Logfile theLog = Logfile.getInstance(MirConfig.getProp("Home") + "/" + MirConfig.getProp("Producer.Logfile")); + protected static MirPropertiesConfiguration configuration; + protected static String producerDocRoot; + protected static String producerStorageRoot; + protected static String producerProductionHost; + protected static String producerOpenAction; + protected static String actionRoot; + protected static Logfile theLog; protected static ModuleTopics topicsModule; protected static ModuleLinksImcs linksImcsModule; protected static ModuleSchwerpunkt schwerpunktModule; @@ -64,7 +79,13 @@ abstract public class Producer { static { // init try { - + configuration = MirPropertiesConfiguration.instance(); + producerDocRoot = configuration.getString("Producer.DocRoot"); + producerStorageRoot = configuration.getString("Producer.StorageRoot"); + producerProductionHost = configuration.getString("Producer.ProductionHost"); + producerOpenAction = configuration.getString("Producer.OpenAction"); + actionRoot = configuration.getString("RootUri") + "/Mir"; + theLog = Logfile.getInstance(configuration.getStringWithHome("Producer.Logfile")); contentModule = new ModuleContent(DatabaseContent.getInstance()); topicsModule = new ModuleTopics(DatabaseTopics.getInstance()); linksImcsModule = new ModuleLinksImcs(DatabaseLinksImcs.getInstance()); @@ -74,26 +95,26 @@ abstract public class Producer { uploadedMediaModule = new ModuleUploadedMedia(DatabaseImages.getInstance()); } - catch(StorageObjectException e) + catch(Exception e) { System.err.println("*** failed to initialize Producer " + e.toString()); } } public void handle(PrintWriter htmlout, EntityUsers user) - throws StorageObjectException, ModuleException { + throws StorageObjectFailure, ModuleException { handle(htmlout,user,false,false); } abstract public void handle(PrintWriter htmlout, EntityUsers user, boolean forced, boolean sync) - throws StorageObjectException, ModuleException; + throws StorageObjectFailure, ModuleException; // // Methods for producing files public boolean produce(String template, String filename, TemplateModelRoot model, PrintWriter htmlout) { return _produce(template, filename, model, htmlout, false, - MirConfig.getProp("Mir.DefaultEncoding")); + configuration.getString("Mir.DefaultEncoding")); } public boolean produce(String template, String filename, TemplateModelRoot model, PrintWriter htmlout, String encoding) { @@ -102,7 +123,7 @@ abstract public class Producer { public boolean produce_compressed(String template, String filename, TemplateModelRoot model, PrintWriter htmlout) { return _produce(template, filename, model, htmlout, true, - MirConfig.getProp("Mir.DefaultEncoding")); + configuration.getString("Mir.DefaultEncoding")); } private boolean _produce(String template, String filename, TemplateModelRoot model, PrintWriter htmlout, boolean compressed, String encoding) { diff --git a/source/mircoders/producer/ProducerAudio.java b/source/mircoders/producer/ProducerAudio.java index 8d943268..3f4f4cce 100755 --- a/source/mircoders/producer/ProducerAudio.java +++ b/source/mircoders/producer/ProducerAudio.java @@ -31,24 +31,14 @@ package mircoders.producer; -import java.io.*; -import java.lang.*; -import java.util.*; - -import freemarker.template.*; - -import mir.misc.*; -import mir.storage.*; -import mir.module.*; -import mir.entity.*; - -import mircoders.entity.*; -import mircoders.storage.*; +import mir.storage.Database; +import mir.storage.StorageObjectFailure; +import mircoders.storage.DatabaseAudio; public class ProducerAudio extends ProducerMedia { - protected Database getStorage() throws StorageObjectException { + protected Database getStorage() throws StorageObjectFailure { return DatabaseAudio.getInstance(); } diff --git a/source/mircoders/producer/ProducerImages.java b/source/mircoders/producer/ProducerImages.java index 9c360c16..56a281df 100755 --- a/source/mircoders/producer/ProducerImages.java +++ b/source/mircoders/producer/ProducerImages.java @@ -31,24 +31,14 @@ package mircoders.producer; -import java.io.*; -import java.lang.*; -import java.util.*; - -import freemarker.template.*; - -import mir.misc.*; -import mir.storage.*; -import mir.module.*; -import mir.entity.*; - -import mircoders.entity.*; -import mircoders.storage.*; +import mir.storage.Database; +import mir.storage.StorageObjectFailure; +import mircoders.storage.DatabaseImages; public class ProducerImages extends ProducerMedia { - protected Database getStorage() throws StorageObjectException { + protected Database getStorage() throws StorageObjectFailure { return DatabaseImages.getInstance(); } diff --git a/source/mircoders/producer/ProducerMedia.java b/source/mircoders/producer/ProducerMedia.java index be0c1b3b..6dd74189 100755 --- a/source/mircoders/producer/ProducerMedia.java +++ b/source/mircoders/producer/ProducerMedia.java @@ -31,33 +31,29 @@ package mircoders.producer; -import java.io.*; -import java.lang.*; -import java.util.*; - -//import freemarker.template.*; - -import mir.misc.*; -import mir.storage.*; -import mir.module.*; -import mir.entity.*; -import mir.media.*; - -import mircoders.media.*; -import mircoders.entity.*; -import mircoders.storage.*; +import java.io.PrintWriter; + +import mir.entity.Entity; +import mir.entity.EntityList; +import mir.media.MediaHelper; +import mir.media.MirMedia; +import mir.module.ModuleException; +import mir.storage.Database; +import mir.storage.StorageObjectFailure; +import mircoders.entity.EntityUsers; +import mircoders.storage.DatabaseUploadedMedia; abstract public class ProducerMedia extends Producer { - abstract Database getStorage() throws StorageObjectException; + abstract Database getStorage() throws StorageObjectFailure; public void handle(PrintWriter htmlout, EntityUsers user, boolean force, - boolean sync) throws StorageObjectException, ModuleException { + boolean sync) throws StorageObjectFailure, ModuleException { handle(htmlout,user,force,sync,null); } public void handle(PrintWriter htmlout,EntityUsers user,boolean force, - boolean sync, String id) throws StorageObjectException, ModuleException + boolean sync, String id) throws StorageObjectFailure, ModuleException { long sessionConnectTime = 0; long startTime = (new java.util.Date()).getTime(); @@ -68,7 +64,7 @@ abstract public class ProducerMedia extends Producer { EntityList batchEntityList; int contentBatchsize = - Integer.parseInt(MirConfig.getProp("Producer.Content.Batchsize")); + Integer.parseInt(configuration.getString("Producer.Content.Batchsize")); orderBy = "webdb_lastchange desc"; // get batch of non-produced medias, that are to be published diff --git a/source/mircoders/producer/ProducerOther.java b/source/mircoders/producer/ProducerOther.java index e779b9ab..ddc17231 100755 --- a/source/mircoders/producer/ProducerOther.java +++ b/source/mircoders/producer/ProducerOther.java @@ -31,24 +31,14 @@ package mircoders.producer; -import java.io.*; -import java.lang.*; -import java.util.*; - -import freemarker.template.*; - -import mir.misc.*; -import mir.storage.*; -import mir.module.*; -import mir.entity.*; - -import mircoders.entity.*; -import mircoders.storage.*; +import mir.storage.Database; +import mir.storage.StorageObjectFailure; +import mircoders.storage.DatabaseOther; public class ProducerOther extends ProducerMedia { - protected Database getStorage() throws StorageObjectException { + protected Database getStorage() throws StorageObjectFailure { return DatabaseOther.getInstance(); } diff --git a/source/mircoders/producer/ProducerVideo.java b/source/mircoders/producer/ProducerVideo.java index cf811e7f..c2425f5f 100755 --- a/source/mircoders/producer/ProducerVideo.java +++ b/source/mircoders/producer/ProducerVideo.java @@ -31,24 +31,14 @@ package mircoders.producer; -import java.io.*; -import java.lang.*; -import java.util.*; - -import freemarker.template.*; - -import mir.misc.*; -import mir.storage.*; -import mir.module.*; -import mir.entity.*; - -import mircoders.entity.*; -import mircoders.storage.*; +import mir.storage.Database; +import mir.storage.StorageObjectFailure; +import mircoders.storage.DatabaseVideo; public class ProducerVideo extends ProducerMedia { - protected Database getStorage() throws StorageObjectException { + protected Database getStorage() throws StorageObjectFailure { return DatabaseVideo.getInstance(); } diff --git a/source/mircoders/producer/UnIndexingProducerNode.java b/source/mircoders/producer/UnIndexingProducerNode.java index b180bbf1..4ceaf843 100755 --- a/source/mircoders/producer/UnIndexingProducerNode.java +++ b/source/mircoders/producer/UnIndexingProducerNode.java @@ -31,21 +31,18 @@ package mircoders.producer; -import java.util.*; -import java.io.*; - -import freemarker.template.*; - -import mir.util.*; -import mir.log.*; -import mir.producer.*; -import mircoders.global.*; -import mircoders.localizer.*; -import mir.entity.*; -import mir.entity.adapter.*; -import mircoders.entity.*; -import mircoders.storage.*; -import mircoders.search.*; +import java.io.PrintWriter; +import java.util.Map; + +import mir.entity.Entity; +import mir.entity.adapter.EntityAdapter; +import mir.log.LoggerToWriterAdapter; +import mir.log.LoggerWrapper; +import mir.producer.ProducerFailure; +import mir.producer.ProducerNode; +import mir.util.ParameterExpander; +import mircoders.entity.EntityContent; +import mircoders.search.IndexUtil; public class UnIndexingProducerNode implements ProducerNode { diff --git a/source/mircoders/producer/reader/SupplementalProducerNodeBuilders.java b/source/mircoders/producer/reader/SupplementalProducerNodeBuilders.java index c42490bb..f8dc2685 100755 --- a/source/mircoders/producer/reader/SupplementalProducerNodeBuilders.java +++ b/source/mircoders/producer/reader/SupplementalProducerNodeBuilders.java @@ -31,13 +31,21 @@ package mircoders.producer.reader; -import java.util.*; -import mir.producer.*; -import mir.producer.reader.*; -import mir.util.*; -import mir.entity.adapter.*; -import mir.generator.*; -import mircoders.producer.*; +import java.util.Map; + +import mir.entity.adapter.EntityAdapterModel; +import mir.producer.ProducerNode; +import mir.producer.reader.DefaultProducerNodeBuilders; +import mir.producer.reader.ProducerConfigExc; +import mir.producer.reader.ProducerNodeBuilderLibrary; +import mir.producer.reader.ReaderTool; +import mircoders.producer.ContentMarkingProducerNode; +import mircoders.producer.ContentModifyingProducerNode; +import mircoders.producer.IndexingProducerNode; +import mircoders.producer.MediaGeneratingProducerNode; +import mircoders.producer.PDFGeneratingProducerNode; +import mircoders.producer.PDFPreFormattingProducerNode; +import mircoders.producer.UnIndexingProducerNode; public class SupplementalProducerNodeBuilders { diff --git a/source/mircoders/search/AudioSearchTerm.java b/source/mircoders/search/AudioSearchTerm.java index 3b245525..d580edd0 100755 --- a/source/mircoders/search/AudioSearchTerm.java +++ b/source/mircoders/search/AudioSearchTerm.java @@ -31,21 +31,19 @@ package mircoders.search; -import java.util.*; +import javax.servlet.http.HttpServletRequest; -import javax.servlet.*; -import javax.servlet.http.*; +import mir.entity.Entity; +import mir.entity.EntityList; +import mir.storage.StorageObjectFailure; +import mircoders.entity.EntityContent; +import mircoders.storage.DatabaseContentToMedia; -import mir.entity.*; -import mir.storage.*; -import mircoders.entity.*; -import mircoders.storage.*; - -import org.apache.lucene.index.*; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import freemarker.template.*; +import freemarker.template.SimpleHash; +import freemarker.template.SimpleScalar; public class AudioSearchTerm extends SearchTerm{ @@ -55,7 +53,7 @@ public class AudioSearchTerm extends SearchTerm{ public static String paramName = "search_hasAudio"; public static String templateVariable = "hasAudio"; - public void index(Document doc, Entity entity) throws StorageObjectException{ + public void index(Document doc, Entity entity) throws StorageObjectFailure{ EntityList audio = DatabaseContentToMedia.getInstance().getAudio((EntityContent) entity); if (audio != null && audio.size()>0){ doc.add(Field.Keyword(matchField,"y")); diff --git a/source/mircoders/search/ContentSearchTerm.java b/source/mircoders/search/ContentSearchTerm.java index b37ff65d..f24083fb 100755 --- a/source/mircoders/search/ContentSearchTerm.java +++ b/source/mircoders/search/ContentSearchTerm.java @@ -31,18 +31,16 @@ package mircoders.search; -import java.util.*; +import java.util.StringTokenizer; -import javax.servlet.*; -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; -import mir.entity.*; +import mir.entity.Entity; -import org.apache.lucene.index.*; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import freemarker.template.*; +import freemarker.template.SimpleHash; public class ContentSearchTerm extends SearchTerm{ diff --git a/source/mircoders/search/ImagesSearchTerm.java b/source/mircoders/search/ImagesSearchTerm.java index 0b2ca05e..723eb709 100755 --- a/source/mircoders/search/ImagesSearchTerm.java +++ b/source/mircoders/search/ImagesSearchTerm.java @@ -31,21 +31,22 @@ package mircoders.search; -import java.util.*; +import java.util.StringTokenizer; -import javax.servlet.*; -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; -import mir.entity.*; -import mir.storage.*; -import mircoders.entity.*; -import mircoders.storage.*; +import mir.entity.Entity; +import mir.entity.EntityList; +import mir.storage.StorageObjectFailure; +import mircoders.entity.EntityContent; +import mircoders.storage.DatabaseContentToMedia; -import org.apache.lucene.index.*; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import freemarker.template.*; +import freemarker.template.SimpleHash; +import freemarker.template.SimpleList; +import freemarker.template.SimpleScalar; public class ImagesSearchTerm extends SearchTerm{ @@ -56,7 +57,7 @@ public class ImagesSearchTerm extends SearchTerm{ public static String dataField = "images"; public static String templateVariable = "images"; - public void index(Document doc, Entity entity) throws StorageObjectException{ + public void index(Document doc, Entity entity) throws StorageObjectFailure{ EntityList images = DatabaseContentToMedia.getInstance().getImages((EntityContent) entity); if (images != null && images.size()>0){ doc.add(Field.Keyword(matchField,"y")); diff --git a/source/mircoders/search/IndexUtil.java b/source/mircoders/search/IndexUtil.java index a61f5c33..ec15787b 100755 --- a/source/mircoders/search/IndexUtil.java +++ b/source/mircoders/search/IndexUtil.java @@ -30,10 +30,12 @@ package mircoders.search; -import java.util.*; -import java.io.*; -import mircoders.entity.*; -import org.apache.lucene.index.*; +import java.io.IOException; + +import mircoders.entity.EntityContent; + +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.Term; import org.apache.lucene.store.FSDirectory; diff --git a/source/mircoders/search/KeywordSearchTerm.java b/source/mircoders/search/KeywordSearchTerm.java index 384b3fa8..de8e12b0 100755 --- a/source/mircoders/search/KeywordSearchTerm.java +++ b/source/mircoders/search/KeywordSearchTerm.java @@ -31,18 +31,15 @@ package mircoders.search; -import java.util.*; +import javax.servlet.http.HttpServletRequest; -import javax.servlet.*; -import javax.servlet.http.*; +import mir.entity.Entity; -import mir.entity.*; - -import org.apache.lucene.index.*; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import freemarker.template.*; +import freemarker.template.SimpleHash; +import freemarker.template.SimpleScalar; public class KeywordSearchTerm extends SearchTerm{ diff --git a/source/mircoders/search/SearchTerm.java b/source/mircoders/search/SearchTerm.java index 4f14f6c6..a3c0b886 100755 --- a/source/mircoders/search/SearchTerm.java +++ b/source/mircoders/search/SearchTerm.java @@ -31,19 +31,13 @@ package mircoders.search; -import java.util.*; +import javax.servlet.http.HttpServletRequest; -import javax.servlet.*; -import javax.servlet.http.*; +import mir.entity.Entity; -import mir.entity.*; -import mircoders.entity.*; -import mircoders.storage.*; - -import org.apache.lucene.index.*; import org.apache.lucene.document.Document; -import freemarker.template.*; +import freemarker.template.SimpleHash; abstract public class SearchTerm { diff --git a/source/mircoders/search/TextSearchTerm.java b/source/mircoders/search/TextSearchTerm.java index b461a19c..417bf45b 100755 --- a/source/mircoders/search/TextSearchTerm.java +++ b/source/mircoders/search/TextSearchTerm.java @@ -31,18 +31,15 @@ package mircoders.search; -import java.util.*; +import javax.servlet.http.HttpServletRequest; -import javax.servlet.*; -import javax.servlet.http.*; +import mir.entity.Entity; -import mir.entity.*; - -import org.apache.lucene.index.*; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import freemarker.template.*; +import freemarker.template.SimpleHash; +import freemarker.template.SimpleScalar; public class TextSearchTerm extends SearchTerm{ diff --git a/source/mircoders/search/TopicSearchTerm.java b/source/mircoders/search/TopicSearchTerm.java index e5e66e04..1c13c478 100755 --- a/source/mircoders/search/TopicSearchTerm.java +++ b/source/mircoders/search/TopicSearchTerm.java @@ -31,21 +31,18 @@ package mircoders.search; -import java.util.*; +import javax.servlet.http.HttpServletRequest; -import javax.servlet.*; -import javax.servlet.http.*; +import mir.entity.Entity; +import mir.entity.EntityList; +import mir.storage.StorageObjectFailure; +import mircoders.entity.EntityContent; +import mircoders.storage.DatabaseContentToTopics; -import mir.entity.*; -import mir.storage.*; -import mircoders.entity.*; -import mircoders.storage.*; - -import org.apache.lucene.index.*; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import freemarker.template.*; +import freemarker.template.SimpleHash; public class TopicSearchTerm extends SearchTerm{ @@ -54,7 +51,7 @@ public class TopicSearchTerm extends SearchTerm{ public static String matchField = "topic"; public static String paramName = "search_topic"; - public void index(Document doc, Entity entity) throws StorageObjectException{ + public void index(Document doc, Entity entity) throws StorageObjectFailure{ EntityList topics = DatabaseContentToTopics.getInstance().getTopics((EntityContent) entity); if (topics != null && topics.size()>0){ for(int k=0;k0){ doc.add(Field.Keyword(matchField,"y")); diff --git a/source/mircoders/servlet/ServletHelper.java b/source/mircoders/servlet/ServletHelper.java index 6f43fcbf..135a2124 100755 --- a/source/mircoders/servlet/ServletHelper.java +++ b/source/mircoders/servlet/ServletHelper.java @@ -1,17 +1,17 @@ package mircoders.servlet; -import java.util.*; -import java.io.*; +import java.io.PrintWriter; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; -import org.apache.struts.util.MessageResources; - -import mir.entity.*; -import mir.entity.adapter.*; -import mir.generator.*; -import mir.servlet.*; -import mir.util.*; +import mir.generator.Generator; +import mir.servlet.ServletModuleException; +import mir.util.NullWriter; +import mir.util.ResourceBundleGeneratorFunction; +import mircoders.global.MirGlobal; -import mircoders.global.*; +import org.apache.struts.util.MessageResources; diff --git a/source/mircoders/servlet/ServletModuleAdmin.java b/source/mircoders/servlet/ServletModuleAdmin.java index 0cb87c42..67829099 100755 --- a/source/mircoders/servlet/ServletModuleAdmin.java +++ b/source/mircoders/servlet/ServletModuleAdmin.java @@ -31,26 +31,17 @@ package mircoders.servlet; -import java.io.*; -import java.sql.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.PrintWriter; +import java.util.Map; -import org.apache.struts.util.MessageResources; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import freemarker.template.*; - -import mir.servlet.*; -import mir.misc.*; -import mir.producer.*; -import mir.generator.*; -import mir.producer.*; -import mir.entity.adapter.*; -import mir.util.*; -import mir.log.*; - -import mircoders.global.*; +import mir.log.LoggerToWriterAdapter; +import mir.log.LoggerWrapper; +import mir.servlet.ServletModule; +import mir.servlet.ServletModuleException; +import mir.util.URLBuilder; public class ServletModuleAdmin extends ServletModule { @@ -79,7 +70,7 @@ public class ServletModuleAdmin extends ServletModule ServletHelper.generateResponse(aResponse.getWriter(), responseData, "superusermenu.template"); } catch (Throwable e) { - e.printStackTrace(new PrintWriter(new LoggerToWriterAdapter(logger, logger.ERROR_MESSAGE))); + e.printStackTrace(new PrintWriter(new LoggerToWriterAdapter(logger, LoggerWrapper.ERROR_MESSAGE))); throw new ServletModuleException(e.getMessage()); } diff --git a/source/mircoders/servlet/ServletModuleArticleType.java b/source/mircoders/servlet/ServletModuleArticleType.java index 6cfb27b1..db5db6ce 100755 --- a/source/mircoders/servlet/ServletModuleArticleType.java +++ b/source/mircoders/servlet/ServletModuleArticleType.java @@ -31,22 +31,11 @@ package mircoders.servlet; -import java.io.*; -import java.sql.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import mir.servlet.*; -import mir.module.*; -import mir.misc.*; -import mir.entity.*; -import mir.storage.*; -import mir.log.*; - -import mircoders.entity.*; -import mircoders.storage.*; -import mircoders.module.*; +import mir.config.MirPropertiesConfiguration; +import mir.log.LoggerWrapper; +import mir.servlet.ServletModule; +import mircoders.module.ModuleArticleType; +import mircoders.storage.DatabaseArticleType; public class ServletModuleArticleType extends ServletModule { @@ -55,15 +44,14 @@ public class ServletModuleArticleType extends ServletModule private ServletModuleArticleType() { logger = new LoggerWrapper("ServletModule.ArticleType"); - - templateListString = MirConfig.getProp("ServletModule.ArticleType.ListTemplate"); - templateObjektString = MirConfig.getProp("ServletModule.ArticleType.EditTemplate"); - templateConfirmString = MirConfig.getProp("ServletModule.ArticleType.ConfirmTemplate"); - try { + configuration = MirPropertiesConfiguration.instance(); + templateListString = configuration.getString("ServletModule.ArticleType.ListTemplate"); + templateObjektString = configuration.getString("ServletModule.ArticleType.EditTemplate"); + templateConfirmString = configuration.getString("ServletModule.ArticleType.ConfirmTemplate"); mainModule = new ModuleArticleType(DatabaseArticleType.getInstance()); } - catch (StorageObjectException e) { + catch (Exception e) { logger.error("Initialization of ServletModuleArticleType failed!: " + e.getMessage()); } } diff --git a/source/mircoders/servlet/ServletModuleAudio.java b/source/mircoders/servlet/ServletModuleAudio.java index 94920fd5..9b0a9edc 100755 --- a/source/mircoders/servlet/ServletModuleAudio.java +++ b/source/mircoders/servlet/ServletModuleAudio.java @@ -31,11 +31,9 @@ package mircoders.servlet; -import mir.misc.MirConfig; +import mir.config.MirPropertiesConfiguration; +import mir.log.LoggerWrapper; import mir.servlet.ServletModule; -import mir.storage.StorageObjectException; -import mir.log.*; - import mircoders.module.ModuleUploadedMedia; import mircoders.storage.DatabaseAudio; @@ -58,14 +56,15 @@ public class ServletModuleAudio extends ServletModuleUploadedMedia { private ServletModuleAudio() { logger = new LoggerWrapper("ServletModule.Audio"); - templateListString = MirConfig.getProp("ServletModule.Audio.ListTemplate"); - templateObjektString = MirConfig.getProp("ServletModule.Audio.ObjektTemplate"); - templateConfirmString = MirConfig.getProp("ServletModule.Audio.ConfirmTemplate"); try { + configuration = MirPropertiesConfiguration.instance(); + templateListString = configuration.getString("ServletModule.Audio.ListTemplate"); + templateObjektString = configuration.getString("ServletModule.Audio.ObjektTemplate"); + templateConfirmString = configuration.getString("ServletModule.Audio.ConfirmTemplate"); mainModule = new ModuleUploadedMedia(DatabaseAudio.getInstance()); //dbRights = DatabaseRights.getInstance(); } - catch (StorageObjectException e) { + catch (Exception e) { logger.error("servletmodule audio could not be initialized: " + e.getMessage()); } } diff --git a/source/mircoders/servlet/ServletModuleBreaking.java b/source/mircoders/servlet/ServletModuleBreaking.java index 68e12691..0ca07cba 100755 --- a/source/mircoders/servlet/ServletModuleBreaking.java +++ b/source/mircoders/servlet/ServletModuleBreaking.java @@ -31,21 +31,22 @@ package mircoders.servlet; -import java.io.*; -import java.net.*; -import javax.servlet.http.*; -import javax.servlet.*; -import freemarker.template.*; +import java.io.IOException; +import java.net.URLEncoder; -import mir.servlet.*; -import mir.misc.*; -import mir.entity.*; -import mir.storage.*; -import mir.module.*; -import mir.log.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import mircoders.module.*; -import mircoders.storage.*; +import mir.config.MirPropertiesConfiguration; +import mir.entity.EntityList; +import mir.log.LoggerWrapper; +import mir.misc.HTMLTemplateProcessor; +import mir.module.ModuleException; +import mir.servlet.ServletModule; +import mir.servlet.ServletModuleException; +import mircoders.module.ModuleBreaking; +import mircoders.storage.DatabaseBreaking; +import freemarker.template.SimpleHash; /* * ServletModuleBreaking - @@ -64,15 +65,18 @@ public class ServletModuleBreaking extends ServletModule private ServletModuleBreaking() { logger = new LoggerWrapper("ServletModule.Breaking"); - templateListString = MirConfig.getProp("ServletModule.Breaking.ListTemplate"); - templateObjektString = MirConfig.getProp("ServletModule.Breaking.ObjektTemplate"); - templateConfirmString = MirConfig.getProp("ServletModule.Breaking.ConfirmTemplate"); try { + configuration = MirPropertiesConfiguration.instance(); + + templateListString = configuration.getString("ServletModule.Breaking.ListTemplate"); + templateObjektString = configuration.getString("ServletModule.Breaking.ObjektTemplate"); + templateConfirmString = configuration.getString("ServletModule.Breaking.ConfirmTemplate"); + DatabaseBreaking dbb = DatabaseBreaking.getInstance(); mainModule = new ModuleBreaking(dbb); } - catch (StorageObjectException e) { - logger.error("Initializatoin of ServletModuleBreaking failed!: " + e.getMessage()); + catch (Exception e) { + logger.error("Initialisation of ServletModuleBreaking failed!: " + e.getMessage()); } } diff --git a/source/mircoders/servlet/ServletModuleComment.java b/source/mircoders/servlet/ServletModuleComment.java index 492e7266..5fcc9e23 100755 --- a/source/mircoders/servlet/ServletModuleComment.java +++ b/source/mircoders/servlet/ServletModuleComment.java @@ -31,33 +31,32 @@ package mircoders.servlet; -import java.io.*; -import java.sql.*; -import java.util.*; -import java.net.*; - -import javax.servlet.*; -import javax.servlet.http.*; - -import org.apache.struts.util.MessageResources; - -import freemarker.template.*; - -import mir.servlet.*; -import mir.module.*; -import mir.misc.*; -import mir.entity.*; -import mir.storage.*; -import mir.generator.*; -import mir.entity.*; -import mir.entity.adapter.*; -import mir.util.*; -import mir.log.*; - -import mircoders.storage.*; -import mircoders.global.*; -import mircoders.localizer.*; -import mircoders.module.*; +import java.io.PrintWriter; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import mir.config.MirPropertiesConfiguration; +import mir.entity.adapter.EntityAdapterModel; +import mir.entity.adapter.EntityIteratorAdapter; +import mir.log.LoggerToWriterAdapter; +import mir.log.LoggerWrapper; +import mir.servlet.ServletModule; +import mir.servlet.ServletModuleException; +import mir.util.CachingRewindableIterator; +import mir.util.HTTPRequestParser; +import mir.util.JDBCStringRoutines; +import mir.util.URLBuilder; +import mircoders.global.MirGlobal; +import mircoders.module.ModuleComment; +import mircoders.module.ModuleContent; +import mircoders.storage.DatabaseComment; +import mircoders.storage.DatabaseCommentStatus; +import mircoders.storage.DatabaseContent; +import mircoders.storage.DatabaseLanguage; +import freemarker.template.SimpleHash; +import freemarker.template.TemplateModelRoot; /* * ServletModuleComment - controls navigation for Comments @@ -78,15 +77,17 @@ public class ServletModuleComment extends ServletModule private ServletModuleComment() { logger = new LoggerWrapper("ServletModule.Comment"); - templateListString = MirConfig.getProp("ServletModule.Comment.ListTemplate"); - templateObjektString = MirConfig.getProp("ServletModule.Comment.ObjektTemplate"); - templateConfirmString = MirConfig.getProp("ServletModule.Comment.ConfirmTemplate"); try { + configuration = MirPropertiesConfiguration.instance(); + templateListString = configuration.getString("ServletModule.Comment.ListTemplate"); + templateObjektString = configuration.getString("ServletModule.Comment.ObjektTemplate"); + templateConfirmString = configuration.getString("ServletModule.Comment.ConfirmTemplate"); + mainModule = new ModuleComment(DatabaseComment.getInstance()); moduleContent = new ModuleContent(DatabaseContent.getInstance()); } - catch (StorageObjectException e) { + catch (Exception e) { logger.error("servletmodule comment could not be initialized:" + e.getMessage()); } } @@ -266,7 +267,7 @@ public class ServletModuleComment extends ServletModule ServletHelper.generateResponse(aResponse.getWriter(), responseData, "commentlist.template"); } catch (Throwable e) { - e.printStackTrace(new PrintWriter(new LoggerToWriterAdapter(logger, logger.ERROR_MESSAGE))); + e.printStackTrace(new PrintWriter(new LoggerToWriterAdapter(logger, LoggerWrapper.ERROR_MESSAGE))); throw new ServletModuleException(e.getMessage()); } diff --git a/source/mircoders/servlet/ServletModuleCommentStatus.java b/source/mircoders/servlet/ServletModuleCommentStatus.java index a1446180..d2adaac5 100755 --- a/source/mircoders/servlet/ServletModuleCommentStatus.java +++ b/source/mircoders/servlet/ServletModuleCommentStatus.java @@ -31,22 +31,11 @@ package mircoders.servlet; -import java.io.*; -import java.sql.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import mir.servlet.*; -import mir.module.*; -import mir.misc.*; -import mir.entity.*; -import mir.storage.*; -import mir.log.*; - -import mircoders.entity.*; -import mircoders.storage.*; -import mircoders.module.*; +import mir.config.MirPropertiesConfiguration; +import mir.log.LoggerWrapper; +import mir.servlet.ServletModule; +import mircoders.module.ModuleCommentStatus; +import mircoders.storage.DatabaseCommentStatus; public class ServletModuleCommentStatus extends ServletModule { @@ -56,14 +45,14 @@ public class ServletModuleCommentStatus extends ServletModule private ServletModuleCommentStatus() { logger = new LoggerWrapper("ServletModule.CommentStatus"); - templateListString = MirConfig.getProp("ServletModule.CommentStatus.ListTemplate"); - templateObjektString = MirConfig.getProp("ServletModule.CommentStatus.EditTemplate"); - templateConfirmString = MirConfig.getProp("ServletModule.CommentStatus.ConfirmTemplate"); - try { + configuration = MirPropertiesConfiguration.instance(); + templateListString = configuration.getString("ServletModule.CommentStatus.ListTemplate"); + templateObjektString = configuration.getString("ServletModule.CommentStatus.EditTemplate"); + templateConfirmString = configuration.getString("ServletModule.CommentStatus.ConfirmTemplate"); + mainModule = new ModuleCommentStatus(DatabaseCommentStatus.getInstance()); - } - catch (StorageObjectException e) { + } catch (Exception e) { logger.error("Initialization of ServletModuleCommentStatus failed!: " + e.getMessage()); } } diff --git a/source/mircoders/servlet/ServletModuleContent.java b/source/mircoders/servlet/ServletModuleContent.java index af9de0c5..fbe224d7 100755 --- a/source/mircoders/servlet/ServletModuleContent.java +++ b/source/mircoders/servlet/ServletModuleContent.java @@ -31,40 +31,55 @@ package mircoders.servlet; -import java.io.*; -import java.sql.*; -import java.util.*; -import java.net.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import org.apache.struts.util.MessageResources; -import org.apache.lucene.index.*; - -import freemarker.template.*; - -import mir.servlet.*; -import mir.media.*; -import mir.module.*; -import mir.misc.*; -import mir.storage.*; -import mir.entity.*; -import mir.util.*; -import mir.entity.adapter.*; -import mir.log.*; - -import mircoders.global.*; -import mircoders.storage.*; -import mircoders.module.*; -import mircoders.entity.*; -import mircoders.localizer.*; +import java.io.IOException; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import mir.entity.EntityList; +import mir.entity.adapter.EntityAdapterModel; +import mir.entity.adapter.EntityIteratorAdapter; +import mir.log.LoggerWrapper; +import mir.misc.StringUtil; +import mir.module.ModuleException; +import mir.servlet.ServletModule; +import mir.servlet.ServletModuleException; +import mir.storage.StorageObjectFailure; +import mir.util.CachingRewindableIterator; +import mir.util.HTMLRoutines; +import mir.util.JDBCStringRoutines; +import mircoders.entity.EntityContent; +import mircoders.entity.EntityUsers; +import mircoders.global.MirGlobal; +import mircoders.module.ModuleContent; +import mircoders.module.ModuleImages; +import mircoders.module.ModuleSchwerpunkt; +import mircoders.module.ModuleTopics; import mircoders.search.IndexUtil; +import mircoders.storage.DatabaseArticleType; +import mircoders.storage.DatabaseComment; +import mircoders.storage.DatabaseContent; +import mircoders.storage.DatabaseContentToTopics; +import mircoders.storage.DatabaseFeature; +import mircoders.storage.DatabaseImages; +import mircoders.storage.DatabaseLanguage; +import mircoders.storage.DatabaseTopics; + +import org.apache.lucene.index.IndexReader; + +import freemarker.template.SimpleHash; +import freemarker.template.SimpleScalar; +import freemarker.template.TemplateModelRoot; /* * ServletModuleContent - * deliver html for the article admin form. * - * @version $Id: ServletModuleContent.java,v 1.31 2003/01/18 15:55:14 john Exp $ + * @version $Id: ServletModuleContent.java,v 1.32 2003/01/25 17:50:36 idfx Exp $ * @author rk, mir-coders * */ @@ -83,18 +98,20 @@ public class ServletModuleContent extends ServletModule public static ServletModule getInstance() { return instance; } private ServletModuleContent() { + super(); logger = new LoggerWrapper("ServletModule.Content"); try { - templateListString = MirConfig.getProp("ServletModule.Content.ListTemplate"); - templateObjektString = MirConfig.getProp("ServletModule.Content.ObjektTemplate"); - templateConfirmString = MirConfig.getProp("ServletModule.Content.ConfirmTemplate"); + + templateListString = configuration.getString("ServletModule.Content.ListTemplate"); + templateObjektString = configuration.getString("ServletModule.Content.ObjektTemplate"); + templateConfirmString = configuration.getString("ServletModule.Content.ConfirmTemplate"); mainModule = new ModuleContent(DatabaseContent.getInstance()); themenModule = new ModuleTopics(DatabaseTopics.getInstance()); schwerpunktModule = new ModuleSchwerpunkt(DatabaseFeature.getInstance()); imageModule = new ModuleImages(DatabaseImages.getInstance()); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { logger.error("servletmodulecontent konnte nicht initialisiert werden"); } } @@ -192,7 +209,7 @@ public class ServletModuleContent extends ServletModule _showObject(id, req, res); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { throw new ServletModuleException(e.toString()); } catch (ModuleException e) { @@ -236,14 +253,14 @@ public class ServletModuleContent extends ServletModule //delete rows in the comment-table DatabaseComment.getInstance().deleteByContentId(idParam); //delete from lucene index, if any - String index=MirConfig.getProp("IndexPath"); + String index = configuration.getString("IndexPath"); if (IndexReader.indexExists(index)){ IndexUtil.unindexID(idParam,index); } } catch (ModuleException e) { throw new ServletModuleException(e.toString()); - } catch (StorageObjectException e) { + } catch (StorageObjectFailure e) { throw new ServletModuleException(e.toString()); } catch (IOException e) { throw new ServletModuleException(e.toString()); @@ -278,7 +295,7 @@ public class ServletModuleContent extends ServletModule catch(ModuleException e) { logger.error("smod content :: attach :: could not get entityContent"); } - catch(StorageObjectException e) { + catch(StorageObjectFailure e) { logger.error("smod content :: attach :: could not get entityContent"); } @@ -299,7 +316,7 @@ public class ServletModuleContent extends ServletModule catch(ModuleException e) { logger.error("smod content :: dettach :: could not get entityContent"); } - catch(StorageObjectException e) { + catch(StorageObjectFailure e) { logger.error("smod content :: dettach :: could not get entityContent"); } @@ -317,7 +334,7 @@ public class ServletModuleContent extends ServletModule catch(ModuleException e) { logger.error("smod content :: newswire :: could not get entityContent"); } - catch(StorageObjectException e) { + catch(StorageObjectFailure e) { logger.error("smod content :: dettach :: could not get entityContent"); } @@ -358,7 +375,7 @@ public class ServletModuleContent extends ServletModule else _showObject(idParam, req, res); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { throw new ServletModuleException(e.toString()); } catch (ModuleException e) { diff --git a/source/mircoders/servlet/ServletModuleFileEdit.java b/source/mircoders/servlet/ServletModuleFileEdit.java index 1981aeb4..8ccdac58 100755 --- a/source/mircoders/servlet/ServletModuleFileEdit.java +++ b/source/mircoders/servlet/ServletModuleFileEdit.java @@ -31,26 +31,31 @@ package mircoders.servlet; -import java.io.*; -import java.net.*; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; -import javax.servlet.http.*; -import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import freemarker.template.*; - -import mir.servlet.*; -import mir.misc.*; +import mir.log.LoggerWrapper; import mir.misc.FileExtFilter; -import mir.log.*; +import mir.misc.HTMLTemplateProcessor; +import mir.servlet.ServletModule; +import mir.servlet.ServletModuleException; +import freemarker.template.SimpleHash; +import freemarker.template.SimpleList; /* * ServletModuleFileEdit - * Allows one to do a basic edit of a file in a directory specified * in the config file. * - * @author $Author: zapata $ - * @version $Revision: 1.3 $ $Date: 2002/11/29 13:43:42 $ + * @author $Author: idfx $ + * @version $Revision: 1.4 $ $Date: 2003/01/25 17:50:36 $ * */ @@ -67,18 +72,16 @@ public class ServletModuleFileEdit extends ServletModule private String _extName; private ServletModuleFileEdit() { + super(); logger = new LoggerWrapper("ServletModule.FileEdit"); - _dirName = MirConfig.getProp("ServletModule.FileEdit.FileDirectory"); - _extName = MirConfig.getProp("ServletModule.FileEdit.ExtFilter"); + _dirName = configuration.getString("ServletModule.FileEdit.FileDirectory"); + _extName = configuration.getString("ServletModule.FileEdit.ExtFilter"); - templateListString = - MirConfig.getProp("ServletModule.FileEdit.ListTemplate"); - templateObjektString = - MirConfig.getProp("ServletModule.FileEdit.ObjektTemplate"); - templateConfirmString = - MirConfig.getProp("ServletModule.FileEdit.ConfirmTemplate"); + templateListString =configuration.getString("ServletModule.FileEdit.ListTemplate"); + templateObjektString =configuration.getString("ServletModule.FileEdit.ObjektTemplate"); + templateConfirmString =configuration.getString("ServletModule.FileEdit.ConfirmTemplate"); } public void list(HttpServletRequest req, HttpServletResponse res) diff --git a/source/mircoders/servlet/ServletModuleHidden.java b/source/mircoders/servlet/ServletModuleHidden.java index db11fc84..9182107c 100755 --- a/source/mircoders/servlet/ServletModuleHidden.java +++ b/source/mircoders/servlet/ServletModuleHidden.java @@ -31,25 +31,21 @@ package mircoders.servlet; -import java.io.*; -import java.sql.*; -import java.util.*; -import java.net.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import freemarker.template.*; - -import mir.servlet.*; -import mir.module.*; -import mir.misc.*; -import mir.entity.*; -import mir.storage.*; -import mir.entity.*; -import mir.log.*; - -import mircoders.storage.*; -import mircoders.module.*; +import java.io.IOException; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import mir.entity.EntityList; +import mir.log.LoggerWrapper; +import mir.misc.HTMLTemplateProcessor; +import mir.module.ModuleException; +import mir.servlet.ServletModule; +import mir.servlet.ServletModuleException; +import mir.storage.StorageObjectFailure; +import mircoders.module.ModuleContent; +import mircoders.storage.DatabaseContent; +import freemarker.template.SimpleHash; /* * ServletModuleHidden - output of so called "censored" articles @@ -66,12 +62,13 @@ public class ServletModuleHidden extends ServletModule public static ServletModule getInstance() { return instance; } private ServletModuleHidden() { + super(); logger = new LoggerWrapper("ServletModule.Hidden"); - templateListString = MirConfig.getProp("ServletModule.Hidden.ListTemplate"); + templateListString = configuration.getString("ServletModule.Hidden.ListTemplate"); try { mainModule = new ModuleContent(DatabaseContent.getInstance()); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { logger.error("initialization of servletmoduleHidden failed: " + e.getMessage()); } } diff --git a/source/mircoders/servlet/ServletModuleImages.java b/source/mircoders/servlet/ServletModuleImages.java index 36bfd941..07dd4776 100755 --- a/source/mircoders/servlet/ServletModuleImages.java +++ b/source/mircoders/servlet/ServletModuleImages.java @@ -31,36 +31,16 @@ package mircoders.servlet; -import java.io.*; -import java.lang.*; -import java.sql.*; -import java.util.*; -import java.net.*; -import java.lang.reflect.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import freemarker.template.*; -import com.oreilly.servlet.multipart.*; -import com.oreilly.servlet.*; - -import mir.log.*; -import mir.servlet.*; -import mir.module.*; -import mir.misc.*; -import mir.entity.*; -import mir.storage.*; -import mir.media.*; - -import mircoders.entity.*; -import mircoders.storage.*; -import mircoders.module.*; -import mircoders.producer.*; +import mir.log.LoggerWrapper; +import mir.servlet.ServletModule; +import mir.storage.StorageObjectFailure; +import mircoders.module.ModuleImages; +import mircoders.storage.DatabaseImages; /* * ServletModuleImages - * - * @version $Id: ServletModuleImages.java,v 1.24 2002/11/29 13:43:42 zapata Exp $ + * @version $Id: ServletModuleImages.java,v 1.25 2003/01/25 17:50:36 idfx Exp $ * @author RK, the mir-coders group */ @@ -72,15 +52,16 @@ public class ServletModuleImages extends ServletModuleUploadedMedia private ServletModuleImages() { + super(); logger = new LoggerWrapper("ServletModule.Images"); - templateListString = MirConfig.getProp("ServletModule.Images.ListTemplate"); - templateObjektString = MirConfig.getProp("ServletModule.Images.ObjektTemplate"); - templateConfirmString = MirConfig.getProp("ServletModule.Images.ConfirmTemplate"); + templateListString = configuration.getString("ServletModule.Images.ListTemplate"); + templateObjektString = configuration.getString("ServletModule.Images.ObjektTemplate"); + templateConfirmString = configuration.getString("ServletModule.Images.ConfirmTemplate"); try { mainModule = new ModuleImages(DatabaseImages.getInstance()); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { logger.error("Initialization of ServletModuleImages failed!: " + e.getMessage()); } } diff --git a/source/mircoders/servlet/ServletModuleLanguage.java b/source/mircoders/servlet/ServletModuleLanguage.java index 0def750c..ed28fb3d 100755 --- a/source/mircoders/servlet/ServletModuleLanguage.java +++ b/source/mircoders/servlet/ServletModuleLanguage.java @@ -31,22 +31,11 @@ package mircoders.servlet; -import java.io.*; -import java.sql.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import mir.servlet.*; -import mir.module.*; -import mir.misc.*; -import mir.entity.*; -import mir.storage.*; -import mir.log.*; - -import mircoders.entity.*; -import mircoders.storage.*; -import mircoders.module.*; +import mir.log.LoggerWrapper; +import mir.servlet.ServletModule; +import mir.storage.StorageObjectFailure; +import mircoders.module.ModuleLanguage; +import mircoders.storage.DatabaseLanguage; /* * ServletModuleLanguage - @@ -62,16 +51,17 @@ public class ServletModuleLanguage extends ServletModule public static ServletModule getInstance() { return instance; } private ServletModuleLanguage() { + super(); logger = new LoggerWrapper("ServletModule.Language"); - templateListString = MirConfig.getProp("ServletModule.Language.ListTemplate"); - templateObjektString = MirConfig.getProp("ServletModule.Language.ObjektTemplate"); - templateConfirmString = MirConfig.getProp("ServletModule.Language.ConfirmTemplate"); + templateListString = configuration.getString("ServletModule.Language.ListTemplate"); + templateObjektString = configuration.getString("ServletModule.Language.ObjektTemplate"); + templateConfirmString = configuration.getString("ServletModule.Language.ConfirmTemplate"); try { mainModule = new ModuleLanguage(DatabaseLanguage.getInstance()); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { logger.error("Initialization of ServletModuleLanguage failed: " + e.getMessage()); } } diff --git a/source/mircoders/servlet/ServletModuleLinksImcs.java b/source/mircoders/servlet/ServletModuleLinksImcs.java index 51527179..efb4313c 100755 --- a/source/mircoders/servlet/ServletModuleLinksImcs.java +++ b/source/mircoders/servlet/ServletModuleLinksImcs.java @@ -31,8 +31,6 @@ package mircoders.servlet; -import freemarker.template.SimpleHash; - import java.io.IOException; import java.io.PrintWriter; import java.net.URLEncoder; @@ -41,20 +39,18 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import mir.entity.EntityList; +import mir.log.LoggerWrapper; import mir.misc.HTMLParseException; import mir.misc.HTMLTemplateProcessor; -import mir.misc.Logfile; -import mir.misc.MirConfig; import mir.module.ModuleException; import mir.servlet.ServletModule; import mir.servlet.ServletModuleException; -import mir.storage.StorageObjectException; -import mir.log.*; - +import mir.storage.StorageObjectFailure; import mircoders.module.ModuleLanguage; import mircoders.module.ModuleLinksImcs; import mircoders.storage.DatabaseLanguage; import mircoders.storage.DatabaseLinksImcs; +import freemarker.template.SimpleHash; /* * ServletModuleLinksImcs - @@ -76,16 +72,17 @@ public class ServletModuleLinksImcs extends ServletModule { private ServletModuleLinksImcs() { + super(); logger = new LoggerWrapper("ServletModule.LinksImcs"); - templateListString = MirConfig.getProp("ServletModule.LinksImcs.ListTemplate"); - templateObjektString = MirConfig.getProp("ServletModule.LinksImcs.ObjektTemplate"); - templateConfirmString = MirConfig.getProp("ServletModule.LinksImcs.ConfirmTemplate"); + templateListString = configuration.getString("ServletModule.LinksImcs.ListTemplate"); + templateObjektString = configuration.getString("ServletModule.LinksImcs.ObjektTemplate"); + templateConfirmString = configuration.getString("ServletModule.LinksImcs.ConfirmTemplate"); try { mainModule = new ModuleLinksImcs(DatabaseLinksImcs.getInstance()); languageModule = new ModuleLanguage(DatabaseLanguage.getInstance()); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { logger.error("Initialization of ServletModuleLinksImcs failed!: " + e.getMessage()); } } diff --git a/source/mircoders/servlet/ServletModuleLocalizer.java b/source/mircoders/servlet/ServletModuleLocalizer.java index a0d57c07..ce39a6ab 100755 --- a/source/mircoders/servlet/ServletModuleLocalizer.java +++ b/source/mircoders/servlet/ServletModuleLocalizer.java @@ -31,21 +31,26 @@ package mircoders.servlet; -import java.util.*; - -import javax.servlet.*; -import javax.servlet.http.*; - -import mir.servlet.*; -import mir.entity.adapter.*; -import mir.log.*; -import mir.util.*; - -import mircoders.global.*; -import mircoders.localizer.*; -import mircoders.storage.*; -import mircoders.entity.*; -import mircoders.module.*; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import mir.entity.adapter.EntityAdapter; +import mir.log.LoggerWrapper; +import mir.servlet.ServletModule; +import mir.servlet.ServletModuleException; +import mir.util.StringRoutines; +import mircoders.entity.EntityComment; +import mircoders.entity.EntityContent; +import mircoders.entity.EntityUsers; +import mircoders.global.MirGlobal; +import mircoders.localizer.MirAdminInterfaceLocalizer; +import mircoders.module.ModuleComment; +import mircoders.module.ModuleContent; +import mircoders.storage.DatabaseComment; +import mircoders.storage.DatabaseContent; public class ServletModuleLocalizer extends ServletModule { private static ServletModuleLocalizer instance = new ServletModuleLocalizer(); diff --git a/source/mircoders/servlet/ServletModuleMediafolder.java b/source/mircoders/servlet/ServletModuleMediafolder.java index b39afce3..9f7a1f83 100755 --- a/source/mircoders/servlet/ServletModuleMediafolder.java +++ b/source/mircoders/servlet/ServletModuleMediafolder.java @@ -38,19 +38,20 @@ package mircoders.servlet; * @version 02 */ -import java.util.*; +import java.util.GregorianCalendar; -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import freemarker.template.*; - -import mir.servlet.*; -import mir.misc.*; -import mir.storage.*; -import mir.log.*; - -import mircoders.storage.*; -import mircoders.module.*; +import mir.log.LoggerWrapper; +import mir.misc.StringUtil; +import mir.servlet.ServletModule; +import mir.servlet.ServletModuleException; +import mir.storage.StorageObjectFailure; +import mircoders.module.ModuleMediafolder; +import mircoders.storage.DatabaseMediafolder; +import freemarker.template.SimpleHash; +import freemarker.template.SimpleScalar; public class ServletModuleMediafolder extends ServletModule @@ -59,16 +60,17 @@ public class ServletModuleMediafolder extends ServletModule private static ServletModuleMediafolder instance = new ServletModuleMediafolder(); private ServletModuleMediafolder() { + super(); logger = new LoggerWrapper("ServletModule.Mediafolder"); - templateListString = MirConfig.getProp("ServletModule.Mediafolder.ListTemplate"); - templateObjektString = MirConfig.getProp("ServletModule.Mediafolder.ObjektTemplate"); - templateConfirmString = MirConfig.getProp("ServletModule.Mediafolder.ConfirmTemplate"); + templateListString = configuration.getString("ServletModule.Mediafolder.ListTemplate"); + templateObjektString = configuration.getString("ServletModule.Mediafolder.ObjektTemplate"); + templateConfirmString = configuration.getString("ServletModule.Mediafolder.ConfirmTemplate"); try { mainModule = new ModuleMediafolder(DatabaseMediafolder.getInstance()); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { logger.error("Failed to initialize ServletModuleMediafolder: " + e.getMessage()); } } diff --git a/source/mircoders/servlet/ServletModuleMessage.java b/source/mircoders/servlet/ServletModuleMessage.java index 39fed2d8..16950c99 100755 --- a/source/mircoders/servlet/ServletModuleMessage.java +++ b/source/mircoders/servlet/ServletModuleMessage.java @@ -31,23 +31,22 @@ package mircoders.servlet; -import java.io.*; -import java.net.*; - -import javax.servlet.http.*; -import javax.servlet.*; - -import freemarker.template.*; - -import mir.servlet.*; -import mir.misc.*; -import mir.entity.*; -import mir.storage.*; -import mir.module.*; -import mir.log.*; - -import mircoders.module.*; -import mircoders.storage.*; +import java.io.IOException; +import java.net.URLEncoder; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import mir.entity.EntityList; +import mir.log.LoggerWrapper; +import mir.misc.HTMLTemplateProcessor; +import mir.module.ModuleException; +import mir.servlet.ServletModule; +import mir.servlet.ServletModuleException; +import mir.storage.StorageObjectFailure; +import mircoders.module.ModuleMessage; +import mircoders.storage.DatabaseMessages; +import freemarker.template.SimpleHash; /** * Title: ServletModuleMessage @@ -68,16 +67,17 @@ public class ServletModuleMessage extends ServletModule public static ServletModule getInstance() { return instance; } private ServletModuleMessage() { + super(); logger = new LoggerWrapper("ServletModule.Messages"); - templateListString = MirConfig.getProp("ServletModule.Messages.ListTemplate"); - templateObjektString = MirConfig.getProp("ServletModule.Messages.ObjektTemplate"); - templateConfirmString = MirConfig.getProp("ServletModule.Messages.ConfirmTemplate"); + templateListString = configuration.getString("ServletModule.Messages.ListTemplate"); + templateObjektString = configuration.getString("ServletModule.Messages.ObjektTemplate"); + templateConfirmString = configuration.getString("ServletModule.Messages.ConfirmTemplate"); try { mainModule = new ModuleMessage(DatabaseMessages.getInstance()); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { logger.error("initialization of ServletModuleMessage failed!: " + e.getMessage()); } } diff --git a/source/mircoders/servlet/ServletModuleOpenIndy.java b/source/mircoders/servlet/ServletModuleOpenIndy.java index 93fe4d54..44de8110 100755 --- a/source/mircoders/servlet/ServletModuleOpenIndy.java +++ b/source/mircoders/servlet/ServletModuleOpenIndy.java @@ -31,54 +31,87 @@ package mircoders.servlet; -import java.io.*; -import java.lang.*; -import java.sql.*; -import java.util.*; -import java.net.*; -import java.lang.reflect.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import freemarker.template.*; -import com.oreilly.servlet.multipart.*; -import com.oreilly.servlet.*; - -import org.apache.commons.net.smtp.*; - -import org.xml.sax.InputSource; -import org.xml.sax.XMLReader; - +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Enumeration; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.Iterator; +import java.util.ListIterator; +import java.util.Locale; +import java.util.Random; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; +import mir.entity.Entity; +import mir.entity.EntityList; +import mir.log.LoggerWrapper; +import mir.misc.FileHandler; +import mir.misc.FileHandlerException; +import mir.misc.FileHandlerUserException; +import mir.misc.HTMLParseException; +import mir.misc.HTMLTemplateProcessor; +import mir.misc.StringUtil; +import mir.misc.WebdbMultipartRequest; +import mir.module.ModuleException; +import mir.servlet.ServletModule; +import mir.servlet.ServletModuleException; +import mir.servlet.ServletModuleUserException; +import mir.storage.StorageObjectFailure; +import mir.util.StringRoutines; +import mircoders.entity.EntityComment; +import mircoders.entity.EntityContent; +import mircoders.global.MirGlobal; +import mircoders.media.MediaRequest; +import mircoders.module.ModuleComment; +import mircoders.module.ModuleContent; +import mircoders.module.ModuleImages; +import mircoders.module.ModuleTopics; +import mircoders.search.AudioSearchTerm; +import mircoders.search.ContentSearchTerm; +import mircoders.search.ImagesSearchTerm; +import mircoders.search.KeywordSearchTerm; +import mircoders.search.TextSearchTerm; +import mircoders.search.TopicSearchTerm; +import mircoders.search.UnIndexedSearchTerm; +import mircoders.search.VideoSearchTerm; +import mircoders.storage.DatabaseComment; +import mircoders.storage.DatabaseContent; +import mircoders.storage.DatabaseContentToMedia; +import mircoders.storage.DatabaseContentToTopics; +import mircoders.storage.DatabaseImages; +import mircoders.storage.DatabaseLanguage; +import mircoders.storage.DatabaseTopics; + +import org.apache.commons.net.smtp.SMTPClient; +import org.apache.commons.net.smtp.SMTPReply; import org.apache.fop.apps.Driver; -import org.apache.fop.apps.Version; import org.apache.fop.apps.XSLTInputHandler; - +import org.apache.log.Hierarchy; +import org.apache.log.Priority; import org.apache.lucene.analysis.standard.StandardAnalyzer; -import org.apache.lucene.search.*; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; -import org.apache.lucene.analysis.standard.*; -import org.apache.lucene.queryParser.*; - -import org.apache.log.*; - -import mir.servlet.*; -import mir.module.*; -import mir.misc.*; -import mir.entity.*; -import mir.storage.*; -import mir.media.*; -import mir.log.*; -import mir.util.StringRoutines; +import org.apache.lucene.queryParser.QueryParser; +import org.apache.lucene.search.Hits; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.Searcher; -import mircoders.entity.*; -import mircoders.storage.*; -import mircoders.module.*; -import mircoders.producer.*; -import mircoders.media.MediaRequest; -import mircoders.global.*; -import mircoders.localizer.*; -import mircoders.search.*; +import freemarker.template.SimpleHash; +import freemarker.template.SimpleList; +import freemarker.template.SimpleScalar; +import freemarker.template.TemplateModelRoot; /* * ServletModuleOpenIndy - @@ -87,7 +120,7 @@ import mircoders.search.*; * open-postings to the newswire * * @author mir-coders group - * @version $Id: ServletModuleOpenIndy.java,v 1.57 2003/01/21 18:32:03 zapata Exp $ + * @version $Id: ServletModuleOpenIndy.java,v 1.58 2003/01/25 17:50:36 idfx Exp $ * */ @@ -111,20 +144,21 @@ public class ServletModuleOpenIndy extends ServletModule public static ServletModule getInstance() { return instance; } private ServletModuleOpenIndy() { + super(); try { logger = new LoggerWrapper("ServletModule.OpenIndy"); - commentFormTemplate = MirConfig.getProp("ServletModule.OpenIndy.CommentTemplate"); - commentFormDoneTemplate = MirConfig.getProp("ServletModule.OpenIndy.CommentDoneTemplate"); - commentFormDupeTemplate = MirConfig.getProp("ServletModule.OpenIndy.CommentDupeTemplate"); - postingFormTemplate = MirConfig.getProp("ServletModule.OpenIndy.PostingTemplate"); - postingFormDoneTemplate = MirConfig.getProp("ServletModule.OpenIndy.PostingDoneTemplate"); - postingFormDupeTemplate = MirConfig.getProp("ServletModule.OpenIndy.PostingDupeTemplate"); - searchResultsTemplate = MirConfig.getProp("ServletModule.OpenIndy.SearchResultsTemplate"); - prepareMailTemplate = MirConfig.getProp("ServletModule.OpenIndy.PrepareMailTemplate"); - sentMailTemplate = MirConfig.getProp("ServletModule.OpenIndy.SentMailTemplate"); - directOp = MirConfig.getProp("DirectOpenposting").toLowerCase(); - passwdProtection = MirConfig.getProp("PasswdProtection").toLowerCase(); + commentFormTemplate = configuration.getString("ServletModule.OpenIndy.CommentTemplate"); + commentFormDoneTemplate = configuration.getString("ServletModule.OpenIndy.CommentDoneTemplate"); + commentFormDupeTemplate = configuration.getString("ServletModule.OpenIndy.CommentDupeTemplate"); + postingFormTemplate = configuration.getString("ServletModule.OpenIndy.PostingTemplate"); + postingFormDoneTemplate = configuration.getString("ServletModule.OpenIndy.PostingDoneTemplate"); + postingFormDupeTemplate = configuration.getString("ServletModule.OpenIndy.PostingDupeTemplate"); + searchResultsTemplate = configuration.getString("ServletModule.OpenIndy.SearchResultsTemplate"); + prepareMailTemplate = configuration.getString("ServletModule.OpenIndy.PrepareMailTemplate"); + sentMailTemplate = configuration.getString("ServletModule.OpenIndy.SentMailTemplate"); + directOp = configuration.getString("DirectOpenposting").toLowerCase(); + passwdProtection = configuration.getString("PasswdProtection").toLowerCase(); mainModule = new ModuleComment(DatabaseComment.getInstance()); contentModule = new ModuleContent(DatabaseContent.getInstance()); themenModule = new ModuleTopics(DatabaseTopics.getInstance()); @@ -132,7 +166,7 @@ public class ServletModuleOpenIndy extends ServletModule defaultAction="addposting"; } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { logger.error("servletmoduleopenindy could not be initialized: " + e.getMessage()); } } @@ -242,7 +276,7 @@ public class ServletModuleOpenIndy extends ServletModule SimpleHash mergeData = new SimpleHash(); deliver(req, res, mergeData, commentFormDoneTemplate); } - catch (StorageObjectException e) { throw new ServletModuleException(e.toString());} + catch (StorageObjectFailure e) { throw new ServletModuleException(e.toString());} catch (ModuleException e) { throw new ServletModuleException(e.toString());} } @@ -267,8 +301,8 @@ public class ServletModuleOpenIndy extends ServletModule mergeData.put("passwd", passwd); } - String maxMedia = MirConfig.getProp("ServletModule.OpenIndy.MaxMediaUploadItems"); - String defaultMedia = MirConfig.getProp("ServletModule.OpenIndy.DefaultMediaUploadItems"); + String maxMedia = configuration.getString("ServletModule.OpenIndy.MaxMediaUploadItems"); + String defaultMedia = configuration.getString("ServletModule.OpenIndy.DefaultMediaUploadItems"); String numOfMedia = req.getParameter("medianum"); if(numOfMedia==null||numOfMedia.equals("")){ @@ -330,6 +364,8 @@ public class ServletModuleOpenIndy extends ServletModule } catch (FileHandlerUserException e) { throw new ServletModuleUserException(e.getMessage()); + } catch (PropertiesConfigExc e) { + throw new ServletModuleUserException(e.getMessage()); } HashMap withValues = mp.getParameters(); @@ -435,7 +471,7 @@ public class ServletModuleOpenIndy extends ServletModule throw new ServletModuleException("MediaException: "+ e.getMessage()); } catch (IOException e) { throw new ServletModuleException("IOException: "+ e.getMessage());} - catch (StorageObjectException e) { throw new ServletModuleException("StorageObjectException" + e.getMessage());} + catch (StorageObjectFailure e) { throw new ServletModuleException("StorageObjectException" + e.getMessage());} catch (ModuleException e) { throw new ServletModuleException("ModuleException"+e.getMessage());} deliver(req, res, mergeData, postingFormDoneTemplate); @@ -490,12 +526,12 @@ public class ServletModuleOpenIndy extends ServletModule catch (ModuleException e){ throw new ServletModuleUserException("Couldn't get content for article "+aid); } - String producerStorageRoot=MirConfig.getProp("Producer.StorageRoot"); - String producerDocRoot=MirConfig.getProp("Producer.DocRoot"); - String publishPath = StringUtil.webdbDate2path(contentEnt.getValue("date")); - String txtFilePath = producerStorageRoot + producerDocRoot + "/" + mail_language + - publishPath + "/" + aid + ".txt"; - + String producerStorageRoot=configuration.getString("Producer.StorageRoot"); + String producerDocRoot=configuration.getString("Producer.DocRoot"); + String publishPath = contentEnt.getValue("publish_path"); + String txtFilePath = producerStorageRoot + producerDocRoot + "/" + mail_language + + publishPath + "/" + aid + ".txt"; + File inputFile = new File(txtFilePath); String content; @@ -537,24 +573,23 @@ public class ServletModuleOpenIndy extends ServletModule } SMTPClient client=new SMTPClient(); - try { - int reply; - client.connect(MirConfig.getProp("ServletModule.OpenIndy.SMTPServer")); - System.out.print(client.getReplyString()); - - reply = client.getReplyCode(); - - if(!SMTPReply.isPositiveCompletion(reply)) { - client.disconnect(); - throw new ServletModuleUserException("SMTP server refused connection."); - } - - client.sendSimpleMessage(MirConfig.getProp("ServletModule.OpenIndy.EmailIsFrom"),to,content); - - client.disconnect(); - //mission accomplished - deliver(req,res,mergeData,sentMailTemplate); - + try { + int reply; + client.connect(configuration.getString("ServletModule.OpenIndy.SMTPServer")); + System.out.print(client.getReplyString()); + + reply = client.getReplyCode(); + + if(!SMTPReply.isPositiveCompletion(reply)) { + client.disconnect(); + throw new ServletModuleUserException("SMTP server refused connection."); + } + + client.sendSimpleMessage(configuration.getString("ServletModule.OpenIndy.EmailIsFrom"),to,content); + + client.disconnect(); + //mission accomplished + deliver(req,res,mergeData,sentMailTemplate); } catch(IOException e) { if(client.isConnected()) { try { @@ -634,7 +669,7 @@ public class ServletModuleOpenIndy extends ServletModule session.setAttribute("positionInResults",new Integer(newPosition)); } else { - String indexPath=MirConfig.getProp("IndexPath"); + String indexPath=configuration.getString("IndexPath"); String creatorFragment = creatorTerm.makeTerm(req); @@ -842,9 +877,9 @@ public class ServletModuleOpenIndy extends ServletModule throws ServletModuleException, ServletModuleUserException { String ID_REQUEST_PARAM = "id"; String language = req.getParameter("language"); - - String generateFO=MirConfig.getProp("GenerateFO"); - String generatePDF=MirConfig.getProp("GeneratePDF"); + String generateFO=configuration.getString("GenerateFO"); + String generatePDF=configuration.getString("GeneratePDF"); + //don't do anything if we are not making FO files, or if we are //pregenerating PDF's @@ -855,10 +890,10 @@ public class ServletModuleOpenIndy extends ServletModule log = hierarchy.getLoggerFor("fop"); log.setPriority(Priority.WARN); - String producerStorageRoot=MirConfig.getProp("Producer.StorageRoot"); - String producerDocRoot=MirConfig.getProp("Producer.DocRoot"); + String producerStorageRoot=configuration.getString("Producer.StorageRoot"); + String producerDocRoot=configuration.getString("Producer.DocRoot"); // String templateDir=MirConfig.getPropWithHome("HTMLTemplateProcessor.Dir"); - String xslSheet=MirConfig.getProp("Producer.HTML2FOStyleSheet"); + String xslSheet=configuration.getString("Producer.HTML2FOStyleSheet"); try { String idParam = req.getParameter(ID_REQUEST_PARAM); if (idParam != null) { diff --git a/source/mircoders/servlet/ServletModuleOtherMedia.java b/source/mircoders/servlet/ServletModuleOtherMedia.java index 95ce6f29..b7084769 100755 --- a/source/mircoders/servlet/ServletModuleOtherMedia.java +++ b/source/mircoders/servlet/ServletModuleOtherMedia.java @@ -31,11 +31,9 @@ package mircoders.servlet; -import mir.misc.MirConfig; +import mir.log.LoggerWrapper; import mir.servlet.ServletModule; -import mir.storage.StorageObjectException; -import mir.log.*; - +import mir.storage.StorageObjectFailure; import mircoders.module.ModuleUploadedMedia; import mircoders.storage.DatabaseOther; @@ -54,16 +52,17 @@ public class ServletModuleOtherMedia extends ServletModuleUploadedMedia { } private ServletModuleOtherMedia() { + super(); logger = new LoggerWrapper("ServletModule.OtherMedia"); - templateListString = MirConfig.getProp("ServletModule.OtherMedia.ListTemplate"); - templateObjektString = MirConfig.getProp("ServletModule.OtherMedia.ObjektTemplate"); - templateConfirmString = MirConfig.getProp("ServletModule.OtherMedia.ConfirmTemplate"); + templateListString = configuration.getString("ServletModule.OtherMedia.ListTemplate"); + templateObjektString = configuration.getString("ServletModule.OtherMedia.ObjektTemplate"); + templateConfirmString = configuration.getString("ServletModule.OtherMedia.ConfirmTemplate"); try { mainModule = new ModuleUploadedMedia(DatabaseOther.getInstance()); //dbRights = DatabaseRights.getInstance(); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { logger.error("servletmodule otherMedia could not be initialized: " + e.getMessage()); } } diff --git a/source/mircoders/servlet/ServletModuleProducer.java b/source/mircoders/servlet/ServletModuleProducer.java index 400cd553..3b044b98 100755 --- a/source/mircoders/servlet/ServletModuleProducer.java +++ b/source/mircoders/servlet/ServletModuleProducer.java @@ -31,27 +31,28 @@ package mircoders.servlet; -import java.io.*; -import java.sql.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.PrintWriter; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Vector; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import mir.generator.Generator; +import mir.log.LoggerWrapper; +import mir.producer.ProducerFactory; +import mir.servlet.ServletModule; +import mir.servlet.ServletModuleException; +import mir.util.NullWriter; +import mir.util.ResourceBundleGeneratorFunction; +import mircoders.global.MirGlobal; import org.apache.struts.util.MessageResources; -import freemarker.template.*; - -import mir.servlet.*; -import mir.misc.*; -import mir.producer.*; -import mir.generator.*; -import mir.producer.*; -import mir.entity.adapter.*; -import mir.util.*; -import mir.log.*; - -import mircoders.global.*; - public class ServletModuleProducer extends ServletModule { private static ServletModuleProducer instance = new ServletModuleProducer(); @@ -76,6 +77,7 @@ public class ServletModuleProducer extends ServletModule } private ServletModuleProducer() { + super(); logger = new LoggerWrapper("ServletModule.Producer"); defaultAction="showProducerQueueStatus"; } diff --git a/source/mircoders/servlet/ServletModuleSchwerpunkt.java b/source/mircoders/servlet/ServletModuleSchwerpunkt.java index a493ff78..e32e73f2 100755 --- a/source/mircoders/servlet/ServletModuleSchwerpunkt.java +++ b/source/mircoders/servlet/ServletModuleSchwerpunkt.java @@ -31,24 +31,11 @@ package mircoders.servlet; -import java.io.*; -import java.sql.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import freemarker.template.*; - -import mir.servlet.*; -import mir.module.*; -import mir.misc.*; -import mir.entity.*; -import mir.storage.*; -import mir.log.*; - -import mircoders.entity.*; -import mircoders.storage.*; -import mircoders.module.*; +import mir.log.LoggerWrapper; +import mir.servlet.ServletModule; +import mir.storage.StorageObjectFailure; +import mircoders.module.ModuleSchwerpunkt; +import mircoders.storage.DatabaseFeature; /* * ServletModuleSchwerpunkt - code for the handling of "features" @@ -65,14 +52,15 @@ public class ServletModuleSchwerpunkt extends ServletModule public static ServletModule getInstance() { return instance; } private ServletModuleSchwerpunkt() { + super(); logger = new LoggerWrapper("ServletModule.Feature"); - templateListString = MirConfig.getProp("ServletModule.Schwerpunkt.ListTemplate"); - templateObjektString = MirConfig.getProp("ServletModule.Schwerpunkt.ObjektTemplate"); - templateConfirmString = MirConfig.getProp("ServletModule.Schwerpunkt.ConfirmTemplate"); + templateListString = configuration.getString("ServletModule.Schwerpunkt.ListTemplate"); + templateObjektString = configuration.getString("ServletModule.Schwerpunkt.ObjektTemplate"); + templateConfirmString = configuration.getString("ServletModule.Schwerpunkt.ConfirmTemplate"); try { mainModule = new ModuleSchwerpunkt(DatabaseFeature.getInstance()); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { logger.error("Intialization of ServletModuleSchwerpunkt (Features) failed!: " + e.getMessage()); } } diff --git a/source/mircoders/servlet/ServletModuleTopics.java b/source/mircoders/servlet/ServletModuleTopics.java index 7828a480..4e480bdc 100755 --- a/source/mircoders/servlet/ServletModuleTopics.java +++ b/source/mircoders/servlet/ServletModuleTopics.java @@ -31,22 +31,11 @@ package mircoders.servlet; -import java.io.*; -import java.sql.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import mir.servlet.*; -import mir.module.*; -import mir.misc.*; -import mir.entity.*; -import mir.storage.*; -import mir.log.*; - -import mircoders.entity.*; -import mircoders.storage.*; -import mircoders.module.*; +import mir.log.LoggerWrapper; +import mir.servlet.ServletModule; +import mir.storage.StorageObjectFailure; +import mircoders.module.ModuleTopics; +import mircoders.storage.DatabaseTopics; /* * ServletModuleTopics @@ -63,16 +52,17 @@ public class ServletModuleTopics extends ServletModule public static ServletModule getInstance() { return instance; } private ServletModuleTopics() { + super(); logger = new LoggerWrapper("ServletModule.Topics"); - templateListString = MirConfig.getProp("ServletModule.Themen.ListTemplate"); - templateObjektString = MirConfig.getProp("ServletModule.Themen.ObjektTemplate"); - templateConfirmString = MirConfig.getProp("ServletModule.Themen.ConfirmTemplate"); + templateListString = configuration.getString("ServletModule.Themen.ListTemplate"); + templateObjektString = configuration.getString("ServletModule.Themen.ObjektTemplate"); + templateConfirmString = configuration.getString("ServletModule.Themen.ConfirmTemplate"); try { mainModule = new ModuleTopics(DatabaseTopics.getInstance()); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { logger.error("Initialization of ServletModuleTopics failed!: " + e.getMessage()); } } diff --git a/source/mircoders/servlet/ServletModuleUploadedMedia.java b/source/mircoders/servlet/ServletModuleUploadedMedia.java index dffbb911..e80264df 100755 --- a/source/mircoders/servlet/ServletModuleUploadedMedia.java +++ b/source/mircoders/servlet/ServletModuleUploadedMedia.java @@ -31,47 +31,45 @@ package mircoders.servlet; -import freemarker.template.SimpleHash; -import freemarker.template.SimpleList; +import java.io.IOException; +import java.io.InputStream; +import java.net.URLEncoder; +import java.util.HashMap; + +import javax.servlet.ServletContext; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import mir.config.MirPropertiesConfiguration; +import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; import mir.entity.Entity; import mir.entity.EntityList; +import mir.log.LoggerWrapper; import mir.media.MediaHelper; import mir.media.MirMedia; -import mir.media.MirMediaException; -import mir.media.MirMediaUserException; -import mir.misc.*; +import mir.misc.FileHandler; +import mir.misc.FileHandlerException; +import mir.misc.FileHandlerUserException; +import mir.misc.WebdbMultipartRequest; import mir.module.ModuleException; import mir.servlet.ServletModule; import mir.servlet.ServletModuleException; import mir.servlet.ServletModuleUserException; -import mir.storage.Database; -import mir.storage.StorageObjectException; -import mir.log.*; - -import mircoders.entity.EntityUsers; +import mir.storage.StorageObjectFailure; import mircoders.entity.EntityUploadedMedia; -import mircoders.storage.DatabaseMediaType; -import mircoders.storage.DatabaseMediafolder; +import mircoders.entity.EntityUsers; import mircoders.media.MediaRequest; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.ServletContext; -import javax.servlet.ServletOutputStream; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URLEncoder; -import java.util.GregorianCalendar; -import java.util.HashMap; +import mircoders.storage.DatabaseMediafolder; +import freemarker.template.SimpleHash; +import freemarker.template.SimpleList; /* * ServletModuleBilder - * liefert HTML fuer Bilder * - * @version $Id: ServletModuleUploadedMedia.java,v 1.14 2002/12/23 03:44:51 mh Exp $ + * @version $Id: ServletModuleUploadedMedia.java,v 1.15 2003/01/25 17:50:36 idfx Exp $ * @author RK, the mir-coders group */ @@ -85,6 +83,7 @@ public abstract class ServletModuleUploadedMedia } public ServletModuleUploadedMedia() { + super(); logger = new LoggerWrapper("ServletModule.UploadedMedia"); } @@ -114,21 +113,19 @@ public abstract class ServletModuleUploadedMedia popups.put("mediafolderPopupData", DatabaseMediafolder.getInstance().getPopupData()); // raus damit deliver(req, res, mergeData, popups, templateListString); - } - catch (FileHandlerUserException e) { + } catch (FileHandlerUserException e) { logger.error("ServletModuleUploadedMedia.insert: " + e.getMessage()); throw new ServletModuleUserException(e.getMessage()); - } - catch (FileHandlerException e) { + } catch (FileHandlerException e) { throw new ServletModuleException( "upload -- media handling exception " + e.toString()); - } - catch (StorageObjectException e) { + } catch (StorageObjectFailure e) { throw new ServletModuleException("upload -- storageobjectexception " + e.toString()); - } - catch (IOException e) { + } catch (IOException e) { throw new ServletModuleException("upload -- ioexception " + e.toString()); + } catch (PropertiesConfigExc e) { + throw new ServletModuleException("upload -- configexception " + e.toString()); } } @@ -245,7 +242,7 @@ public abstract class ServletModuleUploadedMedia mergeData.put("new", "1"); SimpleHash popups = new SimpleHash(); popups.put("mediafolderPopupData", DatabaseMediafolder.getInstance().getPopupData()); - String maxMedia = MirConfig.getProp("ServletModule.OpenIndy.MaxMediaUploadItems"); + String maxMedia = MirPropertiesConfiguration.instance().getString("ServletModule.OpenIndy.MaxMediaUploadItems"); String numOfMedia = req.getParameter("medianum"); if(numOfMedia==null||numOfMedia.equals("")){ numOfMedia="1"; @@ -285,7 +282,7 @@ public abstract class ServletModuleUploadedMedia catch (ModuleException e) { throw new ServletModuleException(e.toString()); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { throw new ServletModuleException(e.toString()); } } @@ -311,8 +308,7 @@ public abstract class ServletModuleUploadedMedia Entity mediaType = ent.getMediaType(); MirMedia mediaHandler; - ServletContext ctx = - (ServletContext)MirConfig.getPropAsObject("ServletContext"); + ServletContext ctx = MirPropertiesConfiguration.getContext(); String fName = ent.getId()+"."+mediaType.getValue("name"); mediaHandler = MediaHelper.getHandler(mediaType); @@ -355,8 +351,7 @@ public abstract class ServletModuleUploadedMedia Entity mediaType = ent.getMediaType(); MirMedia mediaHandler; - ServletContext ctx = - (ServletContext)MirConfig.getPropAsObject("ServletContext"); + ServletContext ctx = MirPropertiesConfiguration.getContext(); String fName = ent.getId()+"."+mediaType.getValue("name"); mediaHandler = MediaHelper.getHandler(mediaType); diff --git a/source/mircoders/servlet/ServletModuleUsers.java b/source/mircoders/servlet/ServletModuleUsers.java index d9b57f21..2b39c578 100755 --- a/source/mircoders/servlet/ServletModuleUsers.java +++ b/source/mircoders/servlet/ServletModuleUsers.java @@ -31,24 +31,19 @@ package mircoders.servlet; -import java.io.*; -import java.sql.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.util.HashMap; -import freemarker.template.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; -import mir.servlet.*; -import mir.module.*; -import mir.misc.*; -import mir.entity.*; -import mir.storage.*; -import mir.log.*; - -import mircoders.entity.*; -import mircoders.storage.*; -import mircoders.module.*; +import mir.log.LoggerWrapper; +import mir.module.ModuleException; +import mir.servlet.ServletModule; +import mir.servlet.ServletModuleException; +import mir.storage.StorageObjectFailure; +import mircoders.module.ModuleUsers; +import mircoders.storage.DatabaseUsers; +import freemarker.template.SimpleHash; /* * ServletModuleUsers - @@ -64,16 +59,17 @@ public class ServletModuleUsers extends mir.servlet.ServletModule public static ServletModule getInstance() { return instance; } private ServletModuleUsers() { + super(); logger = new LoggerWrapper("ServletModule.Users"); - templateListString = MirConfig.getProp("ServletModule.Users.ListTemplate"); - templateObjektString = MirConfig.getProp("ServletModule.Users.ObjektTemplate"); - templateConfirmString = MirConfig.getProp("ServletModule.Users.ConfirmTemplate"); + templateListString = configuration.getString("ServletModule.Users.ListTemplate"); + templateObjektString = configuration.getString("ServletModule.Users.ObjektTemplate"); + templateConfirmString = configuration.getString("ServletModule.Users.ConfirmTemplate"); try { mainModule = new ModuleUsers(DatabaseUsers.getInstance()); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { logger.debug("initialization of ServletModuleUsers failed!: " + e.getMessage()); } } diff --git a/source/mircoders/servlet/ServletModuleVideo.java b/source/mircoders/servlet/ServletModuleVideo.java index 81a4bcdf..b8296b5a 100755 --- a/source/mircoders/servlet/ServletModuleVideo.java +++ b/source/mircoders/servlet/ServletModuleVideo.java @@ -31,12 +31,9 @@ package mircoders.servlet; -import mir.misc.Logfile; -import mir.misc.MirConfig; +import mir.log.LoggerWrapper; import mir.servlet.ServletModule; -import mir.storage.StorageObjectException; -import mir.log.*; - +import mir.storage.StorageObjectFailure; import mircoders.module.ModuleUploadedMedia; import mircoders.storage.DatabaseVideo; @@ -59,15 +56,16 @@ public class ServletModuleVideo extends ServletModuleUploadedMedia { private ServletModuleVideo() { + super(); logger = new LoggerWrapper("ServletModule.Video"); - templateListString = MirConfig.getProp("ServletModule.Video.ListTemplate"); - templateObjektString = MirConfig.getProp("ServletModule.Video.ObjektTemplate"); - templateConfirmString = MirConfig.getProp("ServletModule.Video.ConfirmTemplate"); + templateListString = configuration.getString("ServletModule.Video.ListTemplate"); + templateObjektString = configuration.getString("ServletModule.Video.ObjektTemplate"); + templateConfirmString = configuration.getString("ServletModule.Video.ConfirmTemplate"); try { mainModule = new ModuleUploadedMedia(DatabaseVideo.getInstance()); //dbRights = DatabaseRights.getInstance(); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { logger.error("servletmodule video could not be initialized: " + e.getMessage()); } } diff --git a/source/mircoders/storage/DatabaseArticleType.java b/source/mircoders/storage/DatabaseArticleType.java index e17770bb..832df27f 100755 --- a/source/mircoders/storage/DatabaseArticleType.java +++ b/source/mircoders/storage/DatabaseArticleType.java @@ -40,16 +40,10 @@ package mircoders.storage; * @version 1.0 */ -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; public class DatabaseArticleType extends Database implements StorageObject{ @@ -61,7 +55,7 @@ public class DatabaseArticleType extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseArticleType getInstance() throws - StorageObjectException { + StorageObjectFailure { if (instance == null) { instance = new DatabaseArticleType(); instance.myselfDatabase = instance; @@ -69,13 +63,13 @@ public class DatabaseArticleType extends Database implements StorageObject{ return instance; } - private DatabaseArticleType() throws StorageObjectException { + private DatabaseArticleType() throws StorageObjectFailure { super(); this.hasTimestamp = false; this.theTable = "article_type"; } - public SimpleList getPopupData() throws StorageObjectException { + public SimpleList getPopupData() throws StorageObjectFailure { return getPopupData("name", false); } diff --git a/source/mircoders/storage/DatabaseAudio.java b/source/mircoders/storage/DatabaseAudio.java index a0f76e34..a09126a4 100755 --- a/source/mircoders/storage/DatabaseAudio.java +++ b/source/mircoders/storage/DatabaseAudio.java @@ -31,16 +31,14 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; +import java.util.GregorianCalendar; -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.entity.Entity; +import mir.misc.StringUtil; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle @@ -57,7 +55,7 @@ public class DatabaseAudio extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseAudio getInstance() - throws StorageObjectException + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseAudio(); @@ -66,7 +64,7 @@ public class DatabaseAudio extends Database implements StorageObject{ return instance; } - private DatabaseAudio() throws StorageObjectException + private DatabaseAudio() throws StorageObjectFailure { super(); this.hasTimestamp = true; @@ -75,14 +73,14 @@ public class DatabaseAudio extends Database implements StorageObject{ try { this.theEntityClass = Class.forName("mircoders.entity.EntityAudio"); } - catch (Exception e) { throw new StorageObjectException(e.toString()); } + catch (Exception e) { throw new StorageObjectFailure(e); } } - public SimpleList getPopupData() throws StorageObjectException { + public SimpleList getPopupData() throws StorageObjectFailure { return getPopupData("title",true); } - public void update(Entity theEntity) throws StorageObjectException + public void update(Entity theEntity) throws StorageObjectFailure { String date = theEntity.getValue("date"); if (date==null){ @@ -94,7 +92,7 @@ public class DatabaseAudio extends Database implements StorageObject{ } - public String insert(Entity theEntity) throws StorageObjectException + public String insert(Entity theEntity) throws StorageObjectFailure { String date = theEntity.getValue("date"); if (date==null){ diff --git a/source/mircoders/storage/DatabaseBreaking.java b/source/mircoders/storage/DatabaseBreaking.java index 97959eb0..cde6e067 100755 --- a/source/mircoders/storage/DatabaseBreaking.java +++ b/source/mircoders/storage/DatabaseBreaking.java @@ -31,16 +31,9 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle @@ -56,7 +49,7 @@ public class DatabaseBreaking extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseBreaking getInstance() - throws StorageObjectException { + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseBreaking(); instance.myselfDatabase = instance; @@ -64,7 +57,7 @@ public class DatabaseBreaking extends Database implements StorageObject{ return instance; } - private DatabaseBreaking() throws StorageObjectException + private DatabaseBreaking() throws StorageObjectFailure { super(); //this.cache = new DatabaseCache(4); @@ -72,7 +65,7 @@ public class DatabaseBreaking extends Database implements StorageObject{ try { this.theEntityClass = Class.forName("mircoders.entity.EntityBreaking"); } - catch (Exception e) { throw new StorageObjectException(e.toString()); } + catch (Exception e) { throw new StorageObjectFailure(e); } } diff --git a/source/mircoders/storage/DatabaseComment.java b/source/mircoders/storage/DatabaseComment.java index 8cbca4f5..54fa0681 100755 --- a/source/mircoders/storage/DatabaseComment.java +++ b/source/mircoders/storage/DatabaseComment.java @@ -31,16 +31,14 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * This class implements the access to the comment-table for the @@ -57,7 +55,7 @@ public class DatabaseComment extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseComment getInstance() - throws StorageObjectException { + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseComment(); instance.myselfDatabase = instance; @@ -65,7 +63,7 @@ public class DatabaseComment extends Database implements StorageObject{ return instance; } - private DatabaseComment() throws StorageObjectException + private DatabaseComment() throws StorageObjectFailure { super(); this.hasTimestamp = false; @@ -74,14 +72,14 @@ public class DatabaseComment extends Database implements StorageObject{ try { this.theEntityClass = Class.forName("mircoders.entity.EntityComment"); } - catch (Exception e) { throw new StorageObjectException(e.toString()); } + catch (Exception e) { throw new StorageObjectFailure(e); } } public SimpleList getPopupData() - throws StorageObjectException { return getPopupData("title",true); } + throws StorageObjectFailure { return getPopupData("title",true); } public boolean deleteByContentId(String id) - throws StorageObjectException { + throws StorageObjectFailure { Statement stmt=null; Connection con=null; String sql; @@ -96,7 +94,7 @@ public class DatabaseComment extends Database implements StorageObject{ stmt = con.createStatement(); res = stmt.executeUpdate(sql); } catch (SQLException sqe) { - new StorageObjectException(sqe.toString()); + new StorageObjectFailure(sqe); return false; } finally { freeConnection(con,stmt); diff --git a/source/mircoders/storage/DatabaseCommentStatus.java b/source/mircoders/storage/DatabaseCommentStatus.java index 35755216..3fee965f 100755 --- a/source/mircoders/storage/DatabaseCommentStatus.java +++ b/source/mircoders/storage/DatabaseCommentStatus.java @@ -40,23 +40,17 @@ package mircoders.storage; * @version 1.0 */ -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; public class DatabaseCommentStatus extends Database implements StorageObject{ private static DatabaseCommentStatus instance; - public static DatabaseCommentStatus getInstance() throws StorageObjectException { + public static DatabaseCommentStatus getInstance() throws StorageObjectFailure { if (instance == null) { synchronized (DatabaseCommentStatus.class) { if (instance == null) { @@ -69,13 +63,13 @@ public class DatabaseCommentStatus extends Database implements StorageObject{ return instance; } - private DatabaseCommentStatus() throws StorageObjectException { + private DatabaseCommentStatus() throws StorageObjectFailure { super(); this.hasTimestamp = false; this.theTable = "comment_status"; } - public SimpleList getPopupData() throws StorageObjectException { + public SimpleList getPopupData() throws StorageObjectFailure { return getPopupData("name", false); } } \ No newline at end of file diff --git a/source/mircoders/storage/DatabaseContent.java b/source/mircoders/storage/DatabaseContent.java index 03a18407..e0fc844d 100755 --- a/source/mircoders/storage/DatabaseContent.java +++ b/source/mircoders/storage/DatabaseContent.java @@ -31,18 +31,15 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; +import java.sql.Connection; +import java.sql.Statement; -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; - -import mircoders.entity.*; +import mir.entity.EntityList; +import mir.entity.EntityRelation; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import mircoders.entity.EntityContent; /** * this class implements the access to the content-table @@ -62,7 +59,7 @@ public class DatabaseContent extends Database implements StorageObject { // could get preemted and we could end up with 2 instances of DatabaseFoo. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseContent getInstance() - throws StorageObjectException { + throws StorageObjectFailure { if (instance == null ) { instance = new DatabaseContent(); @@ -72,7 +69,7 @@ public class DatabaseContent extends Database implements StorageObject { } private DatabaseContent() - throws StorageObjectException { + throws StorageObjectFailure { super(); this.theTable="content"; @@ -81,7 +78,7 @@ public class DatabaseContent extends Database implements StorageObject { relationComments = new EntityRelation("id", "to_media", DatabaseComment.getInstance(), EntityRelation.TO_MANY); relationFeature = new EntityRelation("id", "to_feature", DatabaseFeature.getInstance(), EntityRelation.TO_ONE); try { this.theEntityClass = Class.forName("mircoders.entity.EntityContent"); } - catch (Exception e) { throw new StorageObjectException(e.toString()); } + catch (Exception e) { throw new StorageObjectFailure(e); } } // methods @@ -90,7 +87,7 @@ public class DatabaseContent extends Database implements StorageObject { * sets the database flag is_produced to unproduced */ - public void setUnproduced(String where) throws StorageObjectException + public void setUnproduced(String where) throws StorageObjectFailure { Connection con=null;Statement stmt=null; String sql = "update content set is_produced='0' where " + where; @@ -110,18 +107,18 @@ public class DatabaseContent extends Database implements StorageObject { * returns the comments that belong to the article (via entityrelation) * where db-flag is_published is true */ - public EntityList getComments(EntityContent entC) throws StorageObjectException { + public EntityList getComments(EntityContent entC) throws StorageObjectFailure { return relationComments.getMany(entC,"webdb_create","is_published='1'"); } /** * returns the features that belong to the article (via entityrelation) */ - public EntityList getFeature(EntityContent entC) throws StorageObjectException { + public EntityList getFeature(EntityContent entC) throws StorageObjectFailure { return relationFeature.getMany(entC); } - public boolean delete(String id) throws StorageObjectException + public boolean delete(String id) throws StorageObjectFailure { DatabaseComment.getInstance().deleteByContentId(id); super.delete(id); diff --git a/source/mircoders/storage/DatabaseContentToMedia.java b/source/mircoders/storage/DatabaseContentToMedia.java index 5e037b1f..1445f155 100755 --- a/source/mircoders/storage/DatabaseContentToMedia.java +++ b/source/mircoders/storage/DatabaseContentToMedia.java @@ -31,24 +31,23 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; - -import mircoders.entity.*; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Statement; + +import mir.entity.EntityList; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectExc; +import mir.storage.StorageObjectFailure; +import mircoders.entity.EntityContent; +import mircoders.entity.EntityUploadedMedia; /** * implements abstract DB connection to the content_x_media SQL table * * @author RK, mir-coders group - * @version $Id: DatabaseContentToMedia.java,v 1.11 2002/12/06 08:08:44 mh Exp $ + * @version $Id: DatabaseContentToMedia.java,v 1.12 2003/01/25 17:50:36 idfx Exp $ * */ @@ -60,7 +59,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseContentToMedia getInstance() - throws StorageObjectException { + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseContentToMedia(); instance.myselfDatabase = instance; @@ -69,13 +68,13 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ } private DatabaseContentToMedia() - throws StorageObjectException { + throws StorageObjectFailure { super(); this.hasTimestamp = false; this.theTable="content_x_media"; try { this.theEntityClass = Class.forName("mir.entity.GenericEntity"); } - catch (Exception e) { throw new StorageObjectException(e.toString()); } + catch (Exception e) { throw new StorageObjectFailure(e); } } /** @@ -83,7 +82,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ * */ public EntityList getMedia(EntityContent content) - throws StorageObjectException { + throws StorageObjectFailure { EntityList returnList=null; if (content != null) { // get all to_topic from media_x_topic @@ -98,14 +97,14 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ returnList = DatabaseMedia.getInstance().selectByWhereClause(subselect,"id",-1); } catch (Exception e) { theLog.printDebugInfo("-- get media failed " + e.toString()); - throw new StorageObjectException("-- get media failed " + e.toString()); + throw new StorageObjectFailure("-- get media failed ", e); } } return returnList; } public boolean hasMedia(EntityContent content) - throws StorageObjectException { + throws StorageObjectFailure, StorageObjectExc { String wc = "content_id="+content.getId(); if( content != null) { try { @@ -115,11 +114,11 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ return true; } catch (Exception e) { theLog.printError("-- hasMedia failed " + e.toString()); - throw new StorageObjectException("-- hasMedia failed " + e.toString()); + throw new StorageObjectFailure("-- hasMedia failed ",e); } } else { theLog.printError("-- hasMedia failed: content is NULL"); - throw new StorageObjectException("-- hasMedia failed: content is NULL"); + throw new StorageObjectExc("-- hasMedia failed: content is NULL"); } } @@ -131,7 +130,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ * */ public EntityList getAudio(EntityContent content) - throws StorageObjectException { + throws StorageObjectFailure { EntityList returnList=null; if (content != null) { // get all to_topic from media_x_topic @@ -146,7 +145,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ returnList = DatabaseAudio.getInstance().selectByWhereClause(subselect,"id",-1); } catch (Exception e) { theLog.printDebugInfo("-- get audio failed " + e.toString()); - throw new StorageObjectException("-- get audio failed " + e.toString()); + throw new StorageObjectFailure("-- get audio failed ",e); } } return returnList; @@ -157,7 +156,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ * */ public EntityList getVideo(EntityContent content) - throws StorageObjectException { + throws StorageObjectFailure { EntityList returnList=null; if (content != null) { // get all to_topic from media_x_topic @@ -172,7 +171,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ returnList = DatabaseVideo.getInstance().selectByWhereClause(subselect,"id",-1); } catch (Exception e) { theLog.printDebugInfo("-- get video failed " + e.toString()); - throw new StorageObjectException("-- get video failed " + e.toString()); + throw new StorageObjectFailure("-- get video failed ",e); } } return returnList; @@ -183,7 +182,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ * */ public EntityList getImages(EntityContent content) - throws StorageObjectException { + throws StorageObjectFailure { EntityList returnList=null; if (content != null) { // get all to_topic from media_x_topic @@ -198,7 +197,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ returnList = DatabaseImages.getInstance().selectByWhereClause(subselect,"id",-1); } catch (Exception e) { theLog.printDebugInfo("-- get images failed " + e.toString()); - throw new StorageObjectException("-- get images failed " + e.toString()); + throw new StorageObjectFailure("-- get images failed ",e); } } return returnList; @@ -210,7 +209,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ * */ public EntityList getOther(EntityContent content) - throws StorageObjectException + throws StorageObjectFailure { /** @todo this should only fetch published media / rk */ @@ -231,8 +230,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ } catch (Exception e) { e.printStackTrace(); theLog.printDebugInfo("-- get Other failed " + e.toString()); - throw new StorageObjectException("-- get Other failed " - + e.toString()); + throw new StorageObjectFailure("-- get Other failed ",e); } } return returnList; @@ -243,7 +241,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ * */ public EntityList getUploadedMedia(EntityContent content) - throws StorageObjectException + throws StorageObjectFailure { /** @todo this should only fetch published media / rk */ @@ -261,8 +259,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ } catch (Exception e) { e.printStackTrace(); theLog.printDebugInfo("-- get uploadedMedia failed " + e.toString()); - throw new StorageObjectException("-- get uploadedMedia failed " - + e.toString()); + throw new StorageObjectFailure("-- get uploadedMedia failed ", e); } } return returnList; @@ -270,7 +267,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ public void setMedia(String contentId, String[] mediaId) - throws StorageObjectException { + throws StorageObjectFailure { if (contentId == null){ return; } @@ -288,7 +285,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ ResultSet rs = executeSql(stmt,sql); } catch (Exception e) { theLog.printDebugInfo("-- set media failed -- delete"); - throw new StorageObjectException("-- set media failed -- delete"+e.toString()); + throw new StorageObjectFailure("-- set media failed -- delete",e); } finally { freeConnection(con,stmt); } @@ -305,7 +302,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ int rs = executeUpdate(stmt,sql); } catch (Exception e) { theLog.printDebugInfo("-- set topics failed -- insert"); - throw new StorageObjectException("-- set topics failed -- insert "+e.toString()); + throw new StorageObjectFailure("-- set topics failed -- insert ",e); } finally { freeConnection(con,stmt); } @@ -313,7 +310,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ } public void addMedia(String contentId, String mediaId) - throws StorageObjectException { + throws StorageObjectFailure { if (contentId == null && mediaId == null) { return; } @@ -330,15 +327,14 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ int rs = executeUpdate(stmt,sql); } catch (Exception e) { theLog.printDebugInfo("-- add media failed -- insert"); - throw new StorageObjectException("-- add media failed -- insert " - +e.toString()); + throw new StorageObjectFailure("-- add media failed -- insert ",e); } finally { freeConnection(con,stmt); } } public void setMedia(String contentId, String mediaId) - throws StorageObjectException { + throws StorageObjectFailure { if (contentId == null && mediaId == null) { return; } @@ -353,8 +349,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ int rs = executeUpdate(stmt,sql); } catch (Exception e) { theLog.printDebugInfo("-- set media failed -- delete"); - throw new StorageObjectException("-- set media failed -- delete " - +e.toString()); + throw new StorageObjectFailure("-- set media failed -- delete ",e); } finally { freeConnection(con,stmt); } @@ -371,15 +366,14 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ int rs = executeUpdate(stmt,sql); } catch (Exception e) { theLog.printDebugInfo("-- set media failed -- insert"); - throw new StorageObjectException("-- set media failed -- insert " - +e.toString()); + throw new StorageObjectFailure("-- set media failed -- insert ",e); } finally { freeConnection(con,stmt); } } public void deleteByContentId(String contentId) - throws StorageObjectException { + throws StorageObjectFailure { if (contentId == null) { //theLog.printDebugInfo("-- delete topics failed -- no content id"); return; @@ -395,15 +389,14 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ int rs = executeUpdate(stmt,sql); } catch (Exception e) { theLog.printDebugInfo("-- delete by contentId failed "); - throw new StorageObjectException("-- delete by content id failed -- delete " - +e.toString()); + throw new StorageObjectFailure("-- delete by content id failed -- delete ",e); } finally { freeConnection(con,stmt); } } public void deleteByMediaId(String mediaId) - throws StorageObjectException { + throws StorageObjectFailure { if (mediaId == null) { //theLog.printDebugInfo("-- delete topics failed -- no topic id"); return; @@ -420,15 +413,14 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ theLog.printDebugInfo("-- delete media success "); } catch (Exception e) { theLog.printDebugInfo("-- delete media failed "); - throw new StorageObjectException("-- delete by media id failed -- " - +e.toString()); + throw new StorageObjectFailure("-- delete by media id failed -- ",e); } finally { freeConnection(con,stmt); } } public void delete(String contentId, String mediaId) - throws StorageObjectException { + throws StorageObjectFailure { if (mediaId == null || contentId==null) { theLog.printDebugInfo("-- delete media failed -- missing parameter"); return; @@ -445,8 +437,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ theLog.printDebugInfo("-- delete content_x_media success "); } catch (Exception e) { theLog.printDebugInfo("-- delete content_x_media failed "); - throw new StorageObjectException("-- delete content_x_media failed -- " - +e.toString()); + throw new StorageObjectFailure("-- delete content_x_media failed -- ",e ); } finally { freeConnection(con,stmt); } @@ -454,7 +445,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ public EntityList getContent(EntityUploadedMedia media) - throws StorageObjectException { + throws StorageObjectFailure { EntityList returnList=null; if (media != null) { String id = media.getId(); @@ -482,8 +473,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ } catch (Exception e) { theLog.printDebugInfo("-- get content failed"); - throw new StorageObjectException("-- get content failed -- " - +e.toString()); + throw new StorageObjectFailure("-- get content failed -- ", e); } finally { freeConnection(con,stmt);} } @@ -495,7 +485,7 @@ public class DatabaseContentToMedia extends Database implements StorageObject{ */ public EntityList getContent() - throws StorageObjectException { + throws StorageObjectFailure { EntityList returnList=null; String select = "select distinct content_id from " + theTable; @@ -521,8 +511,7 @@ public EntityList getContent() } catch (Exception e) { theLog.printDebugInfo("-- get content failed"); - throw new StorageObjectException("-- get content failed -- " - +e.toString()); + throw new StorageObjectFailure("-- get content failed -- ",e ); } finally { freeConnection(con,stmt);} diff --git a/source/mircoders/storage/DatabaseContentToTopics.java b/source/mircoders/storage/DatabaseContentToTopics.java index 065fd107..53c3c199 100755 --- a/source/mircoders/storage/DatabaseContentToTopics.java +++ b/source/mircoders/storage/DatabaseContentToTopics.java @@ -31,18 +31,19 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; - -import mircoders.entity.*; +import mir.entity.EntityList; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import mircoders.entity.EntityContent; +import mircoders.entity.EntityTopics; /** * This class implements the 1-n-relation between @@ -58,7 +59,7 @@ public class DatabaseContentToTopics extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseContentToTopics getInstance() - throws StorageObjectException { + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseContentToTopics(); instance.myselfDatabase = instance; @@ -67,13 +68,13 @@ public class DatabaseContentToTopics extends Database implements StorageObject{ } private DatabaseContentToTopics() - throws StorageObjectException { + throws StorageObjectFailure { super(); this.hasTimestamp = false; this.theTable="content_x_topic"; try { this.theEntityClass = Class.forName("mir.entity.GenericEntity"); } - catch (Exception e) { throw new StorageObjectException(e.toString()); } + catch (Exception e) { throw new StorageObjectFailure(e); } } @@ -103,7 +104,7 @@ public class DatabaseContentToTopics extends Database implements StorageObject{ * @returns ArrayList */ public ArrayList getTopicsOfContent(String contentId) - throws StorageObjectException { + throws StorageObjectFailure { ArrayList returnList = new ArrayList(); if (contentId != null) { String sql = "select topic_id from " + theTable + " where content_id=" + contentId; @@ -132,7 +133,7 @@ public class DatabaseContentToTopics extends Database implements StorageObject{ * Set new topics */ public void setTopics(String contentId, String[] topicId) - throws StorageObjectException { + throws StorageObjectFailure { if (contentId == null){ return; } @@ -230,7 +231,7 @@ public class DatabaseContentToTopics extends Database implements StorageObject{ } public void deleteByContentId(String contentId) - throws StorageObjectException { + throws StorageObjectFailure { if (contentId == null) { //theLog.printDebugInfo("-- delete topics failed -- no content id"); return; @@ -252,7 +253,7 @@ public class DatabaseContentToTopics extends Database implements StorageObject{ } public void deleteByTopicId(String topicId) - throws StorageObjectException { + throws StorageObjectFailure { if (topicId == null) { //theLog.printDebugInfo("-- delete topics failed -- no topic id"); return; @@ -275,7 +276,7 @@ public class DatabaseContentToTopics extends Database implements StorageObject{ public EntityList getContent(EntityTopics topic) - throws StorageObjectException { + throws StorageObjectFailure { EntityList returnList=null; if (topic != null) { String id = topic.getId(); diff --git a/source/mircoders/storage/DatabaseFeature.java b/source/mircoders/storage/DatabaseFeature.java index 4dea6ac9..57cc348b 100755 --- a/source/mircoders/storage/DatabaseFeature.java +++ b/source/mircoders/storage/DatabaseFeature.java @@ -31,16 +31,10 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle @@ -56,7 +50,7 @@ public class DatabaseFeature extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseFeature getInstance() - throws StorageObjectException { + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseFeature(); instance.myselfDatabase = instance; @@ -64,7 +58,7 @@ public class DatabaseFeature extends Database implements StorageObject{ return instance; } - private DatabaseFeature() throws StorageObjectException + private DatabaseFeature() throws StorageObjectFailure { super(); //this.cache = new DatabaseCache(10); @@ -75,11 +69,11 @@ public class DatabaseFeature extends Database implements StorageObject{ this.theEntityClass = Class.forName("mircoders.entity.EntityFeature"); } catch (Exception e) { - throw new StorageObjectException(e.toString()); + throw new StorageObjectFailure(e); } } - public SimpleList getPopupData() throws StorageObjectException { + public SimpleList getPopupData() throws StorageObjectFailure { return getPopupData("title",true); } diff --git a/source/mircoders/storage/DatabaseImageColor.java b/source/mircoders/storage/DatabaseImageColor.java index e4df053e..fb8fbb2a 100755 --- a/source/mircoders/storage/DatabaseImageColor.java +++ b/source/mircoders/storage/DatabaseImageColor.java @@ -31,16 +31,10 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle @@ -57,7 +51,7 @@ public class DatabaseImageColor extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseImageColor getInstance() - throws StorageObjectException + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseImageColor(); @@ -66,7 +60,7 @@ public class DatabaseImageColor extends Database implements StorageObject{ return instance; } - private DatabaseImageColor() throws StorageObjectException + private DatabaseImageColor() throws StorageObjectFailure { super(); this.hasTimestamp = false; @@ -74,7 +68,7 @@ public class DatabaseImageColor extends Database implements StorageObject{ } public SimpleList getPopupData() - throws StorageObjectException { return getPopupData("name",true); } + throws StorageObjectFailure { return getPopupData("name",true); } } diff --git a/source/mircoders/storage/DatabaseImageFormat.java b/source/mircoders/storage/DatabaseImageFormat.java index 47b502cc..349390d9 100755 --- a/source/mircoders/storage/DatabaseImageFormat.java +++ b/source/mircoders/storage/DatabaseImageFormat.java @@ -31,16 +31,10 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle @@ -57,7 +51,7 @@ public class DatabaseImageFormat extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseImageFormat getInstance() - throws StorageObjectException + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseImageFormat(); @@ -66,7 +60,7 @@ public class DatabaseImageFormat extends Database implements StorageObject{ return instance; } - private DatabaseImageFormat() throws StorageObjectException + private DatabaseImageFormat() throws StorageObjectFailure { super(); this.hasTimestamp = false; @@ -74,7 +68,7 @@ public class DatabaseImageFormat extends Database implements StorageObject{ } public SimpleList getPopupData() - throws StorageObjectException { return getPopupData("name",true); } + throws StorageObjectFailure { return getPopupData("name",true); } } diff --git a/source/mircoders/storage/DatabaseImageLayout.java b/source/mircoders/storage/DatabaseImageLayout.java index 54cdf46b..0f2bfc92 100755 --- a/source/mircoders/storage/DatabaseImageLayout.java +++ b/source/mircoders/storage/DatabaseImageLayout.java @@ -31,16 +31,10 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle @@ -57,7 +51,7 @@ public class DatabaseImageLayout extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseImageLayout getInstance() - throws StorageObjectException + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseImageLayout(); @@ -66,7 +60,7 @@ public class DatabaseImageLayout extends Database implements StorageObject{ return instance; } - private DatabaseImageLayout() throws StorageObjectException + private DatabaseImageLayout() throws StorageObjectFailure { super(); this.hasTimestamp = false; @@ -74,7 +68,7 @@ public class DatabaseImageLayout extends Database implements StorageObject{ } public SimpleList getPopupData() - throws StorageObjectException { return getPopupData("name",true); } + throws StorageObjectFailure { return getPopupData("name",true); } } diff --git a/source/mircoders/storage/DatabaseImageType.java b/source/mircoders/storage/DatabaseImageType.java index a7a9a5fa..473d7373 100755 --- a/source/mircoders/storage/DatabaseImageType.java +++ b/source/mircoders/storage/DatabaseImageType.java @@ -31,16 +31,10 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle @@ -57,7 +51,7 @@ public class DatabaseImageType extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseImageType getInstance() - throws StorageObjectException + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseImageType(); @@ -66,7 +60,7 @@ public class DatabaseImageType extends Database implements StorageObject{ return instance; } - private DatabaseImageType() throws StorageObjectException + private DatabaseImageType() throws StorageObjectFailure { super(); this.hasTimestamp = false; @@ -74,7 +68,7 @@ public class DatabaseImageType extends Database implements StorageObject{ } public SimpleList getPopupData() - throws StorageObjectException { return getPopupData("name",true); } + throws StorageObjectFailure { return getPopupData("name",true); } } diff --git a/source/mircoders/storage/DatabaseImages.java b/source/mircoders/storage/DatabaseImages.java index 7a6f15c4..03592964 100755 --- a/source/mircoders/storage/DatabaseImages.java +++ b/source/mircoders/storage/DatabaseImages.java @@ -31,16 +31,14 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; +import java.util.GregorianCalendar; -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.entity.Entity; +import mir.misc.StringUtil; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle @@ -57,7 +55,7 @@ public class DatabaseImages extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseImages getInstance() - throws StorageObjectException + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseImages(); @@ -66,7 +64,7 @@ public class DatabaseImages extends Database implements StorageObject{ return instance; } - private DatabaseImages() throws StorageObjectException + private DatabaseImages() throws StorageObjectFailure { super(); this.hasTimestamp = true; @@ -75,14 +73,14 @@ public class DatabaseImages extends Database implements StorageObject{ try { this.theEntityClass = Class.forName("mircoders.entity.EntityImages"); } - catch (Exception e) { throw new StorageObjectException(e.toString()); } + catch (Exception e) { throw new StorageObjectFailure(e); } } - public SimpleList getPopupData() throws StorageObjectException { + public SimpleList getPopupData() throws StorageObjectFailure { return getPopupData("title",true); } - public void update(Entity theEntity) throws StorageObjectException + public void update(Entity theEntity) throws StorageObjectFailure { String date = theEntity.getValue("date"); if (date==null){ @@ -94,7 +92,7 @@ public class DatabaseImages extends Database implements StorageObject{ } - public String insert(Entity theEntity) throws StorageObjectException + public String insert(Entity theEntity) throws StorageObjectFailure { String date = theEntity.getValue("date"); if (date==null){ diff --git a/source/mircoders/storage/DatabaseLanguage.java b/source/mircoders/storage/DatabaseLanguage.java index fc7131e3..e3d32018 100755 --- a/source/mircoders/storage/DatabaseLanguage.java +++ b/source/mircoders/storage/DatabaseLanguage.java @@ -40,16 +40,10 @@ package mircoders.storage; * @version 1.0 */ -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; public class DatabaseLanguage extends Database implements StorageObject{ @@ -61,7 +55,7 @@ public class DatabaseLanguage extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseLanguage getInstance() throws - StorageObjectException { + StorageObjectFailure { if (instance == null) { instance = new DatabaseLanguage(); instance.myselfDatabase = instance; @@ -69,18 +63,18 @@ public class DatabaseLanguage extends Database implements StorageObject{ return instance; } - private DatabaseLanguage() throws StorageObjectException { + private DatabaseLanguage() throws StorageObjectFailure { super(); this.hasTimestamp = false; this.theTable = "language"; } - public SimpleList getPopupData() throws StorageObjectException { + public SimpleList getPopupData() throws StorageObjectFailure { SimpleList pData = null; try { pData = getPopupData("name", false); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { System.err.println("FF"); } return pData; diff --git a/source/mircoders/storage/DatabaseLinksImcs.java b/source/mircoders/storage/DatabaseLinksImcs.java index e2d55f55..b69a0cff 100755 --- a/source/mircoders/storage/DatabaseLinksImcs.java +++ b/source/mircoders/storage/DatabaseLinksImcs.java @@ -31,15 +31,18 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; -import freemarker.template.*; -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; -import mir.util.*; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.HashMap; + +import mir.entity.Entity; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import mir.util.JDBCStringRoutines; /** @@ -60,7 +63,7 @@ public class DatabaseLinksImcs extends Database // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseLinksImcs getInstance() throws - StorageObjectException { + StorageObjectFailure { if (instance == null) { instance = new DatabaseLinksImcs(); instance.myselfDatabase = instance; @@ -71,7 +74,7 @@ public class DatabaseLinksImcs extends Database /** * put your documentation comment here */ - private DatabaseLinksImcs() throws StorageObjectException { + private DatabaseLinksImcs() throws StorageObjectFailure { super(); ////this.cache = new HashMap(); this.hasTimestamp = false; @@ -80,13 +83,13 @@ public class DatabaseLinksImcs extends Database this.theEntityClass = Class.forName("mircoders.entity.EntityLinksImcs"); } catch (Exception e) { - throw new StorageObjectException(e.toString()); + throw new StorageObjectFailure(e); } } /** @todo toooo much copy/paste in this class //rk */ - public String insert(Entity theEntity) throws StorageObjectException { + public String insert(Entity theEntity) throws StorageObjectFailure { String returnId = "0"; Connection con = null; PreparedStatement pstmt = null; @@ -174,7 +177,7 @@ public class DatabaseLinksImcs extends Database return returnId; } - public void update(Entity theEntity) throws StorageObjectException { + public void update(Entity theEntity) throws StorageObjectFailure { Connection con = null; PreparedStatement pstmt = null; ArrayList streamedInput = theEntity.streamedInput(); diff --git a/source/mircoders/storage/DatabaseMedia.java b/source/mircoders/storage/DatabaseMedia.java index 3b9af0fa..c0ab7a53 100755 --- a/source/mircoders/storage/DatabaseMedia.java +++ b/source/mircoders/storage/DatabaseMedia.java @@ -31,16 +31,12 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.entity.Entity; +import mir.entity.EntityRelation; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectExc; +import mir.storage.StorageObjectFailure; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle @@ -57,7 +53,7 @@ public class DatabaseMedia extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseMedia getInstance() - throws StorageObjectException { + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseMedia(); instance.myselfDatabase = instance; @@ -65,7 +61,7 @@ public class DatabaseMedia extends Database implements StorageObject{ return instance; } - private DatabaseMedia() throws StorageObjectException + private DatabaseMedia() throws StorageObjectFailure { super(); //this.cache = new DatabaseCache(100); @@ -77,7 +73,7 @@ public class DatabaseMedia extends Database implements StorageObject{ this.theEntityClass = Class.forName("mircoders.entity.EntityMedia"); } catch (Exception e) { - throw new StorageObjectException(e.toString()); + throw new StorageObjectFailure(e); } } @@ -88,14 +84,15 @@ public class DatabaseMedia extends Database implements StorageObject{ * returns the comments that belong to the article (via entityrelation) * where db-flag is_published is true */ - public Entity getMediaType(Entity ent) throws StorageObjectException { + public Entity getMediaType(Entity ent) + throws StorageObjectFailure, StorageObjectExc { Entity type=null; try { type = relationMediaType.getOne(ent); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { theLog.printError("DatabaseMedia :: failed to get media_type"); - throw new StorageObjectException("DatabaseMedia :"+e.toString()); + throw new StorageObjectFailure("DatabaseMedia :",e); } return type; } diff --git a/source/mircoders/storage/DatabaseMediaType.java b/source/mircoders/storage/DatabaseMediaType.java index 552e9e0e..6291d46c 100755 --- a/source/mircoders/storage/DatabaseMediaType.java +++ b/source/mircoders/storage/DatabaseMediaType.java @@ -31,16 +31,9 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; /** * This class implements the access to the media_type-table for the @@ -57,7 +50,7 @@ public class DatabaseMediaType extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseMediaType getInstance() - throws StorageObjectException { + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseMediaType(); instance.myselfDatabase = instance; @@ -65,7 +58,7 @@ public class DatabaseMediaType extends Database implements StorageObject{ return instance; } - private DatabaseMediaType() throws StorageObjectException + private DatabaseMediaType() throws StorageObjectFailure { super(); this.hasTimestamp = false; @@ -74,7 +67,7 @@ public class DatabaseMediaType extends Database implements StorageObject{ try { this.theEntityClass = Class.forName("mir.entity.GenericEntity"); } - catch (Exception e) { throw new StorageObjectException(e.toString()); } + catch (Exception e) { throw new StorageObjectFailure(e); } } } diff --git a/source/mircoders/storage/DatabaseMediafolder.java b/source/mircoders/storage/DatabaseMediafolder.java index e5521413..fd8eda5e 100755 --- a/source/mircoders/storage/DatabaseMediafolder.java +++ b/source/mircoders/storage/DatabaseMediafolder.java @@ -40,16 +40,10 @@ package mircoders.storage; * @version */ -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; @@ -61,7 +55,7 @@ public class DatabaseMediafolder extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseMediafolder getInstance() - throws StorageObjectException { + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseMediafolder(); instance.myselfDatabase = instance; @@ -69,7 +63,7 @@ public class DatabaseMediafolder extends Database implements StorageObject{ return instance; } - private DatabaseMediafolder() throws StorageObjectException + private DatabaseMediafolder() throws StorageObjectFailure { super(); this.hasTimestamp = false; @@ -77,7 +71,7 @@ public class DatabaseMediafolder extends Database implements StorageObject{ this.theTable="media_folder"; } - public SimpleList getPopupData() throws StorageObjectException { + public SimpleList getPopupData() throws StorageObjectFailure { return getPopupData("name",true); } diff --git a/source/mircoders/storage/DatabaseMessages.java b/source/mircoders/storage/DatabaseMessages.java index d8579f90..7c8eb50e 100755 --- a/source/mircoders/storage/DatabaseMessages.java +++ b/source/mircoders/storage/DatabaseMessages.java @@ -31,16 +31,9 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; /** @@ -61,7 +54,7 @@ public class DatabaseMessages extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseMessages getInstance() - throws StorageObjectException { + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseMessages(); instance.myselfDatabase = instance; @@ -69,7 +62,7 @@ public class DatabaseMessages extends Database implements StorageObject{ return instance; } - private DatabaseMessages() throws StorageObjectException + private DatabaseMessages() throws StorageObjectFailure { super(); //this.cache = new DatabaseCache(10); diff --git a/source/mircoders/storage/DatabaseOther.java b/source/mircoders/storage/DatabaseOther.java index 7bf74fb9..50f7842b 100755 --- a/source/mircoders/storage/DatabaseOther.java +++ b/source/mircoders/storage/DatabaseOther.java @@ -31,16 +31,14 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; +import java.util.GregorianCalendar; -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.entity.Entity; +import mir.misc.StringUtil; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle @@ -57,7 +55,7 @@ public class DatabaseOther extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseOther getInstance() - throws StorageObjectException + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseOther(); @@ -66,7 +64,7 @@ public class DatabaseOther extends Database implements StorageObject{ return instance; } - private DatabaseOther() throws StorageObjectException + private DatabaseOther() throws StorageObjectFailure { super(); this.hasTimestamp = true; @@ -75,14 +73,14 @@ public class DatabaseOther extends Database implements StorageObject{ try { this.theEntityClass = Class.forName("mircoders.entity.EntityOther"); } - catch (Exception e) { throw new StorageObjectException(e.toString()); } + catch (Exception e) { throw new StorageObjectFailure(e); } } - public SimpleList getPopupData() throws StorageObjectException { + public SimpleList getPopupData() throws StorageObjectFailure { return getPopupData("title",true); } - public void update(Entity theEntity) throws StorageObjectException + public void update(Entity theEntity) throws StorageObjectFailure { String date = theEntity.getValue("date"); if (date==null){ @@ -94,7 +92,7 @@ public class DatabaseOther extends Database implements StorageObject{ } - public String insert(Entity theEntity) throws StorageObjectException + public String insert(Entity theEntity) throws StorageObjectFailure { String date = theEntity.getValue("date"); if (date==null){ diff --git a/source/mircoders/storage/DatabaseRights.java b/source/mircoders/storage/DatabaseRights.java index ce2da61e..826788cd 100755 --- a/source/mircoders/storage/DatabaseRights.java +++ b/source/mircoders/storage/DatabaseRights.java @@ -31,16 +31,10 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle @@ -57,7 +51,7 @@ public class DatabaseRights extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseRights getInstance() - throws StorageObjectException + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseRights(); @@ -66,14 +60,14 @@ public class DatabaseRights extends Database implements StorageObject{ return instance; } - private DatabaseRights() throws StorageObjectException + private DatabaseRights() throws StorageObjectFailure { super(); this.hasTimestamp = false; this.theTable="rights"; } - public SimpleList getPopupData() throws StorageObjectException + public SimpleList getPopupData() throws StorageObjectFailure { return getPopupData("name",true); } diff --git a/source/mircoders/storage/DatabaseTopics.java b/source/mircoders/storage/DatabaseTopics.java index 51deeb79..4cf6f976 100755 --- a/source/mircoders/storage/DatabaseTopics.java +++ b/source/mircoders/storage/DatabaseTopics.java @@ -31,16 +31,10 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle @@ -56,7 +50,7 @@ public class DatabaseTopics extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseTopics getInstance() - throws StorageObjectException { + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseTopics(); instance.myselfDatabase = instance; @@ -64,7 +58,7 @@ public class DatabaseTopics extends Database implements StorageObject{ return instance; } - private DatabaseTopics() throws StorageObjectException + private DatabaseTopics() throws StorageObjectFailure { super(); //this.cache = new DatabaseCache(20); @@ -74,12 +68,12 @@ public class DatabaseTopics extends Database implements StorageObject{ this.theEntityClass = Class.forName("mircoders.entity.EntityTopics"); } catch (Exception e) { - throw new StorageObjectException(e.toString()); + throw new StorageObjectFailure(e); } } - public SimpleList getPopupData() throws StorageObjectException { + public SimpleList getPopupData() throws StorageObjectFailure { return getPopupData("title",true); } diff --git a/source/mircoders/storage/DatabaseUploadedMedia.java b/source/mircoders/storage/DatabaseUploadedMedia.java index a486cac9..7792ef16 100755 --- a/source/mircoders/storage/DatabaseUploadedMedia.java +++ b/source/mircoders/storage/DatabaseUploadedMedia.java @@ -31,18 +31,12 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; - -import mircoders.entity.*; +import mir.entity.Entity; +import mir.entity.EntityRelation; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectExc; +import mir.storage.StorageObjectFailure; /** * this class implements the access to the content-table @@ -58,7 +52,7 @@ public class DatabaseUploadedMedia extends Database implements StorageObject { // Contructors / Singleton public static DatabaseUploadedMedia getInstance() - throws StorageObjectException { + throws StorageObjectFailure { if (instance == null ) { instance = new DatabaseUploadedMedia(); @@ -68,14 +62,14 @@ public class DatabaseUploadedMedia extends Database implements StorageObject { } private DatabaseUploadedMedia() - throws StorageObjectException { + throws StorageObjectFailure { super(); this.theTable="uploaded_media"; this.theCoreTable="media"; relationMediaType = new EntityRelation("to_media_type", "id", DatabaseMediaType.getInstance(), EntityRelation.TO_ONE); try { this.theEntityClass = Class.forName("mircoders.entity.EntityUploadedMedia"); } - catch (Exception e) { throw new StorageObjectException(e.toString()); } + catch (Exception e) { throw new StorageObjectFailure(e); } } // methods @@ -85,14 +79,15 @@ public class DatabaseUploadedMedia extends Database implements StorageObject { * returns the media_type that belongs to the media item (via entityrelation) * where db-flag is_published is true */ - public Entity getMediaType(Entity ent) throws StorageObjectException { + public Entity getMediaType(Entity ent) + throws StorageObjectFailure, StorageObjectExc { Entity type=null; try { type = relationMediaType.getOne(ent); } - catch (StorageObjectException e) { + catch (StorageObjectFailure e) { theLog.printError("DatabaseUploadedMedia :: failed to get media_type"); - throw new StorageObjectException("DatabaseUploadedMedia :: failed to get media_type"+ e.toString()); + throw new StorageObjectFailure("DatabaseUploadedMedia :: failed to get media_type", e); } return type; } diff --git a/source/mircoders/storage/DatabaseUsers.java b/source/mircoders/storage/DatabaseUsers.java index 74be88ca..9ba17128 100755 --- a/source/mircoders/storage/DatabaseUsers.java +++ b/source/mircoders/storage/DatabaseUsers.java @@ -31,16 +31,10 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; - -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle @@ -56,7 +50,7 @@ public class DatabaseUsers extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseUsers getInstance() - throws StorageObjectException { + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseUsers(); instance.myselfDatabase = instance; @@ -64,7 +58,7 @@ public class DatabaseUsers extends Database implements StorageObject{ return instance; } - private DatabaseUsers() throws StorageObjectException + private DatabaseUsers() throws StorageObjectFailure { super(); this.hasTimestamp = false; @@ -73,11 +67,11 @@ public class DatabaseUsers extends Database implements StorageObject{ this.theEntityClass = Class.forName("mircoders.entity.EntityUsers"); } catch (Exception e) { - throw new StorageObjectException(e.toString()); + throw new StorageObjectFailure(e); } } - public SimpleList getPopupData() throws StorageObjectException { + public SimpleList getPopupData() throws StorageObjectFailure { return getPopupData("login",true); } } diff --git a/source/mircoders/storage/DatabaseVideo.java b/source/mircoders/storage/DatabaseVideo.java index e0acb97e..533ba8d1 100755 --- a/source/mircoders/storage/DatabaseVideo.java +++ b/source/mircoders/storage/DatabaseVideo.java @@ -31,16 +31,14 @@ package mircoders.storage; -import java.lang.*; -import java.sql.*; -import java.io.*; -import java.util.*; +import java.util.GregorianCalendar; -import freemarker.template.*; - -import mir.storage.*; -import mir.entity.*; -import mir.misc.*; +import mir.entity.Entity; +import mir.misc.StringUtil; +import mir.storage.Database; +import mir.storage.StorageObject; +import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle @@ -57,7 +55,7 @@ public class DatabaseVideo extends Database implements StorageObject{ // could get preemted and we could end up with 2 instances of DatabaseFoo.. // see the "Singletons with needles and thread" article at JavaWorld -mh public synchronized static DatabaseVideo getInstance() - throws StorageObjectException + throws StorageObjectFailure { if (instance == null) { instance = new DatabaseVideo(); @@ -66,7 +64,7 @@ public class DatabaseVideo extends Database implements StorageObject{ return instance; } - private DatabaseVideo() throws StorageObjectException + private DatabaseVideo() throws StorageObjectFailure { super(); this.hasTimestamp = true; @@ -75,14 +73,14 @@ public class DatabaseVideo extends Database implements StorageObject{ try { this.theEntityClass = Class.forName("mircoders.entity.EntityVideo"); } - catch (Exception e) { throw new StorageObjectException(e.toString()); } + catch (Exception e) { throw new StorageObjectFailure(e); } } - public SimpleList getPopupData() throws StorageObjectException { + public SimpleList getPopupData() throws StorageObjectFailure { return getPopupData("title",true); } - public void update(Entity theEntity) throws StorageObjectException + public void update(Entity theEntity) throws StorageObjectFailure { String date = theEntity.getValue("date"); if (date==null){ @@ -94,7 +92,7 @@ public class DatabaseVideo extends Database implements StorageObject{ } - public String insert(Entity theEntity) throws StorageObjectException + public String insert(Entity theEntity) throws StorageObjectFailure { String date = theEntity.getValue("date"); if (date==null){ -- 2.11.0