Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r952 - in qa/forge/portal-extensions: forge-common/src/etc/org/jboss/forge/common forge-portal-attr forge-wiki/src/etc/org/jboss/wiki forge-wiki/src/java/org/jboss/wiki forge-wiki/src/java/org/jboss/wiki/plugins forge-wiki/src/web/WEB-INF/jsp
|
From: <jbo...@li...> - 2005-08-24 21:04:37
|
Author: dam...@jb... Date: 2005-08-24 17:04:29 -0400 (Wed, 24 Aug 2005) New Revision: 952 Added: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java Modified: qa/forge/portal-extensions/forge-common/src/etc/org/jboss/forge/common/forge.properties.sample qa/forge/portal-extensions/forge-portal-attr/maven.xml qa/forge/portal-extensions/forge-portal-attr/project.xml qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.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/plugins/AttachmentListPlugin.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/DiffPlugin.java qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/TrailPlugin.java qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp Log: MERGED: -r 943:950 https://svn.labs.jboss.com/trunk/forge/portal-extensions into qa portal-extensions. Modified: qa/forge/portal-extensions/forge-common/src/etc/org/jboss/forge/common/forge.properties.sample =================================================================== --- qa/forge/portal-extensions/forge-common/src/etc/org/jboss/forge/common/forge.properties.sample 2005-08-24 20:48:25 UTC (rev 951) +++ qa/forge/portal-extensions/forge-common/src/etc/org/jboss/forge/common/forge.properties.sample 2005-08-24 21:04:29 UTC (rev 952) @@ -1,13 +1,23 @@ # Path to a svn repository from which content will be checked out. +# example: +# svnpath=https://cms.labs.jboss.com/trunk/forge/portal-content svnpath= # Authorization for the svn repo. svnusername= svnpassword= # Local path to where the content will be checked out. +# example: +# localpath=/usr/local/forge/portal/content localpath= # Local path where blojsom stores the entries. +# example: +# blogpath=/usr/local/forge/portal/blog blogpath= # Address of an smtp server used for sending e-mails. +# example: +# smtpserver=localhost smtpserver= # E-mail address of "contributor's applications" administrator +# example: +# smtpserver=for...@jb... contribadmin= Modified: qa/forge/portal-extensions/forge-portal-attr/maven.xml =================================================================== --- qa/forge/portal-extensions/forge-portal-attr/maven.xml 2005-08-24 20:48:25 UTC (rev 951) +++ qa/forge/portal-extensions/forge-portal-attr/maven.xml 2005-08-24 21:04:29 UTC (rev 952) @@ -4,6 +4,9 @@ See terms of license at gnu.org. --> <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util"> + <goal name="prj-install"> + </goal> + <goal name="all"> </goal> Modified: qa/forge/portal-extensions/forge-portal-attr/project.xml =================================================================== --- qa/forge/portal-extensions/forge-portal-attr/project.xml 2005-08-24 20:48:25 UTC (rev 951) +++ qa/forge/portal-extensions/forge-portal-attr/project.xml 2005-08-24 21:04:29 UTC (rev 952) @@ -34,4 +34,4 @@ <build> <sourceDirectory>src/java</sourceDirectory> </build> -</project> \ No newline at end of file +</project> Modified: qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml 2005-08-24 20:48:25 UTC (rev 951) +++ qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml 2005-08-24 21:04:29 UTC (rev 952) @@ -20,6 +20,10 @@ <name>attachmentList</name> <class>org.jboss.wiki.plugins.AttachmentListPlugin</class> </plugin> + <plugin> + <name>friendlyLinks</name> + <class>org.jboss.wiki.plugins.FriendlyLinkPlugin</class> + </plugin> </wikiType> <wikiType> <name>DIFF</name> Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java 2005-08-24 20:48:25 UTC (rev 951) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java 2005-08-24 21:04:29 UTC (rev 952) @@ -50,11 +50,6 @@ * * @return */ - public abstract void next(); -/** - * <p></p> - * - */ public abstract void init(); 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-24 20:48:25 UTC (rev 951) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-24 21:04:29 UTC (rev 952) @@ -9,9 +9,11 @@ package org.jboss.wiki; import java.io.File; +import java.io.IOException; import java.util.Date; import java.util.Iterator; import java.util.List; +import java.util.Properties; import javax.portlet.*; import org.jboss.portlet.*; @@ -183,6 +185,7 @@ public void doView(JBossRenderRequest rReq, JBossRenderResponse rRes) throws PortletException, java.io.IOException { + WikiPage noSuchPage = new WikiPage("", new Credentials(""), "There is no such page. Click on EDIT to start it.", 0, 0, null, wikiEngine.getMediaDataSource()); @@ -334,6 +337,13 @@ rReq.setAttribute("defaultPage", defaultPage); + // FIXME make this more elegant (ie. plugin) + // pass friendly link + Properties props = new Properties(); + props.load(WikiPlugin.class.getResourceAsStream("wikiPlugins.properties")); + rReq.setAttribute("firendlyLink", props.getProperty("htmlTranslatorURL")+"wiki/"+pageToShow.getName()); + + rRes.setTitle("Wiki"); if (javax.portlet.WindowState.NORMAL.equals(rReq.getWindowState()) || javax.portlet.WindowState.MAXIMIZED.equals(rReq Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java 2005-08-24 20:48:25 UTC (rev 951) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java 2005-08-24 21:04:29 UTC (rev 952) @@ -47,12 +47,7 @@ return newPage; } - @Override - public void next() { - // TODO Auto-generated method stub - } - @Override public void init() { host = getProperty("htmlTranslatorURL")+"wiki/"; Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/DiffPlugin.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/DiffPlugin.java 2005-08-24 20:48:25 UTC (rev 951) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/DiffPlugin.java 2005-08-24 21:04:29 UTC (rev 952) @@ -36,11 +36,6 @@ } @Override - public void next() { - - } - - @Override public void init() { differenceEngine = new DifferenceEngine("ISO-8859-1"); Copied: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java (from rev 950, trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java) Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/TrailPlugin.java =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/TrailPlugin.java 2005-08-24 20:48:25 UTC (rev 951) +++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/TrailPlugin.java 2005-08-24 21:04:29 UTC (rev 952) @@ -37,12 +37,6 @@ } @Override - public void next() { - // TODO Auto-generated method stub - - } - - @Override public void init() { // TODO Auto-generated method stub Modified: qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp =================================================================== --- qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-24 20:48:25 UTC (rev 951) +++ qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2005-08-24 21:04:29 UTC (rev 952) @@ -12,6 +12,7 @@ String wikiContent = (String)request.getAttribute("wikiContent"); String wikiPage = (String)request.getAttribute("wikiPage"); String defaultPage = (String)request.getAttribute("defaultPage"); + String firendlyLink = (String)request.getAttribute("firendlyLink"); java.util.Date editDate = (java.util.Date)request.getAttribute("editDate"); org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author"); %> @@ -19,8 +20,15 @@ <h2><a href="<%=actionURL%>&page=<%=defaultPage%>"><%=wikiName%></a>/ <%=wikiPage%> </h2> <!--<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=defaultPage%></a><br />--> -<div style="text-align: right;"> +<form method="post" action="<%=actionURL%>"> +<table style="width: 100%" border="0"> +<tr style="vertical-align: bottom;"> +<td style="vertical-align: bottom; align-bottom: 0px;"> +<div><a href="<%=firendlyLink%>"><img style="vertical-align: middle" alt="PERM LINK" src="/file-access/default/members/jbosswiki/images/permaLinkButton.png" /></a> <a href="<%=firendlyLink%>"><%=firendlyLink%></a></div> +</td> +<td style="text-align: right;vertical-align: bottom; align-bottom: 0px;"> + <% String logedIn = (String)request.getAttribute("logedIn"); @@ -32,17 +40,18 @@ } else { - out.print("<i><div style='font-size: xx-small'>Login to edit pages and attach files</div></i>"); + out.print("<div style='font-size: xx-small'><i>Login to edit pages and attach files</i></div>"); } %> - <a href="<%=actionURL%>&action=Info&page=<%=wikiPage%>"><img alt="HISTORY" src="/file-access/default/members/jbosswiki/images/historyButton.png"</img></a> -<form method="post" action="<%=actionURL%>"> + <a href="<%=actionURL%>&action=Info&page=<%=wikiPage%>"><img alt="HISTORY" src="/file-access/default/members/jbosswiki/images/historyButton.png"</img></a><br /> <input type="text" name="page" /> <input type="submit" value="GO" /> +</td> +</tr> +</table> </form> -</div> <hr /> |
