Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r988 - in qa/forge/portal-extensions: forge-common/src/java/org/jboss/forge/common/content forge-portal-attr forge-wiki/src/java/org/jboss/wiki forge-wiki/src/java/org/jboss/wiki/fileaccess forge-wiki/src/java/org/jboss/wiki/plugins
|
From: <jbo...@li...> - 2005-08-27 01:50:55
|
Author: dam...@jb... Date: 2005-08-26 21:50:49 -0400 (Fri, 26 Aug 2005) New Revision: 988 Modified: qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java qa/forge/portal-extensions/forge-portal-attr/maven.xml qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java Log: MERGED: -r 984:987 https://svn.labs.jboss.com/trunk/forge/portal-extensions into qa portal-extensions. Modified: qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java =================================================================== --- qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java 2005-08-26 22:19:47 UTC (rev 987) +++ qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java 2005-08-27 01:50:49 UTC (rev 988) @@ -91,7 +91,8 @@ SVNRevision.HEAD, SVNRevision.HEAD, true); } } catch (SVNException e) { - try { cleanup(); } catch (SVNException e1) { e1.printStackTrace(); } + e.printStackTrace(); + try { cleanup(); } catch (SVNException e1) { } } } @@ -108,7 +109,7 @@ ourClientManager.getCommitClient().doCommit(files, false, "Forge service commit.", true, true); } catch (SVNException e) { - try { cleanup(); } catch (SVNException e1) { e1.printStackTrace(); } + try { cleanup(); } catch (SVNException e1) { } e.printStackTrace(); throw new IOException(e.getMessage()); @@ -154,7 +155,8 @@ try { ourClientManager.getWCClient().doAdd(file, true, false, false, false); } catch (SVNException e) { - try { cleanup(); } catch (SVNException e1) { e1.printStackTrace(); } + e.printStackTrace(); + try { cleanup(); } catch (SVNException e1) { } throw new IOException("SVN error while adding the new file"); } } Modified: qa/forge/portal-extensions/forge-portal-attr/maven.xml =================================================================== --- qa/forge/portal-extensions/forge-portal-attr/maven.xml 2005-08-26 22:19:47 UTC (rev 987) +++ qa/forge/portal-extensions/forge-portal-attr/maven.xml 2005-08-27 01:50:49 UTC (rev 988) @@ -15,7 +15,7 @@ </goal> <goal name="deploy"> - <ant:copy todir="${local.deploy.dir}"> + <ant:copy todir="${local.deploy.dir}" overwrite="true"> <ant:fileset dir="to-copy" /> </ant:copy> <ant:copy Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 2005-08-26 22:19:47 UTC (rev 987) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 2005-08-27 01:50:49 UTC (rev 988) @@ -300,8 +300,8 @@ } public WikiType getWikiType(String wikiTypeName) { - System.out - .println("[WIKITYPE REQUEST]: " + wikiTypes.get(wikiTypeName)); + //System.out + // .println("[WIKITYPE REQUEST]: " + wikiTypes.get(wikiTypeName)); return wikiTypes.get(wikiTypeName); } @@ -340,7 +340,7 @@ } public Set<String> findPages(String searchQuery) { - System.out.println("Starting search: " + searchQuery); + //System.out.println("Starting search: " + searchQuery); WikiSearch wikiSearch = new WikiSearch(searchQuery); Set<String> resPages = new TreeSet<String>(); @@ -356,7 +356,7 @@ } } - System.out.println("Search completed"); + //System.out.println("Search completed"); return resPages; } Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-26 22:19:47 UTC (rev 987) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-27 01:50:49 UTC (rev 988) @@ -304,7 +304,7 @@ if (rReq.getParameter("type") != null) { type = rReq.getParameter("type"); - System.out.println("Getting type: " + type); + //System.out.println("Getting type: " + type); } wikiContext = new WikiContext(rReq.getUser(), wikiEngine Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-26 22:19:47 UTC (rev 987) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-27 01:50:49 UTC (rev 988) @@ -88,7 +88,7 @@ // execute the plugins for (int i = 0; i < plugins.size(); i++) { - System.out.println("Executing plugin: "+plugins.get(i).getName()); + //System.out.println("Executing plugin: "+plugins.get(i).getName()); newPage = (plugins.get(i)).process(newPage, wikiSession); } Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-08-26 22:19:47 UTC (rev 987) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-08-27 01:50:49 UTC (rev 988) @@ -98,7 +98,7 @@ // Parse URI to get filename and page name String[] tokens = requestURI.split("[/]"); - System.out.println("length " + tokens.length); + //System.out.println("length " + tokens.length); if (tokens.length == 3) { String hostURL = ((request.isSecure()) ? "https" : "http") + "://"+request.getServerName()+((request.getServerPort() == 80) ? "" : ":"+ request.getServerPort()); @@ -110,8 +110,8 @@ String fileName = tokens[tokens.length - 1]; String pageName = tokens[tokens.length - 2]; - System.out.println("[WikiFileAccess]Getting file: " + fileName - + " of page: " + pageName); + //System.out.println("[WikiFileAccess]Getting file: " + fileName + // + " of page: " + pageName); Properties props = new Properties(); Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java 2005-08-26 22:19:47 UTC (rev 987) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java 2005-08-27 01:50:49 UTC (rev 988) @@ -41,7 +41,7 @@ pattern = "<a href=\""+(((String)wikiSession.getAttribute("hostURL")+(String)wikiSession.getAttribute("actionURL")).replaceAll("\\.","\\\\.").replaceAll("\\?", "\\\\?"))+"&page=\\w+\">"; - System.out.println(pattern); + //System.out.println(pattern); WikiPage newPage = null; |
