Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1580 - in trunk/forge/portal-extensions/jbosswiki/wiki-common/src: java/org/jboss/wiki java/org/jboss/wiki/plugins test/java/org/jboss/wiki/test
Author: szimano Date: 2005-11-16 17:21:08 -0500 (Wed, 16 Nov 2005) New Revision: 1580 Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/CheckContentTest.java Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuDataSource.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachementInfoPlugin.java Log: shotoku, jboss wiki test http://jira.jboss.com/jira/browse/JBWIKI-69 http://jira.jboss.com/jira/browse/JBWIKI-67 Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuDataSource.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuDataSource.java 2005-11-16 21:58:49 UTC (rev 1579) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuDataSource.java 2005-11-16 22:21:08 UTC (rev 1580) @@ -66,11 +66,11 @@ private static final String propModFileName = "fileMod.properties"; private static final String dictionaryPropertiesFileName = "dictionary.properties"; - + private String pagesPrefix; private String attPrefix; - + public String pathToMediaTrash; public String pathToAttTrash; @@ -113,9 +113,9 @@ + propFileName)); pagesPrefix = shotokuDSProps.getProperty("pagesPrefix"); - + attPrefix = shotokuDSProps.getProperty("attPrefix"); - + pagesManager = ContentManager.getContentManager(pagesPrefix); attManager = ContentManager.getContentManager(attPrefix); @@ -139,7 +139,18 @@ try { modFile = pagesManager.getNode(propModFileName); } catch (ResourceDoesNotExist e) { - modFile = pagesManager.getDirectory("").newNode(propFileName); + try { + modFile = pagesManager.getDirectory("").newNode(propFileName); + } catch (RepositoryException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceAlreadyExists e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceDoesNotExist e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } } InputStream is = null; try { @@ -161,8 +172,19 @@ try { pagesManager.getDirectory(MediaDataSource.mediaTrashName); } catch (ResourceDoesNotExist e) { - pagesManager.getDirectory("").newDirectory( - MediaDataSource.mediaTrashName); + try { + pagesManager.getDirectory("").newDirectory( + MediaDataSource.mediaTrashName); + } catch (RepositoryException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceAlreadyExists e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceDoesNotExist e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } } // create trash directory for deleted attachments if it doesn't exists @@ -170,8 +192,19 @@ try { attManager.getDirectory(AttachmentDataSource.attTrashName); } catch (ResourceDoesNotExist e) { - attManager.getDirectory("").newDirectory( - AttachmentDataSource.attTrashName); + try { + attManager.getDirectory("").newDirectory( + AttachmentDataSource.attTrashName); + } catch (RepositoryException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceAlreadyExists e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceDoesNotExist e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } } // load dictionary props @@ -182,8 +215,19 @@ pageDictionaryFile = pagesManager .getNode(dictionaryPropertiesFileName); } catch (ResourceDoesNotExist e) { - pageDictionaryFile = pagesManager.getDirectory("").newNode( - dictionaryPropertiesFileName); + try { + pageDictionaryFile = pagesManager.getDirectory("").newNode( + dictionaryPropertiesFileName); + } catch (RepositoryException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceAlreadyExists e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceDoesNotExist e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } } // there is dictionary file. Load props from it @@ -215,7 +259,6 @@ return true; } - public boolean savePage(String uid, WikiPage page, String languageCode) { // TODO Languages @@ -225,7 +268,7 @@ // harddisk - add new // version Node propsNode = getPropsNode(uid); - + Properties pageProps = getPageProps(uid, propsNode); pageProps.setProperty(page.getLastVersion() + ".author", page @@ -248,17 +291,37 @@ } savePageProps(uid, propsNode); - + log.info("Opening files"); // File pageFile = new File(pathToMedia + "/OLD/" + uid + "/" + // (page.getLastVersion() - 1) + ".txt"); // File pageOldFile = new File(pathToMedia + "/" + uid + ".txt"); - Node pageFile = pagesManager.getDirectory("").newNode( - "OLD/" + uid + "/" + (page.getLastVersion() - 1) + ".txt"); - Node pageOldFile = pagesManager.getNode( - uid + ".txt"); + Node pageFile = null; + try { + pageFile = pagesManager.getDirectory("").newNode( + "OLD/" + uid + "/" + (page.getLastVersion() - 1) + ".txt"); + } catch (RepositoryException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ResourceAlreadyExists e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ResourceDoesNotExist e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + Node pageOldFile = null; + try { + pageOldFile = pagesManager.getNode(uid + ".txt"); + } catch (RepositoryException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ResourceDoesNotExist e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } OutputStream pageFileWriter; InputStream pageFileReader; @@ -288,17 +351,19 @@ pageFileWriter.close(); status = true; - - pageOldFile.save("Adding version "+page.getLastVersion()+" of page "+uid); - pageFile.save("Adding version "+page.getLastVersion()+" of page "+uid); - + + pageOldFile.save("Adding version " + page.getLastVersion() + + " of page " + uid); + pageFile.save("Adding version " + page.getLastVersion() + + " of page " + uid); + } catch (IOException ioe) { log.error("[ShotokuDataSource]: Cannot save page: ", ioe); } } else { // there is no page on disk. We have to create new one. - try { + try { // create needed dirs // File newPageFile = new File(pathToMedia + "/OLD/" + uid); @@ -306,14 +371,40 @@ // pagesManager.getDirectory("").newDirectory("OLD/" + uid); - Node newPageFile = pagesManager.getDirectory("").newDirectory( - "OLD/" + uid).newNode("page.properties"); + Directory pageDir = null; + try { + pageDir = pagesManager.getDirectory("").newDirectory( + "OLD/" + uid); + } catch (RepositoryException e2) { + // TODO Auto-generated catch block + e2.printStackTrace(); + } catch (ResourceAlreadyExists e2) { + // TODO Auto-generated catch block + e2.printStackTrace(); + } catch (ResourceDoesNotExist e2) { + // TODO Auto-generated catch block + e2.printStackTrace(); + } + pageDir.save("Adding version " + page.getLastVersion() + + " of page " + uid); + + Node newPagePropsFile = null; + try { + newPagePropsFile = pageDir.newNode("page.properties"); + } catch (RepositoryException e2) { + // TODO Auto-generated catch block + e2.printStackTrace(); + } catch (ResourceAlreadyExists e2) { + // TODO Auto-generated catch block + e2.printStackTrace(); + } + // write the page // newPageFile = new File(pathToMedia + "/OLD/" + uid // + "/page.properties"); - OutputStream pageWriter = newPageFile.getOutputStream(); + OutputStream pageWriter = newPagePropsFile.getOutputStream(); Properties properties = new Properties(); properties.setProperty(page.getLastVersion() + ".author", page @@ -327,16 +418,44 @@ String[] pageNames = uid.split("/"); for (int i = 0; i < pageNames.length - 1; i++) { - pageDirName += "/" + pageNames[i]; + pageDirName += ((i != 0) ? "/" : "") + pageNames[i]; } - pagesManager.getDirectory("").newDirectory(pageDirName); - - Node pageFile = pagesManager.getRootDirectory().newNode(uid + ".txt"); - pageWriter = pageFile - .getOutputStream(); + try { + pageDir = pagesManager.getRootDirectory().getDirectory(pageDirName); + } catch (RepositoryException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ResourceDoesNotExist e) { + try { + pageDir = pagesManager.getRootDirectory().newDirectory(pageDirName); + } catch (RepositoryException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceAlreadyExists e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + } + + + pageDir.save("Adding version " + page.getLastVersion() + " of page " + + uid); + Node pageFile = null; + try { + pageFile = pagesManager.getRootDirectory().newNode(uid + ".txt"); + } catch (RepositoryException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ResourceAlreadyExists e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + pageWriter = pageFile.getOutputStream(); + String pageContent = page.getContent(); for (int i = 0; i < pageContent.length(); i++) { @@ -346,14 +465,16 @@ pageWriter.close(); status = true; - - newPageFile.save("Adding version "+page.getLastVersion()+" of page "+uid); - pageFile.save("Adding version "+page.getLastVersion()+" of page "+uid); - - } catch (Exception e) { - log.error("Cannot write new page: ", e); - status = false; - } + + newPagePropsFile.save("Adding version " + page.getLastVersion() + + " of page " + uid); + pageFile.save("Adding version " + page.getLastVersion() + + " of page " + uid); + + + } catch (IOException e) { log.error("Cannot write new page: ", e); + status = false; } + } return status; } @@ -367,26 +488,19 @@ } public void savePageProps(String pageName, Node pagePropsNode) { - try { - pagePropsNode.save("Saving page props for page: "+pageName); - } catch (ResourceDoesNotExist e) { - // There is no prop file for some reson - create one. + pagePropsNode.save("Saving page props for page: " + pageName); + } - getPageProps(pageName, pagePropsNode); - } - } - private Node getPropsNode(String pageName) { try { - return pagesManager.getNode( - "OLD/" + pageName + "/page.properties"); + return pagesManager.getNode("OLD/" + pageName + "/page.properties"); } catch (ResourceDoesNotExist e) { return null; } catch (RepositoryException e) { return null; } } - + public Properties getPageProps(String pageName, Node pageNode) { Properties pageProps = new Properties(); @@ -397,8 +511,20 @@ } catch (Exception ioe) { // There is no prop file for some reson - create one. - Node pagePropsFile = pagesManager.getDirectory("").newDirectory( - "OLD/" + pageName).newNode("page.properties"); + Node pagePropsFile = null; + try { + pagePropsFile = pagesManager.getDirectory("").newDirectory( + "OLD/" + pageName).newNode("page.properties"); + } catch (RepositoryException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceAlreadyExists e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceDoesNotExist e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } try { if (pageExists(pageName)) { @@ -409,7 +535,8 @@ pageProps.setProperty("1.author", "unknown"); pageProps.store(fpo, SAVE_COMMENT); fpo.close(); - pagePropsFile.save("genarating page props for page: "+pageName); + pagePropsFile.save("genarating page props for page: " + + pageName); } } catch (IOException e) { @@ -423,52 +550,78 @@ return pageProps; } - public Properties getAttProps(String pageName, String attName, - boolean createProps) { - Properties attProps = new Properties(); + private Node getAttPropsNode(String pageName, String attName, boolean createProps) { + Node propNode = null; - Node propFile; - try { - propFile = attManager.getNode(pageName - + "-att/" + attName + "-dir/attachment.properties"); + propNode = attManager.getNode(pageName + "-att/" + attName + + "-dir/attachment.properties"); } catch (ResourceDoesNotExist e) { if (createProps) { // create dirs for this property file - propFile = attManager.getDirectory("").newDirectory( - pageName + "-att/" + attName - + "-dir").newNode("attachment.properties"); + Directory pageDir = null; + try { + pageDir = attManager.getDirectory("").newDirectory( + pageName + "-att/" + attName + "-dir"); + } catch (RepositoryException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceAlreadyExists e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceDoesNotExist e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + pageDir.save("adding "+attName+" directory for page: "+pageName); + + try { + propNode = pageDir.newNode( + "attachment.properties"); + } catch (RepositoryException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceAlreadyExists e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } } else { return null; } } + + return propNode; + } + + public Properties getAttProps(Node propsNode, String attName) { + + // if there is no attachment node return null + if (propsNode == null) + return null; + + Properties attProps = new Properties(); try { - attProps.load(propFile.getContentInputStream()); + attProps.load(propsNode.getContentInputStream()); } catch (IOException ioe) { log.error("Cannot read attachment.properties for attachement: " - + pageName + "-att/" + attName - + "-dir/attachment.properties\n", ioe); + + propsNode.getFullName(), ioe); } return attProps; } - public void saveAttProps(Properties props, String pageName, String attName) { + public void saveAttProps(Node propsNode, Properties props) { try { - props.store(attManager - .getNode( - pageName + "-att/" + attName - + "-dir/attachment.properties") - .getOutputStream(), SAVE_COMMENT); + props.store(propsNode.getOutputStream(), SAVE_COMMENT); } catch (Exception ioe) { log.error("Cannot store attchement.properties for attachement: " - + pageName + "-att/" + attName - + "-dir/attachments.properties\n", ioe); + + propsNode.getFullName(), ioe); } + propsNode.save("Saving props for attachment "+propsNode.getFullName()); } public WikiPage getPage(String pageName) { @@ -479,7 +632,8 @@ try { Node pageFile = pagesManager.getNode(pageName + ".txt"); - Properties pageProps = getPageProps(pageName, getPropsNode(pageName)); + Properties pageProps = getPageProps(pageName, + getPropsNode(pageName)); if (pageProps != null) { @@ -593,8 +747,17 @@ int version) { StringBuilder ret = null; - Node pageFile = pagesManager.getNode("OLD/" + page.getName() + "/" - + version + ".txt"); + Node pageFile = null; + try { + pageFile = pagesManager.getNode("OLD/" + page.getName() + "/" + + version + ".txt"); + } catch (RepositoryException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ResourceDoesNotExist e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } if (loadContent) { try { @@ -625,8 +788,17 @@ public Date getDateAtVersion(String pageName, int version) { Date ret = null; - Node pageFile = pagesManager.getNode("OLD/" + pageName + "/" + version - + ".txt"); + Node pageFile = null; + try { + pageFile = pagesManager.getNode("OLD/" + pageName + "/" + version + + ".txt"); + } catch (RepositoryException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ResourceDoesNotExist e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } ret = new Date(pageFile.getLastModification()); @@ -634,8 +806,8 @@ } public Credentials getAuthorAtVersion(String pageName, int version) { - return new SimpleCredentials(getPageProps(pageName, getPropsNode(pageName)).getProperty( - version + ".author")); + return new SimpleCredentials(getPageProps(pageName, + getPropsNode(pageName)).getProperty(version + ".author")); } public boolean pageExists(String pageName) { @@ -651,7 +823,10 @@ public void addAttachment(InputStream attFile, String attName, WikiPage page, String user) { String pageName = page.getName(); - Properties attProps = getAttProps(pageName, attName, true); + + Node propsNode = getAttPropsNode(pageName, attName, true); + + Properties attProps = getAttProps(propsNode, attName); int lastVersion = 1; @@ -675,8 +850,20 @@ InputStream oldFile = null; OutputStream newFile = null; - newFile = attManager.getDirectory("").newNode(fileName) - .getOutputStream(); + Node newFileNode = null; + try { + newFileNode = attManager.getDirectory("").newNode(fileName); + } catch (RepositoryException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceAlreadyExists e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceDoesNotExist e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + newFile = newFileNode.getOutputStream(); oldFile = attFile; // writing old file to new one @@ -699,7 +886,9 @@ attProps.setProperty(lastVersion + ".author", user); - saveAttProps(attProps, pageName, attName); + saveAttProps(propsNode, attProps); + + newFileNode.save("Adding attachment: "+attName+" for page: "+page.getName()); } public Set<String> getAttachmentsSet(WikiPage page) { @@ -740,7 +929,16 @@ } private void getPageNamesFor(String directory, Set<String> attSet) { - Directory attDir = pagesManager.getDirectory(directory); + Directory attDir = null; + try { + attDir = pagesManager.getDirectory(directory); + } catch (RepositoryException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ResourceDoesNotExist e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } List<Node> pageFiles = attDir.getNodes().toList(); @@ -757,7 +955,7 @@ List<Directory> pageDirs = attDir.getDirectories(); - //TODO make "special" directories work better + // TODO make "special" directories work better for (Directory dir : pageDirs) { if ((!dir.getName().endsWith("-att"))) { // do not take dirs from OLD, .svn and trash folders @@ -768,8 +966,7 @@ && (!dir.getName().equals( AttachmentDataSource.attTrashName))) { // get names for subpages - getPageNamesFor( - directory + "/" + dir.getName(), attSet); + getPageNamesFor(directory + "/" + dir.getName(), attSet); } } } @@ -785,7 +982,7 @@ String[] tokens = attachementName.split("\\."); - Properties props = getAttProps(pageName, attachementName, false); + Properties props = getAttProps(getAttPropsNode(pageName, attachementName, false), attachementName); if (props == null) { return null; @@ -793,23 +990,33 @@ String user = props.getProperty(version + ".author"); - Node file = attManager - .getNode(pageName - + "-att/" - + attachementName - + "-dir/" - + version - + "." - + ((attachementName.indexOf(".") != -1) ? tokens[tokens.length - 1] - : "bin")); + Node file = null; + try { + file = attManager + .getNode(pageName + + "-att/" + + attachementName + + "-dir/" + + version + + "." + + ((attachementName.indexOf(".") != -1) ? tokens[tokens.length - 1] + : "bin")); + } catch (RepositoryException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ResourceDoesNotExist e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } return new WikiAttachment(attachementName, new Date(file - .getLastModification()), user, file.getLength(), file.getContentInputStream(), version); + .getLastModification()), user, file.getLength(), file + .getContentInputStream(), version); } public int getLastAttachmentVersion(String pageName, String attachementName) { - Properties props = getAttProps(pageName, attachementName, false); + Properties props = getAttProps(getAttPropsNode(pageName, attachementName, false),attachementName); if (props == null) return -1; @@ -828,15 +1035,24 @@ int version) { String[] tokens = attachementName.split("\\."); - Node file = attManager - .getNode(pageName - + "-att/" - + attachementName - + "-dir/" - + version - + "." - + ((attachementName.indexOf(".") != -1) ? tokens[tokens.length - 1] - : "bin")); + Node file = null; + try { + file = attManager + .getNode(pageName + + "-att/" + + attachementName + + "-dir/" + + version + + "." + + ((attachementName.indexOf(".") != -1) ? tokens[tokens.length - 1] + : "bin")); + } catch (RepositoryException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ResourceDoesNotExist e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } return file.getLength(); } @@ -907,7 +1123,16 @@ String pageFileTrashNameBase = pageName + ".txt"; String pageFileTrashName = pageFileTrashNameBase; - Node pageFile = pagesManager.getNode(pageFileName); + Node pageFile = null; + try { + pageFile = pagesManager.getNode(pageFileName); + } catch (RepositoryException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceDoesNotExist e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } Node pageTrashFile; try { @@ -930,9 +1155,21 @@ foundPage = true; } catch (ResourceAlreadyExists ee) { // page exists - continue looking + } catch (RepositoryException ee) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ResourceDoesNotExist ee) { + // TODO Auto-generated catch block + e.printStackTrace(); } } + } catch (RepositoryException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ResourceDoesNotExist e) { + // TODO Auto-generated catch block + e.printStackTrace(); } Directory trashFileDir; @@ -941,8 +1178,19 @@ trashFileDir = pagesManager.getDirectory(pathToMediaTrash + "/" + pageName); } catch (ResourceDoesNotExist e) { - trashFileDir = pagesManager.getDirectory("").newDirectory( - pathToMediaTrash + "/" + pageName); + try { + trashFileDir = pagesManager.getDirectory("").newDirectory( + pathToMediaTrash + "/" + pageName); + } catch (RepositoryException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceAlreadyExists e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceDoesNotExist e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } } // TODO svn mv @@ -967,7 +1215,15 @@ * trashFileDir = new File(pathToMediaTrash + "/OLD/" + pageName); * if (!trashFileDir.exists()) { trashFileDir.mkdirs(); } */ - pageFile = pagesManager.getNode(historyDirName); + try { + pageFile = pagesManager.getNode(historyDirName); + } catch (RepositoryException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceDoesNotExist e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } try { pageTrashFile = pagesManager.getDirectory("").newNode( @@ -986,8 +1242,20 @@ historyFound = true; } catch (ResourceAlreadyExists ee) { // continue looking + } catch (RepositoryException ee) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ResourceDoesNotExist ee) { + // TODO Auto-generated catch block + e.printStackTrace(); } } + } catch (RepositoryException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ResourceDoesNotExist e) { + // TODO Auto-generated catch block + e.printStackTrace(); } // TODO move page ! @@ -1029,8 +1297,19 @@ try { trashFileDir = attManager.getDirectory(pageName + "-att/"); } catch (ResourceDoesNotExist e) { - trashFileDir = attManager.getDirectory("").newDirectory( - pageName + "-att/"); + try { + trashFileDir = attManager.getDirectory("").newDirectory( + pageName + "-att/"); + } catch (RepositoryException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceAlreadyExists e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceDoesNotExist e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } } // moving file directory @@ -1087,7 +1366,18 @@ try { trashFileDir = attManager.getDirectory(pageName); } catch (ResourceDoesNotExist e) { - trashFileDir = attManager.getDirectory("").newDirectory(pageName); + try { + trashFileDir = attManager.getDirectory("").newDirectory(pageName); + } catch (RepositoryException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceAlreadyExists e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (ResourceDoesNotExist e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } } // moving file directory Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachementInfoPlugin.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachementInfoPlugin.java 2005-11-16 21:58:49 UTC (rev 1579) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachementInfoPlugin.java 2005-11-16 22:21:08 UTC (rev 1580) @@ -49,7 +49,7 @@ Integer.valueOf((String) rollbackToVer)); wikiEngine.addAttachment( wikiAttachment.getInputStream(), attachementName, wikiPage, - (String) wikiSession.getAttribute("user")); + ((Credentials) wikiSession.getAttribute("credentials")).getName()); } history.append("<h3>History of file: ").append(attachementName).append( Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/CheckContentTest.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/CheckContentTest.java 2005-11-16 21:58:49 UTC (rev 1579) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/CheckContentTest.java 2005-11-16 22:21:08 UTC (rev 1580) @@ -0,0 +1,35 @@ +package org.jboss.wiki.test; + +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.jboss.wiki.WikiContext; +import org.jboss.wiki.WikiPage; + + +public class CheckContentTest extends WikiTest { + + private static final String PATTERN = "<i>INSIDE PLUGIN ERROR:.*</i>"; + + public void testNotExisitngInsidePlugins() { + // this test doesn't fail but only generates list of pages that use improper INSIDE PLUGINS + + Set<String> pageNames = wikiEngine.getAllPageNames(); + + WikiContext context = new WikiContext(plainUser, wikiEngine.getWikiType("html"),testWikiSession); + + for (String pageName : pageNames) { + WikiPage page = wikiEngine.getByName(pageName, context); + Matcher matcher = Pattern.compile(PATTERN).matcher(page.getContent()); + + while (matcher.find()) { + String reason = page.getContent().substring(matcher.start(), matcher.end()); + + reason.substring("<i>".length(), reason.length() - "</i>".length()); + + System.out.println("Found insidePlugin bug in page: "+pageName+" reason: "+reason); + } + } + } +} |
