Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1680 - in trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java: com/ecyrd/jspwiki/plugin org/jboss/wiki org/jboss/wiki/plugins
|
From: <jbo...@li...> - 2005-12-01 17:57:37
|
Author: szimano Date: 2005-12-01 12:57:28 -0500 (Thu, 01 Dec 2005) New Revision: 1680 Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.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/plugins/RefsManipulatingInsidePlugin.java Log: bugs and inside plugins http://jira.jboss.com/jira/browse/JBWIKI-72 Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java 2005-12-01 11:20:26 UTC (rev 1679) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java 2005-12-01 17:57:28 UTC (rev 1680) @@ -1,7 +1,6 @@ package com.ecyrd.jspwiki.plugin; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.HashMap; Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java 2005-12-01 11:20:26 UTC (rev 1679) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/ReferringPagesPlugin.java 2005-12-01 17:57:28 UTC (rev 1680) @@ -4,7 +4,6 @@ import java.util.Set; -import org.jboss.wiki.Credentials; import org.jboss.wiki.WikiPage; import org.jboss.wiki.WikiSession; import org.jboss.wiki.plugins.RefsManipulatingInsidePlugin; @@ -17,8 +16,6 @@ Integer max = getNumericValue(attributes, "max"); Integer maxwidth = getNumericValue(attributes, "maxwidth"); - Credentials credentials = (Credentials)wikiSession.getAttribute("credentials"); - if (max == null) max = 10; @@ -30,7 +27,7 @@ String uid = wikiEngine.getUid(wikiPage.getName()); - Set<String> refsFor = getRefsFor(uid, max, credentials, wikiSession); + Set<String> refsFor = getRefsFor(uid, max, wikiSession); for (String ref : refsFor) { stringBuffer.append(getLink(ref, maxwidth)); Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java 2005-12-01 11:20:26 UTC (rev 1679) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java 2005-12-01 17:57:28 UTC (rev 1680) @@ -3,7 +3,6 @@ import java.util.HashMap; import java.util.Set; -import org.jboss.wiki.Credentials; import org.jboss.wiki.WikiPage; import org.jboss.wiki.WikiSession; import org.jboss.wiki.plugins.RefsManipulatingInsidePlugin; @@ -15,15 +14,13 @@ HashMap<String, String> attributes) { Integer maxwidth = getNumericValue(attributes, "maxwidth"); - Credentials credentials = (Credentials)wikiSession.getAttribute("credentials"); - if ((maxwidth != null) && (maxwidth < 4)) { maxwidth = 4; } StringBuffer stringBuffer = new StringBuffer(); - Set<String> allRefs = getAllRefs(credentials, wikiSession); + Set<String> allRefs = getAllRefs(wikiSession); for (String pageName : allRefs) { Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java 2005-12-01 11:20:26 UTC (rev 1679) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java 2005-12-01 17:57:28 UTC (rev 1680) @@ -3,7 +3,6 @@ import java.util.HashMap; import java.util.Set; -import org.jboss.wiki.Credentials; import org.jboss.wiki.WikiPage; import org.jboss.wiki.WikiSession; import org.jboss.wiki.plugins.RefsManipulatingInsidePlugin; @@ -15,8 +14,6 @@ HashMap<String, String> attributes) { Integer maxwidth = getNumericValue(attributes, "maxwidth"); - Credentials credentials = (Credentials)wikiSession.getAttribute("credentials"); - if ((maxwidth != null) && (maxwidth < 4)) { maxwidth = 4; } @@ -25,7 +22,7 @@ Set<String> pageNames = wikiEngine.getAllPageNames(); - Set<String> allRefs = getAllRefs(credentials, wikiSession); + Set<String> allRefs = getAllRefs(wikiSession); for (String pageName : pageNames) { 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-12-01 11:20:26 UTC (rev 1679) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java 2005-12-01 17:57:28 UTC (rev 1680) @@ -375,7 +375,9 @@ clonedPage.setViewRoles(viewRoles); clonedPage.setEditRoles(editRoles); - clonedPage.setTempVariables(tempVariables); + // leave tempVariables as they are temp only... + //clonedPage.setTempVariables(tempVariables); + clonedPage.setPermVariables(permVariables); clonedPage.setLength(getLength()); Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RefsManipulatingInsidePlugin.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RefsManipulatingInsidePlugin.java 2005-12-01 11:20:26 UTC (rev 1679) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RefsManipulatingInsidePlugin.java 2005-12-01 17:57:28 UTC (rev 1680) @@ -2,23 +2,20 @@ import java.util.Set; import java.util.TreeSet; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.jboss.logging.Logger; -import org.jboss.wiki.Credentials; -import org.jboss.wiki.SimpleCredentials; +import org.jboss.wiki.AdminSimpleCredentials; import org.jboss.wiki.WikiContext; import org.jboss.wiki.WikiInsidePlugin; import org.jboss.wiki.WikiPage; import org.jboss.wiki.WikiSession; +/**Abstract class for inside plugins that work on references. + * @author tomek + * + */ public abstract class RefsManipulatingInsidePlugin extends WikiInsidePlugin { - private static final String pattern1 = "\\[.+\\]"; - - private static final String pattern2 = "\\[[\\w\\d]+\\|.+\\]"; - private static final String refsWikiType = "refs"; private Logger log = Logger.getLogger(this.getClass()); @@ -32,15 +29,14 @@ } } - protected Set<String> getAllRefs(Credentials credentials, - WikiSession wikiSession) { + protected Set<String> getAllRefs(WikiSession wikiSession) { Set<String> pageNames = wikiEngine.getAllPageNames(); Set<String> allRefs = new TreeSet<String>(); - WikiContext wikiContext = new WikiContext(credentials, wikiEngine - .getWikiType("refs"), wikiSession); + WikiContext wikiContext = new WikiContext(new AdminSimpleCredentials(), wikiEngine + .getWikiType(refsWikiType), wikiSession); for (String pageName : pageNames) { @@ -56,14 +52,14 @@ } protected Set<String> getRefsFor(String uid, Integer max, - Credentials credentials, WikiSession wikiSession) { + WikiSession wikiSession) { Set<String> refsFor = new TreeSet<String>(); Set<String> pageNames = wikiEngine.getAllPageNames(); - WikiContext wikiContext = new WikiContext(credentials, wikiEngine - .getWikiType("refs"), wikiSession); + WikiContext wikiContext = new WikiContext(new AdminSimpleCredentials(), wikiEngine + .getWikiType(refsWikiType), wikiSession); for (String pageName : pageNames) { |
