Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1419 - in trunk/forge/portal-extensions/jbosswiki: forge-wiki/src/java/org/jboss/wiki forge-wiki/src/java/org/jboss/wiki/fileaccess wiki-common/src/java/org/jboss/wiki wiki-common/src/java/org/jboss/wiki/plugins wiki-common/src/test/java/org/jboss/wiki/test
|
From: <jbo...@li...> - 2005-10-20 22:01:46
|
Author: szimano Date: 2005-10-20 18:01:38 -0400 (Thu, 20 Oct 2005) New Revision: 1419 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/WikiContext.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/plugins/AdminConsolePlugin.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 Log: http://jira.jboss.com/jira/browse/JBWIKI-61 http://jira.jboss.com/jira/browse/JBWIKI-39 fixed bugs 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-20 21:08:41 UTC (rev 1418) +++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-10-20 22:01:38 UTC (rev 1419) @@ -122,7 +122,7 @@ } } - if (rReq.getParameter("page") != null) { + if (rReq.getParameter("page") != null && (rReq.getParameter("page").length() > 0)) { StringBuffer sBuf = new StringBuffer(rReq.getParameter("page")); if (Character.isLowerCase(sBuf.charAt(0))) { @@ -293,7 +293,7 @@ showPage = false; WikiContext editWikiContext = new WikiContext( - credentials.getName(), wikiEngine.getWikiType("edit"), + credentials, wikiEngine.getWikiType("edit"), wikiSession); pageToShow = wikiEngine.getByName(wikiPage, editWikiContext); @@ -381,7 +381,7 @@ // System.out.println("Getting type: " + type); } - wikiContext = new WikiContext(credentials.getName(), wikiEngine + wikiContext = new WikiContext(credentials, wikiEngine .getWikiType(type), new PortletWikiSession(rReq .getPortletSession())); 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-20 21:08:41 UTC (rev 1418) +++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-10-20 22:01:38 UTC (rev 1419) @@ -8,6 +8,7 @@ *****************************************/ package org.jboss.wiki.fileaccess; +import java.awt.image.SampleModel; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; @@ -27,6 +28,7 @@ import org.jboss.wiki.FileDataSource; import org.jboss.wiki.ServletWikiSession; +import org.jboss.wiki.SimpleCredentials; import org.jboss.wiki.WikiAttachment; import org.jboss.wiki.WikiCommon; import org.jboss.wiki.WikiContext; @@ -226,7 +228,7 @@ pageName = pageName.substring(1); WikiPage page = wikiEngine.getByName(pageName, - new WikiContext("", wikiEngine + new WikiContext(new SimpleCredentials(""), wikiEngine .getWikiType(wikiTypeName), wikiSession)); httpResponse.setContentType(wikiEngine Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiContext.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiContext.java 2005-10-20 21:08:41 UTC (rev 1418) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiContext.java 2005-10-20 22:01:38 UTC (rev 1419) @@ -28,7 +28,7 @@ * <p>Represents ...</p> * */ - private String user; + private Credentials user; /** * <p>Represents ...</p> @@ -41,7 +41,7 @@ */ private WikiSession wikiSession; - public WikiContext(String user, WikiType requestedType, WikiSession wikiSession) { + public WikiContext(Credentials user, WikiType requestedType, WikiSession wikiSession) { this.user = user; this.requestedType = requestedType; this.wikiSession = wikiSession; @@ -52,7 +52,7 @@ } - public String getUser() { + public Credentials getUser() { return user; } 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-20 21:08:41 UTC (rev 1418) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java 2005-10-20 22:01:38 UTC (rev 1419) @@ -35,6 +35,8 @@ import org.jboss.wiki.exceptions.PageRenamingException; import org.jboss.wiki.exceptions.WikiException; +import sun.security.krb5.internal.p; + import java.io.File; /** @@ -72,8 +74,6 @@ private WikiPageDictionary wikiPageDictionary; - private String adminUserName = "admin"; - WikiPage noSuchPage; private Integer sessionIdExpireTime = 120; @@ -180,7 +180,7 @@ } if ((wikiContext != null) && (ret != null) && (!ret.isViewable()) - && (!wikiContext.getUser().equals(adminUserName))) { + && (!wikiContext.getUser().isAdmin())) { s.release(); return new WikiPage(realPageName, null, "I am sorry, but you are not allowed to see this page", 0, Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java =================================================================== --- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java 2005-10-20 21:08:41 UTC (rev 1418) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java 2005-10-20 22:01:38 UTC (rev 1419) @@ -145,7 +145,7 @@ adminConsole.append("This page ").append( (editable) ? "is" : "isn't").append(" editable "); adminConsole.append("<a href=\"").append(actionURL) - .append("&page=").append("&var1=chmod").append("&var2=") + .append("&page=").append(wikiPage.getName()).append("&var1=chmod").append("&var2=") .append(!editable).append("&var3=").append(viewable) .append("\" >SWITCH IT ").append((editable) ? "NOT" : "") .append(" EDITABLE</a><br />\n"); 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-20 21:08:41 UTC (rev 1418) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/DictionaryTest.java 2005-10-20 22:01:38 UTC (rev 1419) @@ -10,7 +10,7 @@ public void testDictionary() throws WikiException{ - WikiContext wikiContext = new WikiContext(plainUser.getName(), wikiEngine.getWikiType("html"), testWikiSession); + WikiContext wikiContext = new WikiContext(plainUser, wikiEngine.getWikiType("html"), testWikiSession); String page1 = createTestPage(plainUser, "1 page number 1"); String page2 = createTestPage(plainUser, "2 page number 2"); @@ -66,7 +66,7 @@ } public void testTranslating () { - WikiContext wikiContext = new WikiContext(plainUser.getName(), wikiEngine.getWikiType("edit"), testWikiSession); + WikiContext wikiContext = new WikiContext(plainUser, wikiEngine.getWikiType("edit"), testWikiSession); WikiPage sourceMain = wikiEngine.getByName("Main", null); 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-20 21:08:41 UTC (rev 1418) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/GetSavePageTest.java 2005-10-20 22:01:38 UTC (rev 1419) @@ -9,7 +9,7 @@ public class GetSavePageTest extends WikiTest { public void testSaveGetPage() throws WikiException { - WikiContext wikiContext = new WikiContext(plainUser.getName(), wikiEngine.getWikiType("html"), testWikiSession); + WikiContext wikiContext = new WikiContext(plainUser, wikiEngine.getWikiType("html"), testWikiSession); String testPageName = createTestPage(plainUser, "This is simple conten [link] \\ Hello !"); @@ -42,7 +42,7 @@ }*/ public void testLocking() throws WikiException{ - WikiContext wikiContext = new WikiContext("test-user", wikiEngine.getWikiType("html"), testWikiSession); + WikiContext wikiContext = new WikiContext(plainUser, wikiEngine.getWikiType("html"), testWikiSession); WikiPage wikiPage = wikiEngine.getByName(createTestPage(plainUser, "some page content"), null); WikiPage wikiPage2 = wikiEngine.getByName(createTestPage(plainUser, "some page content"), null); 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-20 21:08:41 UTC (rev 1418) +++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/test/java/org/jboss/wiki/test/WikiTest.java 2005-10-20 22:01:38 UTC (rev 1419) @@ -41,7 +41,7 @@ } protected String createTestPage(Credentials user, String pageContent) throws WikiException{ - WikiContext wikiContext = new WikiContext(user.getName(), wikiEngine.getWikiType("html"), testWikiSession); + WikiContext wikiContext = new WikiContext(user, wikiEngine.getWikiType("html"), testWikiSession); if (wikiContext == null) { fail("There is no html wikitype"); |
