[Jboss-svn-commits] JBL Code SVN: r1681 - in trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki: . plugins

[<jbo...@li...>]

Author: szimano
Date: 2005-12-01 14:26:21 -0500 (Thu, 01 Dec 2005)
New Revision: 1681

Added:
   trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/AdminSimpleCredentials.java
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/plugins/GetRefsFromPagePlugin.java
   trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java
Log:
new credentials for accessing all pages and another jspwiki insidie plugin changes
http://jira.jboss.com/jira/browse/JBWIKI-72


Added: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/AdminSimpleCredentials.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/AdminSimpleCredentials.java	2005-12-01 17:57:28 UTC (rev 1680)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/AdminSimpleCredentials.java	2005-12-01 19:26:21 UTC (rev 1681)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wiki;
+
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.RenderRequest;
+
+/**Super user Credentials to be used in plugins for accesing ALL pages etc.
+ * @author tomek
+ *
+ */
+public class AdminSimpleCredentials extends Credentials {
+
+	@Override
+	public String getName() {
+		return "admin";
+	}
+
+	@Override
+	public boolean isLoggedIn() {
+		return true;
+	}
+
+	@Override
+	public boolean isAdmin() {
+		return true;
+	}
+
+	@Override
+	public void setRenderRequest(RenderRequest rReq) {
+		
+	}
+
+	@Override
+	public void setActionRequest(ActionRequest rReq) {
+		
+	}
+
+	@Override
+	public boolean isUserInRole(String role) {
+		return true;
+	}
+
+	@Override
+	public Set<String> getAllRoles() {
+		return new TreeSet<String>();
+	}
+
+}

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 17:57:28 UTC (rev 1680)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java	2005-12-01 19:26:21 UTC (rev 1681)
@@ -375,8 +375,8 @@
 		clonedPage.setViewRoles(viewRoles);
 		clonedPage.setEditRoles(editRoles);
 		
-		// leave tempVariables as they are temp only...
-		//clonedPage.setTempVariables(tempVariables);
+		// copy tempVariables as they are temp only...
+		clonedPage.setTempVariables(new HashMap<String,Object>(tempVariables));
 		
 		clonedPage.setPermVariables(permVariables);
 		

Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/GetRefsFromPagePlugin.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/GetRefsFromPagePlugin.java	2005-12-01 17:57:28 UTC (rev 1680)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/GetRefsFromPagePlugin.java	2005-12-01 19:26:21 UTC (rev 1681)
@@ -49,11 +49,11 @@
 
 			pageUid = pageUid.substring(1, pageUid.indexOf(']'));
 
-			if (!HTMLTranslatorParts.isExternalLink(pageUid) && !HTMLTranslatorParts.isNumber(pageUid)) {
+			if (!HTMLTranslatorParts.checkImageLink(pageUid) && !HTMLTranslatorParts.isExternalLink(pageUid) && !HTMLTranslatorParts.isNumber(pageUid)) {
 				pageUid = HTMLTranslatorParts.cleanLink(pageUid);
 
-				if (pageUid != null) {
-					refs.add(pageUid);
+				if (pageUid != null && !HTMLTranslatorParts.isNumber(pageUid) ) {
+					refs.add(wikiEngine.getRealName(pageUid));
 				}
 			}
 		}
@@ -67,11 +67,11 @@
 			pageUid = pageUid.substring(pageUid.indexOf('|') + 1, pageUid
 					.indexOf(']'));
 
-			if (!HTMLTranslatorParts.isExternalLink(pageUid) && !HTMLTranslatorParts.isNumber(pageUid)) {
+			if (!HTMLTranslatorParts.checkImageLink(pageUid) && !HTMLTranslatorParts.isExternalLink(pageUid) && !HTMLTranslatorParts.isNumber(pageUid)) {
 				pageUid = HTMLTranslatorParts.cleanLink(pageUid);
 
-				if (pageUid != null) {
-					refs.add(pageUid);
+				if (pageUid != null && !HTMLTranslatorParts.isNumber(pageUid)) {
+					refs.add(wikiEngine.getRealName(pageUid));
 				}
 			}
 		}

Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java	2005-12-01 17:57:28 UTC (rev 1680)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java	2005-12-01 19:26:21 UTC (rev 1681)
@@ -82,7 +82,7 @@
 
 	private String page = "&page=";
 
-	private String mediaPatterns;
+	private static String mediaPatterns;
 
 	private String imagePath;
 
@@ -426,7 +426,7 @@
 	}
 
 	/* a collection of all media formats allowed on wiki */
-	private Collection getImagePatterns() {
+	private static Collection getImagePatterns() {
 		ArrayList patt = new ArrayList();
 		String imagepattern = mediaPatterns;
 		String[] elem = imagepattern.split(",");
@@ -437,7 +437,7 @@
 		return patt;
 	}
 
-	private boolean checkImageLink(String text) {
+	public static boolean checkImageLink(String text) {
 		ArrayList ptrns = (ArrayList) getImagePatterns();
 		for (int i = 0; i < ptrns.size(); i++) {
 			if (text.endsWith((String) ptrns.get(i))) {