From: <jbo...@li...> - 2005-10-22 16:17:01
|
Author: szimano Date: 2005-10-22 12:16:39 -0400 (Sat, 22 Oct 2005) New Revision: 1433 Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/EditSessionWatcher.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/RenamePageWatcher.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPlugin.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiTypeHandler.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RecentlyChangedPagesPlugin.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/DictionaryTest.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/GetSavePageTest.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/WikiTest.java trunk/forge/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/management/WikiService.java Log: org.jboss.logging instead of System.out http://jira.jboss.com/jira/browse/JBWIKI-64 Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-10-22 08:05:44 UTC (rev 1432) +++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-10-22 16:16:39 UTC (rev 1433) @@ -16,6 +16,7 @@ import javax.portlet.*; +import org.jboss.logging.Logger; import org.jboss.wiki.exceptions.EditSessionExpired; import org.jboss.wiki.management.WikiServiceMenagement; import org.apache.commons.fileupload.PortletDiskFileUpload; @@ -38,8 +39,12 @@ private String defaultPage = "Main"; private WikiEngine wikiEngine; + + private Logger log; public void init() { + log = Logger.getLogger(WikiPortlet.class); + WikiCommon wikiCommon = new WikiCommon(); WikiServiceMenagement wikiServiceMenagement = wikiCommon @@ -173,14 +178,14 @@ } if (rReq.getParameter("version") != null) { - System.out.println("[process action]Getting page " + log.info("[process action]Getting page " + rReq.getParameter("page") + " at version " + rReq.getParameter("version")); rResp.setRenderParameter("version", rReq.getParameter("version")); } if (rReq.getParameter("editAction") != null) { - System.out.println("EDITING PAGE"); + log.info("EDITING PAGE"); // unlock page WikiPage edPage = wikiEngine.getByName((String) rReq @@ -306,7 +311,7 @@ if (rReq.getParameter("version") != null) { // show previous version of page - System.out.println("Getting page " + wikiPage + log.info("Getting page " + wikiPage + " at version " + rReq.getParameter("version")); if ((pageToShow.getLastVersion() > Integer.valueOf(rReq @@ -363,7 +368,7 @@ * if (pageToShow == null) { // if somebody entered a link to info // * non-existing page page = "Wiki.jsp"; try { pageToShow = * (WikiPage) noSuchPage.clone(); } catch - * (CloneNotSupportedException cnse) { System.out.println(cnse); } + * (CloneNotSupportedException cnse) { log.info(cnse); } * * pageToShow.setName(wikiPage); } else { */ @@ -378,7 +383,7 @@ if (rReq.getParameter("type") != null) { type = rReq.getParameter("type"); - // System.out.println("Getting type: " + type); + // log.info("Getting type: " + type); } wikiContext = new WikiContext(credentials, wikiEngine @@ -387,7 +392,7 @@ if (rReq.getParameter("version") != null) { // show previous version of page - System.out.println("Getting page " + wikiPage + " at version " + log.info("Getting page " + wikiPage + " at version " + rReq.getParameter("version")); pageToShow = wikiEngine.getByName(wikiPage, wikiContext, Integer.valueOf(rReq.getParameter("version"))); @@ -404,7 +409,7 @@ * if (pageToShow == null) { * * try { pageToShow = (WikiPage) noSuchPage.clone(); } catch - * (CloneNotSupportedException cnse) { System.out.println(cnse); } + * (CloneNotSupportedException cnse) { log.info(cnse); } * * pageToShow.setName(wikiPage); } */ Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-10-22 08:05:44 UTC (rev 1432) +++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-10-22 16:16:39 UTC (rev 1433) @@ -8,7 +8,6 @@ *****************************************/ package org.jboss.wiki.fileaccess; -import java.awt.image.SampleModel; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; @@ -26,6 +25,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.jboss.logging.Logger; import org.jboss.wiki.FileDataSource; import org.jboss.wiki.ServletWikiSession; import org.jboss.wiki.SimpleCredentials; @@ -66,9 +66,13 @@ * private ForgeHelper forgeHelper; private ContentManager contentManager; */ private MimetypesFileTypeMap mimeTypes; + + private Logger log; public void init(FilterConfig conf) { // get wikiEnigne form wikiMenagement + + log = Logger.getLogger(WikiFileAccessFilter.class); WikiCommon wikiCommon = new WikiCommon(); @@ -100,10 +104,10 @@ wikiHome = props.getProperty("wikiHome"); } catch (IOException e) { - System.err.println(e); + log.error(e); } - System.out.println("[WikiFileAccess]Loaded attachements path: " + log.info("Loaded attachements path: " + attachementsPath); } Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/EditSessionWatcher.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/EditSessionWatcher.java 2005-10-22 08:05:44 UTC (rev 1432) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/EditSessionWatcher.java 2005-10-22 16:16:39 UTC (rev 1433) @@ -3,6 +3,7 @@ import java.util.Calendar; import java.util.Date; +import org.jboss.logging.Logger; import org.jboss.wiki.exceptions.PageNotEditedException; public class EditSessionWatcher extends Thread { @@ -13,9 +14,14 @@ private WikiPage watchedPage; private boolean runs = true; + + private Logger log; public EditSessionWatcher(Integer editSessionId, int sessionIdExpireTime, WikiPage watchedPage) { + + log = Logger.getLogger(EditSessionWatcher.class); + this.editSessionId = editSessionId; this.watchedPage = watchedPage; Calendar cal = Calendar.getInstance(); @@ -30,11 +36,11 @@ @Override public void run() { while (runs) { - //System.out.println("Checking watcher for page "+watchedPage.getName()+" with sessionid: "+editSessionId); + log.debug("Checking watcher for page "+watchedPage.getName()+" with sessionid: "+editSessionId); Date now = new Date(); if (now.after(endTime)) { - System.out.println("Session time exceeded"); + log.debug("Session time exceeded for page "+watchedPage.getName()+" with sessionid: "+editSessionId); try { watchedPage.addExpiredSessionId(editSessionId); @@ -54,7 +60,7 @@ } public void stopWatcher() { - System.out.println("Stopping watcher for page: "+watchedPage.getName()+" with sessionid: "+editSessionId); + log.debug("Stopping watcher for page: "+watchedPage.getName()+" with sessionid: "+editSessionId); runs = false; } Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java 2005-10-22 08:05:44 UTC (rev 1432) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java 2005-10-22 16:16:39 UTC (rev 1433) @@ -19,7 +19,7 @@ import java.util.Set; import java.util.TreeSet; -import org.jboss.wiki.exceptions.PageAlreadyExistsException; +import org.jboss.logging.Logger; import org.jboss.wiki.exceptions.PageRenamingException; /** @@ -67,13 +67,17 @@ private File pageDictionaryFile; private WikiEngine wikiEngine; + + private Logger log; public void setWikiEngine(WikiEngine wikiEngine) { this.wikiEngine = wikiEngine; } public FileDataSource() { - System.out.println("Looking for props file !"); + log = Logger.getLogger(FileDataSource.class); + + log.info("Looking for props file !"); Properties fileDSProps = new Properties(); @@ -83,8 +87,8 @@ .getResourceAsStream(propFileName)); } catch (IOException ioe) { - System.err.println("Can't load the file " + propFileName + "\n" - + ioe); + log.error("Can't load the file " + propFileName + "\n" + , ioe); } loadProperties(fileDSProps); @@ -104,13 +108,13 @@ pageModProps.load(fis); } catch (IOException ioe) { - System.err.println("Can't load the file " + propModFileName + "\n" - + ioe); + log.error("Can't load the file " + propModFileName + "\n" + , ioe); } finally { try { fis.close(); } catch (IOException ioe) { - System.err.println("Can't close input stream \n" + ioe); + log.error("Can't close input stream \n" , ioe); } } @@ -146,8 +150,7 @@ try { pageDictionaryFile.createNewFile(); } catch (IOException e) { - System.err.println("Cannot create dictionary file: "); - e.printStackTrace(); + log.error("Cannot create dictionary file: ",e); } } else { // there is dictionary file. Load props from it @@ -185,9 +188,9 @@ public void loadProperties(Properties fileDSProps) { if (fileDSProps.getProperty("pathToMedia") != null) { pathToMedia = fileDSProps.getProperty("pathToMedia"); - System.out.println("Path to media is: " + pathToMedia); + log.info("Path to media is: " + pathToMedia); pathToAttachments = fileDSProps.getProperty("pathToAttachements"); - System.out.println("Path to attachements is: " + pathToAttachments); + log.info("Path to attachements is: " + pathToAttachments); } else { System.err .println("Your properties file lacks of pathToMedia property. It will not run properly ! Please update " @@ -222,7 +225,7 @@ + e.toString()); } - System.out.println("Opening files"); + log.info("Opening files"); File pageFile = new File(pathToMedia + "/OLD/" + uid + "/" + (page.getLastVersion() - 1) + ".txt"); File pageOldFile = new File(pathToMedia + "/" + uid @@ -258,11 +261,11 @@ pageFileWriter.close(); status = true; } catch (FileNotFoundException fnfe) { - System.err.println("[FILEDATASOURCE]: Cannot save page: " - + fnfe.toString()); + log.error("[FILEDATASOURCE]: Cannot save page: " + , fnfe); } catch (IOException ioe) { - System.err.println("[FILEDATASOURCE]: Cannot save page: " - + ioe.toString()); + log.error("[FILEDATASOURCE]: Cannot save page: " + , ioe); } } else { // there is no page on disk. We have to create new one. @@ -312,7 +315,7 @@ status = true; } catch (Exception e) { - System.err.println("Cannot write new page: " + e); + log.error("Cannot write new page: ", e); status = false; } } @@ -361,8 +364,8 @@ } } catch (IOException e) { - System.err.println("Cannot create page props file for page: " - + pageName); + log.error("Cannot create page props file for page: " + + pageName,e); } return pageProps; } @@ -423,7 +426,7 @@ } public WikiPage getPage(String pageName) { - // System.out.println("[WIKI:FileDataSource]: Getting new page: " + + // log.info("[WIKI:FileDataSource]: Getting new page: " + // pageName); WikiPage page = null; @@ -458,7 +461,7 @@ nextChr = input.read(); } } catch (IOException ioe) { - System.err.println(ioe); + log.error(ioe); } int pageMods = getPageMod(pageName); @@ -482,8 +485,7 @@ public WikiPage getPage(String pageName, String languageCode) { if (languageCode != null) { - System.out - .println("As for now, languages aren't supported in the wiki. Please do not use language codes"); + log.info("As for now, languages aren't supported in the wiki. Please do not use language codes"); } return getPage(pageName); } @@ -491,8 +493,7 @@ public WikiPage getPageAtVersion(WikiPage originPage, boolean loadContent, String languageCode, int version) { if (languageCode != null) { - System.out - .println("As for now, languages aren't supported in the wiki. Please do not use language codes"); + log.info("As for now, languages aren't supported in the wiki. Please do not use language codes"); } return getPageAtVersion(originPage, loadContent, version); @@ -511,12 +512,12 @@ try { page = (WikiPage) originPage.clone(); } catch (CloneNotSupportedException e) { - System.err.println(e); + log.error(e); } if (page != null) { if (page.getLastVersion() < version) { - System.out.println("There is no version " + version + log.info("There is no version " + version + " of page " + page.getName()); return null; } @@ -534,7 +535,7 @@ /* * cal.setTime(new Date()); * - * System.out.println("PAGE "+page.getName()+" loaded in: + * log.info("PAGE "+page.getName()+" loaded in: * "+(cal.getTimeInMillis() - oldMilis)); */ return page; @@ -564,7 +565,7 @@ page.setLength(ret.length()); } catch (IOException ioe) { - System.err.println(ioe); + log.error(ioe); } } else { page.setLength(pageFile.length()); @@ -633,7 +634,7 @@ newFile = new FileOutputStream(new File(fileName)); oldFile = new FileInputStream(attFile); } catch (FileNotFoundException e) { - System.err.println(e); + log.error(e); } // writing old file to new one @@ -650,7 +651,7 @@ newFile.close(); oldFile.close(); } catch (IOException e) { - System.err.println(e); + log.error(e); } } @@ -847,12 +848,12 @@ fos = new FileOutputStream(modFile); pageModProps.store(fos, SAVE_COMMENT); } catch (IOException ioe) { - System.err.println("Couldn't store mod props: " + ioe); + log.error("Couldn't store mod props: ",ioe); } finally { try { fos.close(); } catch (IOException ioe) { - System.err.println("Can't close input stream \n" + ioe); + log.error("Can't close input stream \n",ioe); } } } @@ -888,7 +889,7 @@ } if (!pageFile.renameTo(pageTrashFile)) { - System.err.println("[FileDataSource]: Problems with moving " + log.error("[FileDataSource]: Problems with moving " + pageFileName + " to " + pageFileTrashName); return false; } @@ -922,7 +923,7 @@ } if (!pageFile.renameTo(pageTrashFile)) { - System.err.println("[FileDataSource]: Problems with moving " + log.error("[FileDataSource]: Problems with moving " + historyDirName + " to " + historyTrashDirName); // return back the page history @@ -941,7 +942,7 @@ return true; } else { // no such page - System.err.println("There is now such page: " + pageName); + log.error("There is now such page: " + pageName); return false; } } @@ -980,14 +981,14 @@ } if (!attFile.renameTo(attTrashFile)) { - System.err.println("[ATTACHMENT DS]:Problems with moving " + log.error("[ATTACHMENT DS]:Problems with moving " + attName + " to " + attTrashName); return false; } return true; } else { - System.err.println("Page " + pageName + " has no " + attachmentName + log.error("Page " + pageName + " has no " + attachmentName + " attachmnet"); return false; } @@ -1022,14 +1023,14 @@ } if (!attFile.renameTo(new File(attTrashName))) { - System.err.println("[ATTACHMENT DS]:Problems with moving " + log.error("[ATTACHMENT DS]:Problems with moving " + attName + " to " + attTrashName); return false; } return true; } else { - System.err.println("Page " + pageName + " has no attachmnets"); + log.error("Page " + pageName + " has no attachmnets"); return false; } } @@ -1071,7 +1072,7 @@ while ((pageExists(uid + String.valueOf(i))) || (pageDictionary.containsKey(uid + String.valueOf(i)))) { - System.out.println(i++); + log.info(i++); } // add maping for new (to be done) with name translated to old uid @@ -1080,7 +1081,7 @@ saveDictionary(); - System.out.println("Renamed (uid) "+uid+" to "+newName); + log.info("Renamed (uid) "+uid+" to "+newName); lock = false; } Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/RenamePageWatcher.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/RenamePageWatcher.java 2005-10-22 08:05:44 UTC (rev 1432) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/RenamePageWatcher.java 2005-10-22 16:16:39 UTC (rev 1433) @@ -3,7 +3,6 @@ import java.util.HashMap; import java.util.Vector; -import org.jboss.wiki.exceptions.PageAlreadyExistsException; import org.jboss.wiki.exceptions.PageRenamingException; public class RenamePageWatcher extends Thread { Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java 2005-10-22 08:05:44 UTC (rev 1432) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java 2005-10-22 16:16:39 UTC (rev 1433) @@ -35,7 +35,7 @@ import org.jboss.wiki.exceptions.PageRenamingException; import org.jboss.wiki.exceptions.WikiException; -import sun.security.krb5.internal.p; +import org.jboss.logging.Logger; import java.io.File; @@ -87,6 +87,8 @@ private RenamePageWatcher renamePageWatcher; private Class credentialsClass; + + private Logger log; /** * <p> @@ -162,7 +164,7 @@ WikiPage ret = null; if (!mediaDataSource.preGet()) { - System.err.println("Couldn't get page"); + log.error("Couldn't get page"); s.release(); return null; } @@ -188,7 +190,7 @@ } if (!mediaDataSource.postGet()) { - System.err.println("Problems with postGet"); + log.error("Problems with postGet"); } if (ret != null) { @@ -204,7 +206,7 @@ ret = (WikiPage) noSuchPage.clone(); ret.setName(pageName); } catch (CloneNotSupportedException cne) { - System.err.println(cne); + log.error(cne); } if (wikiContext != null) { @@ -253,7 +255,7 @@ // return noSuchPage if there isn't any /* * try { ret = (WikiPage) noSuchPage.clone(); } catch - * (CloneNotSupportedException cne) { System.err.println(cne); } if + * (CloneNotSupportedException cne) { log.error(cne); } if * (wikiContext != null) { return wikiContext.process(ret); } else { * return ret; } */ @@ -271,6 +273,8 @@ * @return */ public void init() { + log = Logger.getLogger(WikiEngine.class); + editedPages = new HashSet<Integer>(); pages = new HashMap<String, WikiPage>(); @@ -322,8 +326,8 @@ // TODO Auto-generated catch block e.printStackTrace(); } - - System.out.println("[WikiEngine] Loaded mediaDataSource: "+mediaDataSource); + log.info("Loaded mediaDataSource: "+mediaDataSource); + } else { //if sth went wrong @@ -344,7 +348,7 @@ e.printStackTrace(); } - System.out.println("[WikiEngine] Loaded attachmentDataSource: "+attachmentDataSource); + log.info("Loaded attachmentDataSource: "+attachmentDataSource); } else { //if sth went wrong @@ -364,7 +368,7 @@ // TODO Auto-generated catch block e.printStackTrace(); } - System.out.println("[WikiEngine] Loaded wikiPageDictionary: "+wikiPageDictionary); + log.info("Loaded wikiPageDictionary: "+wikiPageDictionary); } else { //if sth went wrong @@ -381,19 +385,18 @@ credentialsClass = Class.forName(jbosswikiprops .getProperty("credentialsClass")); } catch (ClassNotFoundException e) { - System.err.println("Coudln't load credentials class."); - e.printStackTrace(); + log.error("Coudln't load credentials class.",e); } if (credentialsClass != null) - System.out.println("[WikiEngine]Loaded credentialsClass: " + log.info("Loaded credentialsClass: " + credentialsClass); } // if credentialClass didn't load or wasn't set if (credentialsClass == null) { credentialsClass = SimpleCredentials.class; - System.out.println("[WikiEngine](SIMPLE)Loaded credentialsClass: " + log.info("(SIMPLE)Loaded credentialsClass: " + credentialsClass); } @@ -417,8 +420,8 @@ .getResourceAsStream("/WikiTypes.xml"), new WikiTypeHandler(this)); } catch (Exception se) { - System.err.println("Error while parsing WikiType configuration: " - + se); + log.error("Error while parsing WikiType configuration: " + , se); } } @@ -431,18 +434,16 @@ props.loadFromXML(WikiTypeHandler.class .getResourceAsStream("/WikiInsidePlugins.xml")); } catch (InvalidPropertiesFormatException e) { - System.err.println("WikiInsidePlugins.xml has bad format !"); - e.printStackTrace(); + log.error("WikiInsidePlugins.xml has bad format !",e); } catch (IOException e) { - System.err.println("There is no WikiInsidePlugins.xml file !"); - e.printStackTrace(); + log.error("There is no WikiInsidePlugins.xml file !",e); } Iterator it = props.keySet().iterator(); while (it.hasNext()) { String pluginName = (String) it.next(); - System.out.println("[WIKIENGINE]: Loading inside plugin: " + log.info("Loading inside plugin: " + pluginName + " class: " + props.getProperty(pluginName)); WikiInsidePlugin wikiInsidePlugin = null; @@ -544,7 +545,7 @@ } public void addWikiType(String name, WikiType wikiType) { - System.out.println("[WIKIENGINE]: Added WikiType: " + name + " Class: " + log.info("Added WikiType: " + name + " Class: " + wikiType); wikiTypes.put(name, wikiType); } @@ -571,7 +572,7 @@ } public Map<String, Integer> findPages(String searchQuery) { - // System.out.println("Starting search: " + searchQuery); + // log.info("Starting search: " + searchQuery); WikiSearch wikiSearch = new WikiSearch(searchQuery); Map<String, Integer> resPages = new HashMap<String, Integer>(); @@ -613,7 +614,7 @@ resPages.put(entry.getKey(), entry.getValue()); } - // System.out.println("Search completed"); + // ("Search completed"); return resPages; } @@ -672,7 +673,7 @@ public boolean deletePage(String pageName, boolean deleteSubpages) { Set<String> subpages = new HashSet<String>(); - System.out.println("DELETE SUBPAGES: " + deleteSubpages); + log.info("DELETE SUBPAGES: " + deleteSubpages); if (deleteSubpages) { subpages = mediaDataSource.getPagesFor(pageName); @@ -680,7 +681,7 @@ if (attachmentDataSource.getAttachmentsSet(getByName(pageName, null)) != null) { if (!attachmentDataSource.deleteAttachments(pageName)) { - System.err.println("Couldn't delete attachments of page " + log.error("Couldn't delete attachments of page " + pageName); return false; } @@ -707,12 +708,12 @@ pages.remove(pageName); } - System.out.println("Finishing deleting of page " + pageName + log.info("Finishing deleting of page " + pageName + " with ret = " + ret); return ret; } else { - System.err.println("Problems with deleting page " + pageName); + log.error("Problems with deleting page " + pageName); return false; } } @@ -720,7 +721,7 @@ public String getRealName(String uid) { String[] pageTokens = uid.split("/"); - // System.out.println("Looking at page: (realName) "+uid); + // log.info("Looking at page: (realName) "+uid); if (pageTokens.length > 1) { if (!wikiPageDictionary.getRealName(uid).equals(uid)) { @@ -728,7 +729,7 @@ // this page is in dictionary return wikiPageDictionary.getRealName(uid); } else { - // System.out.println("checking parts"); + // log.info("checking parts"); // look if parts of this page are in dictionary for (int i = pageTokens.length - 1; i > 0; i--) { @@ -746,7 +747,7 @@ page = page.substring(1); - // System.out.println("Looking at page: (realName) "+page); + // log.info("Looking at page: (realName) "+page); if (!wikiPageDictionary.getRealName(page).equals(page)) // this // page @@ -766,7 +767,7 @@ public String getUid(String realName) { String[] pageTokens = realName.split("/"); - // System.out.println("Looking at page: (uid) "+realName); + // log.info("Looking at page: (uid) "+realName); if (pageTokens.length > 1) { if (!wikiPageDictionary.getUid(realName).equals(realName)) { @@ -790,7 +791,7 @@ page = page.substring(1); - // System.out.println("Looking at page: (uid) "+page); + // log.info("Looking at page: (uid) "+page); if (!wikiPageDictionary.getUid(page).equals(page)) // this // page @@ -820,7 +821,6 @@ if (!arePagesEdited()) { wikiPageDictionary.rename(uid, newName); - System.out.println(10); } else { // some pages are edited now - execute watcher renamePageWatcher.rename(uid, newName); @@ -988,11 +988,10 @@ cred = (Credentials) credentialsClass.newInstance(); cred.setRenderRequest(rReq); } catch (InstantiationException e) { - System.err.println("Couldn't get instance of class " - + credentialsClass.getName()); - e.printStackTrace(); + log.error("Couldn't get instance of class " + + credentialsClass.getName(),e); } catch (IllegalAccessException e) { - e.printStackTrace(); + log.error(e); } return cred; @@ -1001,15 +1000,14 @@ public Credentials getCredentialsInstance(ActionRequest aReq) { Credentials cred = null; - System.out.println("Getting instance of " + credentialsClass.getName()); + log.info("Getting instance of " + credentialsClass.getName()); try { cred = (Credentials) credentialsClass.newInstance(); cred.setActionRequest(aReq); } catch (InstantiationException e) { - System.err.println("Couldn't get instance of class " - + credentialsClass.getName()); - e.printStackTrace(); + log.error("Couldn't get instance of class " + + credentialsClass.getName(),e); } catch (IllegalAccessException e) { e.printStackTrace(); } Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java 2005-10-22 08:05:44 UTC (rev 1432) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java 2005-10-22 16:16:39 UTC (rev 1433) @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Set; -import java.util.Vector; +import org.jboss.logging.Logger; import org.jboss.wiki.exceptions.EditSessionExpired; import org.jboss.wiki.exceptions.PageNotEditedException; @@ -58,6 +58,8 @@ * */ private String name; + + private Logger log; /** * <p> @@ -136,6 +138,7 @@ this.editable = editable; expiredSessionIds = new HashSet<Integer>(); editSessionWatchers = new HashMap<Integer, EditSessionWatcher>(); + log = Logger.getLogger(WikiPage.class); } /** @@ -169,14 +172,14 @@ } if (!wikiEngine.preSave()) { - System.err.println("Couldn't save page"); + log.error("Couldn't save page"); return false; } boolean ret = wikiEngine.savePage(this, null); boolean postSave; if (postSave = !wikiEngine.postSave()) { - System.err.println("Problems with postSave"); + log.error("Problems with postSave"); } return ret || postSave; @@ -267,11 +270,11 @@ } public void showPage() { - System.out.println("Page name: " + getName()); - System.out.println("Page author: " + getLastAuthor()); - System.out.println("Page version: " + getLastVersion()); - System.out.println("Page editdate: " + getEditDate()); - System.out.println("Page Content: \n" + getContent()); + log.info("Page name: " + getName()); + log.info("Page author: " + getLastAuthor()); + log.info("Page version: " + getLastVersion()); + log.info("Page editdate: " + getEditDate()); + log.info("Page Content: \n" + getContent()); } /** @@ -337,7 +340,7 @@ } public void unlock(Credentials user, Integer editSessionId) { - System.out.println("UNLOCK: " + user.getName() + " save user: " + log.info("UNLOCK: " + user.getName() + " save user: " + lockUser); if (editSessionWatchers.get(editSessionId) != null) { @@ -353,7 +356,7 @@ } if ((user.getName()).equals(lockUser)) { - System.out.println("Unlocking page"); + log.info("Unlocking page"); lockTime = null; lockUser = null; } @@ -380,12 +383,12 @@ } if (this.lockTime == null) { - System.out.println("LOCK: " + user.getName()); + log.info("LOCK: " + user.getName()); // page isn't locked or lock expired. Lets lock it. this.lockTime = now; this.lockUser = user.getName(); - System.out.println("LOCK: " + lockUser); + log.info("LOCK: " + lockUser); retDate = null; } Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPlugin.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPlugin.java 2005-10-22 08:05:44 UTC (rev 1432) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPlugin.java 2005-10-22 16:16:39 UTC (rev 1433) @@ -11,6 +11,8 @@ import java.io.InputStream; import java.util.Properties; +import org.jboss.logging.Logger; + /** * * @author <a href="mailto:ds...@jb...">Damon Sicore</a><br /> @@ -52,6 +54,8 @@ final static String propFileName = "wikiPlugins.properties"; + protected Logger log = Logger.getLogger(this.getClass()); + /**Processes given WikiPage and returns processed one. * * @param wikiPage WikiPage to process @@ -85,7 +89,7 @@ pluginProps.load(propsStream); } catch (Exception e) { - System.err.println("[WikiPlugin]: Cannot load WikiPlugin property file: "+e); + log.error("Cannot load WikiPlugin property file: "+e); } } @@ -117,5 +121,4 @@ this.name = name; } - } Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java 2005-10-22 08:05:44 UTC (rev 1432) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java 2005-10-22 16:16:39 UTC (rev 1433) @@ -10,6 +10,8 @@ import java.util.Vector; +import org.jboss.logging.Logger; + /** * <p> * </p> @@ -35,6 +37,8 @@ protected WikiContext wikiContext; protected Vector<WikiPlugin> plugins = new Vector<WikiPlugin>(); + + protected Logger log = Logger.getLogger(this.getClass()); public void addPlugin(String pluginName, String pluginClass) { @@ -43,7 +47,7 @@ try { plugin = (WikiPlugin) Class.forName(pluginClass).newInstance(); } catch (Exception e) { - System.err.println("Error while loading plugin: " + pluginName + log.error("Error while loading plugin: " + pluginName + "\nclass: " + pluginClass + "\n" + e); } @@ -57,7 +61,7 @@ // run init() function plugin.init(); - System.out.println("[WikiType:" + name + "]Plugin added: " + log.info("Plugin added: " + pluginName + " class: " + pluginClass); } @@ -88,13 +92,13 @@ try { newPage = (WikiPage) wikiPage.clone(); } catch (CloneNotSupportedException cnse) { - System.err.println("cannot clone the page: " + cnse); + log.error("cannot clone the page: " + cnse); } } // execute the plugins for (int i = 0; i < plugins.size(); i++) { - // System.out.println("Executing plugin: + // log.info("Executing plugin: // "+plugins.get(i).getName()); newPage = (plugins.get(i)).process(newPage, wikiSession); } @@ -120,7 +124,7 @@ } public void setName(String name) { - System.out.print("Setting new WikiType name: " + name); + log.info("Setting new WikiType name: " + name); this.name = name; } Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiTypeHandler.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiTypeHandler.java 2005-10-22 08:05:44 UTC (rev 1432) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiTypeHandler.java 2005-10-22 16:16:39 UTC (rev 1433) @@ -10,6 +10,7 @@ import java.util.Stack; +import org.jboss.logging.Logger; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; @@ -37,12 +38,14 @@ private String wikiTypeName; private String pluginName = "", pluginClass = ""; + + private Logger log = Logger.getLogger(WikiTypeHandler.class); @Override public void endDocument() throws SAXException { super.endDocument(); - System.out.println("WikiType configuration file parsed."); + log.info("WikiType configuration file parsed."); } @Override @@ -60,25 +63,25 @@ wikiTypeName = null; } - // System.out.println("End element: "+uri+" "+localName+" "+qName); + // log.info("End element: "+uri+" "+localName+" "+qName); } @Override public void error(SAXParseException e) throws SAXException { super.error(e); - System.err.println("[WikiType Parser:ERROR]: " + e); + log.error("ERROR", e); } @Override public void fatalError(SAXParseException e) throws SAXException { super.fatalError(e); - System.err.println("[WikiType Parser:FATAL ERROR]: " + e); + log.error("FATAL ERROR" , e); } @Override public void startDocument() throws SAXException { super.startDocument(); - System.out.println("Parsing the WikiType configuration file..."); + log.info("Parsing the WikiType configuration file..."); } @Override @@ -86,9 +89,9 @@ Attributes attributes) throws SAXException { super.startElement(uri, localName, qName, attributes); /* - * System.out.println("Element: uri: "+uri+" lname: "+localName+" qname: + * log.info("Element: uri: "+uri+" lname: "+localName+" qname: * "+qName); for (int i = 0; i < attributes.getLength(); i++) { - * System.out.println("Attr "+i+": "+attributes.getQName(i)+" = + * log.info("Attr "+i+": "+attributes.getQName(i)+" = * "+attributes.getIndex(attributes.getQName(i))); } */ if (qName.equals("plugin")) { @@ -105,7 +108,7 @@ @Override public void warning(SAXParseException e) throws SAXException { super.warning(e); - System.out.println("[WikiType Parser:WARNING]: " + e); + log.warn(e); } public WikiTypeHandler(WikiEngine wikiEngine) { @@ -134,7 +137,7 @@ wikiType.setWikiEngine(wikiEngine); } catch(Exception e) { - System.err.println("Cannot load WikiType class: "+e); + log.error("Cannot load WikiType class: ",e); } if (wikiTypeName != null) { Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java 2005-10-22 08:05:44 UTC (rev 1432) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java 2005-10-22 16:16:39 UTC (rev 1433) @@ -59,6 +59,7 @@ import java.util.Collection; import java.util.StringTokenizer; +import org.jboss.logging.Logger; import org.jboss.wiki.WikiCommon; import org.jboss.wiki.WikiPage; import org.jboss.wiki.WikiPlugin; @@ -66,6 +67,8 @@ public class HTMLTranslatorParts extends WikiPlugin { + private Logger log; + /* URL components, later to be configurable */ private String portalHome = ""; @@ -123,7 +126,7 @@ private String pageName = ""; public HTMLTranslatorParts() { - + } /** @@ -1013,7 +1016,7 @@ try { newPage = (WikiPage) wikiPage.clone(); } catch (CloneNotSupportedException cnse) { - System.out.println("cannot clone the page: " + cnse); + log.error("cannot clone the page: ", cnse); } pageName = newPage.getName(); @@ -1053,7 +1056,7 @@ } } catch (IOException e) { - System.out.println(e); + log.error(e); newPageContent = "error on page"; } Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RecentlyChangedPagesPlugin.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RecentlyChangedPagesPlugin.java 2005-10-22 08:05:44 UTC (rev 1432) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RecentlyChangedPagesPlugin.java 2005-10-22 16:16:39 UTC (rev 1433) @@ -39,7 +39,7 @@ for (String name : pages) { WikiPage temp = wikiEngine.getByName(name, null); - System.out.println("name: "+name+" "+temp.getName()); + log.info("name: "+name+" "+temp.getName()); then.setTime(temp.getEditDate()); then.add(Calendar.DAY_OF_MONTH, numOfDays); Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/DictionaryTest.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/DictionaryTest.java 2005-10-22 08:05:44 UTC (rev 1432) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/DictionaryTest.java 2005-10-22 16:16:39 UTC (rev 1433) @@ -35,7 +35,7 @@ newPage2Name = page2 + (i++); } - System.out.println("New name for page2: "+newPage2Name); + log.info("New name for page2: "+newPage2Name); //wikiEngine.rename(page2, newPage2Name); @@ -44,7 +44,7 @@ String pageContentRenamed = afterRename.getContent(); - System.out.println("page1 content: "+pageContentRenamed); + log.info("page1 content: "+pageContentRenamed); int link = -1; @@ -55,7 +55,7 @@ else { // find link in page String pageName = pageContentRenamed.substring(link + (hostURL+"/wiki/").length(), pageContentRenamed.indexOf("\"", link + (hostURL+"/wiki/").length())); - System.out.println("PAGENAME: "+pageName); + log.info("PAGENAME: "+pageName); // check if the link is the one renamed in dictionary @@ -72,13 +72,13 @@ WikiPage main = wikiEngine.getByName("Main", wikiContext); - System.out.println("Main source:\n"+sourceMain.getContent()); + log.info("Main source:\n"+sourceMain.getContent()); ReTranslateUids reTranslateUids = new ReTranslateUids(wikiEngine); String reTranslated = reTranslateUids.getNewContent(main.getContent()); - System.out.println("Retranslated main:\n"+reTranslated); + log.info("Retranslated main:\n"+reTranslated); //assertEquals(reTranslated, sourceMain.getContent()); } Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/GetSavePageTest.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/GetSavePageTest.java 2005-10-22 08:05:44 UTC (rev 1432) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/GetSavePageTest.java 2005-10-22 16:16:39 UTC (rev 1433) @@ -17,7 +17,7 @@ String pageContent = wikiPage2.getPageContent(); - System.out.println(pageContent); + log.debug(pageContent); if (wikiPage2 == null) { wikiEngine.deletePage(testPageName); @@ -33,7 +33,7 @@ Set<String> pageNames = wikiEngine.getAllPageNames(); for (String pageName : pageNames) { - System.out.println("getting page: "+pageName); + log.info("getting page: "+pageName); if (wikiEngine.getByName(pageName, wikiContext) == null) { fail("Couldn't get page: "+pageName); Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/WikiTest.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/WikiTest.java 2005-10-22 08:05:44 UTC (rev 1432) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/WikiTest.java 2005-10-22 16:16:39 UTC (rev 1433) @@ -8,6 +8,7 @@ import javax.portlet.ActionRequest; import javax.portlet.RenderRequest; +import org.jboss.logging.Logger; import org.jboss.wiki.Credentials; import org.jboss.wiki.WikiContext; import org.jboss.wiki.WikiEngine; @@ -29,7 +30,11 @@ protected String hostURL = "http://HostURL.pl"; protected String actionURL = "/Szimano"; + protected Logger log; + public WikiTest () { + log = Logger.getLogger(WikiTest.class); + wikiEngine = new WikiEngine(); testWikiSession = new TestWikiSession(); pages = new HashSet<String>(); @@ -72,7 +77,7 @@ for (String pageName : pages) { if (!wikiEngine.deletePage(pageName)) { ret = false; - System.out.println("Couldn't delete "+pageName); + log.error("Couldn't delete "+pageName); } } Modified: trunk/forge/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/management/WikiService.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/management/WikiService.java 2005-10-22 08:05:44 UTC (rev 1432) +++ trunk/forge/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/management/WikiService.java 2005-10-22 16:16:39 UTC (rev 1433) @@ -4,6 +4,7 @@ import javax.ejb.Remote; import org.jboss.annotation.ejb.Management; import org.jboss.annotation.ejb.Service; +import org.jboss.logging.Logger; import org.jboss.wiki.WikiCommon; import org.jboss.wiki.WikiEngine; import org.jboss.wiki.management.WikiServiceMenagement; @@ -13,8 +14,10 @@ @Remote(WikiServiceRemote.class) @Management(WikiServiceMenagement.class) public class WikiService implements WikiServiceLocal, WikiServiceRemote, WikiServiceMenagement { - WikiEngine wikiEngine; - + + private WikiEngine wikiEngine; + private Logger log = Logger.getLogger(WikiService.class); + public synchronized WikiEngine getWikiEngine() { if (wikiEngine == null) { wikiEngine = new WikiEngine(); @@ -23,19 +26,19 @@ } public void create() throws Exception { - System.out.println("WikiService - Creating"); + log.info("WikiService - Creating"); } public void start() throws Exception { - System.out.println("WikiService - Starting"); + log.info("WikiService - Starting"); } public void stop() { - System.out.println("WikiService - Stoping"); + log.info("WikiService - Stoping"); } public void destroy() { - System.out.println("WikiService - Destroying"); + log.info("WikiService - Destroying"); } |