[jboss-svn-commits] JBL Code SVN: r16761 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki: forge-wiki/src/java/org/jboss/wiki/attributesextractor and 18 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Nov 23 11:27:41 EST 2007
Author: szimano
Date: 2007-11-23 11:27:41 -0500 (Fri, 23 Nov 2007)
New Revision: 16761
Added:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/META-INF/
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/META-INF/MANIFEST.MF
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/lib/
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/lib/urlrewrite-3.0.4.jar
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/urlrewrite.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/logon.jsp
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/logonError.jsp
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/build.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/ivy.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/ServletCredentials.java
Removed:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages_en.properties
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/.project
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/ServletAttributesExtractor.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages.properties
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/JBossWiki.properties
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/ImagePlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiSession.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/configuration/ConfigurationParser.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/AdminSimpleCredentials.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/ATOMPlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachementInfoPlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/EditTinyMCE.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/LinkPagePlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RDFPlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RSSPlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/WatchListPlugin.java
Log:
wiki plugins rebilt a bit, wiki standaolne, build prototype
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/.project
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/.project 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/.project 2007-11-23 16:27:41 UTC (rev 16761)
@@ -1,19 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<projectDescription>
- <name>wiki</name>
- <comment>
+ <name>wiki-backend</name>
+ <comment>
</comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.common.verification.verifybuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.jboss.tools.jsf.jsfnature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ </natures>
+ <linkedResources>
+ <link>
+ <name>WEB-ROOT</name>
+ <type>2</type>
+ <location>/Users/tomek/java/sandbox/portal-extensions/jbosswiki/forge-wiki/src/web</location>
+ </link>
+ </linkedResources>
+</projectDescription>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/project.xml 2007-11-23 16:27:41 UTC (rev 16761)
@@ -192,6 +192,9 @@
<dependency>
<id>portlet-api</id>
<version>1.0</version>
+ <!--<properties>
+ <war.bundle>true</war.bundle>
+ </properties>-->
</dependency>
<dependency>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -33,6 +33,8 @@
*/
public interface AttributesExtractor {
+ public static final String PLUGIN_VAR_REGEX = "var[123456789]\\d*";
+
public String getHostURL();
public String getAppContext();
@@ -62,4 +64,6 @@
public void setUserDefaultPage(String page, Object request) throws WikiUserPreferenceException;
public void setUserDefaultLang(String lang, Object request) throws WikiUserPreferenceException;
+
+ public void setPluginVars(Object request);
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -194,7 +194,7 @@
log.error(e);
}
- return jsfUrl;
+ return jsfUrl + "&";
} else {
throw new IllegalArgumentException(
@@ -283,4 +283,24 @@
}
}
+ public void setPluginVars(Object request) {
+ if (request instanceof PortletRequest) {
+ PortletRequest rReq = (PortletRequest) request;
+
+ for (Object k : rReq.getParameterMap().keySet()) {
+ String key = (String) k;
+
+ if (key.matches(PLUGIN_VAR_REGEX)) {
+ wikiSession.setAttribute(key, rReq.getParameter(key));
+
+ log.debug("Wiki Param: " + key + " = "
+ + rReq.getParameter(key));
+ }
+ }
+ } else {
+ throw new IllegalArgumentException("Unknow type request: "
+ + request);
+ }
+ }
+
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/ServletAttributesExtractor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/ServletAttributesExtractor.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/ServletAttributesExtractor.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -4,12 +4,14 @@
import org.apache.log4j.Logger;
import org.jboss.wiki.ServletWikiSession;
+import org.jboss.wiki.WikiEngine;
import org.jboss.wiki.WikiSession;
import org.jboss.wiki.attributesextractor.AttributesExtractor;
import org.jboss.wiki.configuration.ConfigurationParser;
import org.jboss.wiki.credentials.Credentials;
import org.jboss.wiki.credentials.SimpleCredentials;
import org.jboss.wiki.exception.WikiUserPreferenceException;
+import org.jboss.wiki.helper.WikiHelper;
public class ServletAttributesExtractor implements AttributesExtractor {
@@ -42,7 +44,7 @@
private String userDefaultPage;
- public ServletAttributesExtractor(Object request) {
+ public ServletAttributesExtractor(Object request, WikiEngine wikiEngine) {
if (request instanceof HttpServletRequest) {
HttpServletRequest rReq = (HttpServletRequest) request;
@@ -52,7 +54,7 @@
+ rReq.getServerName()
+ ((rReq.getServerPort() == 80) ? "" : ":"
+ rReq.getServerPort());
-
+
appContext = ConfigurationParser.getWikiContext();
if (appContext == null) {
@@ -61,9 +63,7 @@
wikiSession = new ServletWikiSession(rReq.getSession());
- credentials = //WikiHelper.getWikiEngine().getCredentialsInstance(
- //request);
- new SimpleCredentials();
+ credentials = wikiEngine.getCredentialsInstance(request);
secure = rReq.isSecure();
@@ -78,8 +78,8 @@
type = rReq.getParameter("type");
- //TODO parametry
-
+ // TODO parametry
+
userDefaultLang = ConfigurationParser.getDefaultLangugeCode();
userDefaultPage = ConfigurationParser.getDefaultPage();
@@ -91,7 +91,7 @@
public String getAppContext() {
return appContext;
- }
+ }
public Credentials getCredentials() {
return credentials;
@@ -103,8 +103,17 @@
public String getOutputLink(Object request, Object response,
boolean isAction) {
- // TODO Auto-generated method stub
- return null;
+ if (request instanceof HttpServletRequest) {
+ HttpServletRequest htReq = (HttpServletRequest) request;
+
+ return new StringBuilder(appContext)
+ .append("/views/wiki_view.jsf?").toString();
+ } else {
+ throw new IllegalArgumentException(
+ "Request should be an instance of class "
+ + HttpServletRequest.class + " but is "
+ + request.getClass());
+ }
}
public Integer getPageVersion() {
@@ -162,4 +171,24 @@
}
+ public void setPluginVars(Object request) {
+ if (request instanceof HttpServletRequest) {
+ HttpServletRequest rReq = (HttpServletRequest) request;
+
+ for (Object k : rReq.getParameterMap().keySet()) {
+ String key = (String) k;
+
+ if (key.matches(PLUGIN_VAR_REGEX)) {
+ wikiSession.setAttribute(key, rReq.getParameter(key));
+
+ log.debug("Wiki Param: " + key + " = "
+ + rReq.getParameter(key));
+ }
+ }
+ } else {
+ throw new IllegalArgumentException("Unknow type request: "
+ + request);
+ }
+ }
+
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -147,7 +147,7 @@
+ ((request.getServerPort() == 80) ? "" : ":"
+ request.getServerPort());
- wikiSession.setAttribute("hostURL", hostURL);
+ wikiSession.setAttribute(WikiSession.HOST_URL, hostURL);
String requestURI = URLDecoder.decode(httpRequest.getRequestURI(),
"UTF-8");
@@ -277,6 +277,61 @@
imageIS.close();
}
+ } else if(tokens[0].equals(WikiCommon.WIKI_FILES)) {
+ // Show file of a page
+
+ // get pageName
+ String pageName = "";
+ for (int i = 1; i < tokens.length - 1; i++) {
+ pageName += ((i > 0) ? "/" : "") + tokens[i];
+ }
+
+ String fileName = tokens[tokens.length - 1];
+
+ WikiAttachment wikiAttachment;
+
+ if (version == -1) {
+
+ log.info("Page: " + pageName + " File: " + fileName
+ + " LangCode: " + langCode);
+
+ wikiAttachment = wikiEngine.getAttachment(pageName,
+ fileName, langCode);
+ } else {
+ wikiAttachment = wikiEngine.getAttachment(pageName,
+ fileName, version, langCode);
+ }
+
+ if (wikiAttachment != null) {
+ InputStream fileIS = wikiAttachment.getInputStream();
+
+ ServletOutputStream os = response.getOutputStream();
+
+ response.setContentType(mimeTypes.getContentType(fileName));
+ // response.setContentLength((int) fileIS.);
+
+ // Transferring the bytes
+ try {
+ byte[] buffer = new byte[BUF_SIZE];
+ int read;
+ while ((read = fileIS.read(buffer)) != -1)
+ os.write(buffer, 0, read);
+ } catch (Exception e2) {
+ // Nothing that we can really do. Just send an
+ // incomplete
+ // file.
+ } finally {
+ os.close();
+ fileIS.close();
+ }
+ } else {
+ ServletOutputStream os = response.getOutputStream();
+
+ response.setContentType("text/html");
+
+ os
+ .println("<html><body><h3>ERROR</h3><br />\nThere is no such file or there is no such version of file</body></html>");
+ }
} else if ((Character.isLowerCase(tokens[0].charAt(0)))
&& (tokens.length > 1)) {
boolean isPageNameUC = true;
@@ -345,7 +400,7 @@
.println(
"<html><body><h3>ERROR</h3><br />\nPage name must start with upper case letter.</body></html>");
}
- } else if (tokens[tokens.length - 1].matches("file:.*")) {
+ } /*else if (tokens[tokens.length - 1].matches("file:.*")) {
// Show file of a page
// get pageName
@@ -401,7 +456,7 @@
os
.println("<html><body><h3>ERROR</h3><br />\nThere is no such file or there is no such version of file</body></html>");
}
- } else {
+ }*/ else {
ServletOutputStream os = response.getOutputStream();
response.setContentType("text/html");
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/helper/WikiHelper.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -59,7 +59,7 @@
*/
public class WikiHelper {
-
+
private static final Logger log = Logger.getLogger(WikiHelper.class);
private static final String WIKI_COMMON_SESSION = "#{wikiCommon}";
@@ -76,28 +76,42 @@
if (request instanceof PortletRequest) {
extractor = new PortletAttributesExctractor(request, wikiEngine);
- }
- else if (request instanceof HttpServletRequest) {
- extractor = new ServletAttributesExtractor(request);
+ } else if (request instanceof HttpServletRequest) {
+ extractor = new ServletAttributesExtractor(request, wikiEngine);
} else {
throw new IllegalArgumentException("Unknow type request: "
+ request);
}
+ // set credentials
extractor.getWikiSession().setAttribute(WikiSession.CREDENTIALS,
extractor.getCredentials());
+
+ // set host of server
extractor.getWikiSession().setAttribute(WikiSession.HOST_URL,
extractor.getHostURL());
- // TODO wikiURL
- if (request instanceof RenderRequest
- && response instanceof RenderResponse)
+ // TODO wikiURL -is this allright ?
+ try {
extractor.getWikiSession().setAttribute(WikiSession.ACTION_URL,
extractor.getOutputLink(request, response, true));
+ } catch (IllegalArgumentException e) {
+ // do nothing. wrong request type - it should get set in different
+ // phase
+ }
+ // set securitness
extractor.getWikiSession().setAttribute(WikiSession.IS_SECURE,
extractor.isSecure());
+ // set appcontext
+ extractor.getWikiSession().setAttribute(WikiSession.APP_CONTEXT,
+ extractor.getAppContext());
+
+ // set plugin vars
+ extractor.setPluginVars(request);
+
+
return extractor;
}
@@ -172,5 +186,5 @@
} else
return "";
}
-
+
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -113,4 +113,8 @@
public Map<String, Integer> getSearchResults() {
return searchResults;
}
+
+ public boolean isShowLogin() {
+ return ConfigurationParser.isShowLogin();
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -284,4 +284,11 @@
log.info("foo !!! AJAX");
return null;
}
+
+ public String getLoginURL() {
+ return attrExtractor.getHostURL()
+ + attrExtractor.getAppContext()
+ + "/auth/"
+ + getPageName();
+ }
}
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/META-INF/MANIFEST.MF (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/META-INF/MANIFEST.MF 2007-11-23 16:27:41 UTC (rev 16761)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Deleted: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties 2007-11-23 16:27:41 UTC (rev 16761)
@@ -1,60 +0,0 @@
-edit_instruction=Here's a short reminder on what elements you have at your disposal\:\n\n\n---- Horizontal ruler\n\\\\ Forced line break\n\\\\\\\\ Page break (printing)\n[link] Create hyperlink to "link", where "link" can be either an internal \n WikiName or an external link (http\://)\n[text|link] Create a hyperlink where the link text is different from the actual \n hyperlink link.\n[text|wiki\:link] Create a hyperlink where the link text is different from the \n actual hyperlink link, and the hyperlink points to a named Wiki. \n This supports interWiki linking.\n\n* Make a bulleted list (must be in first column). Use more (**) \n for deeper indentations.\n\# Make a numbered list (must be in first column). Use more (\#\#, \#\#\#) \n for deeper indentations.\n\n\!, \!\!, \!\!\! Start a line !
with an exclamation mark (\!) to make a heading. \n More exclamation marks mean bigger headings.\n\n__text__ Makes text bold.\n''text'' Makes text in italics (notice that these are single quotes ('))\n{{text}} Makes text in monospaced font.\n;term\:def Defines 'term' with 'def'. Use this with empty 'term' to make short comments.\n\n|text|more text| Makes a table. Double bars for a table heading.\n\nDon't try to use HTML, since it just won't work.\n\nTo embed images just put them available on the web using one of the approved formats, and they will get inlined automatically.\nTo make a code block, use triple {'s to open, and triple }'s to close.
-edit_cancel=Cancel
-edit_save=Save
-edit_spellcheck=Check Spelling
-permaLinkButton=permaLinkButton.png
-
-editButton=editButton.png
-recentButton=recentChanges.gif
-historyButton=historyButton.png
-attachButton=attachButton.png
-
-rssButton=RSSButton.gif
-rdfButton=RDFButton.gif
-atomButton=ATOMButton.gif
-
-pageLastChanged=The page last changed on
-by=by
-
-historytitle=History of page \:
-version=Version
-date=Date
-author=Author
-size=Size
-changesFromPrev=Changes from previous
-goback=Go back
-thisIsVer=This is version
-ofPage=of page
-toRollback=For rolling back this page just press EDIT.
-changesBetween=Changes between versions
-andChng=and
-
-addFile=Add file
-upload_error=File couldn't have been uploaded
-search=Search
-
-new_att=/Add new attachment/
-selectAtt=Select attachment
-selectFile=Select a file to attach:
-attachFile=Attach a file
-close=Close
-
-print=Print
-
-save=Save
-prefsSaved=Preferences saved
-
-page_edited_by=I'm sorry, but this page is currently edited by\:
-lock_started=Lock started\:
-edit_session_invalidated=It will be invalidated on\:
-stop_you_edit=I won't stop you from editing this page but consider that your changes might be lost
-
-wikiHome=Wiki Home
-permalink=Permalink
-recentChanges=Recent Changes
-attach=Attach
-edit=Edit
-history=History
-rss=RSS Feed
-rdf=RDF Feed
-atom=Atom Feed
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages.properties 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages.properties 2007-11-23 16:27:41 UTC (rev 16761)
@@ -58,3 +58,6 @@
rss=RSS Feed
rdf=RDF Feed
atom=Atom Feed
+
+userLoggedIn=User logged in:
+login=Login
Deleted: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages_en.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages_en.properties 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/Messages_en.properties 2007-11-23 16:27:41 UTC (rev 16761)
@@ -1,60 +0,0 @@
-edit_instruction=Here's a short reminder on what elements you have at your disposal\:\n\n\n---- Horizontal ruler\n\\\\ Forced line break\n\\\\\\\\ Page break (printing)\n[link] Create hyperlink to "link", where "link" can be either an internal \n WikiName or an external link (http\://)\n[text|link] Create a hyperlink where the link text is different from the actual \n hyperlink link.\n[text|wiki\:link] Create a hyperlink where the link text is different from the \n actual hyperlink link, and the hyperlink points to a named Wiki. \n This supports interWiki linking.\n\n* Make a bulleted list (must be in first column). Use more (**) \n for deeper indentations.\n\# Make a numbered list (must be in first column). Use more (\#\#, \#\#\#) \n for deeper indentations.\n\n\!, \!\!, \!\!\! Start a line !
with an exclamation mark (\!) to make a heading. \n More exclamation marks mean bigger headings.\n\n__text__ Makes text bold.\n''text'' Makes text in italics (notice that these are single quotes ('))\n{{text}} Makes text in monospaced font.\n;term\:def Defines 'term' with 'def'. Use this with empty 'term' to make short comments.\n\n|text|more text| Makes a table. Double bars for a table heading.\n\nDon't try to use HTML, since it just won't work.\n\nTo embed images just put them available on the web using one of the approved formats, and they will get inlined automatically.\nTo make a code block, use triple {'s to open, and triple }'s to close.
-edit_cancel=Cancel
-edit_save=Save
-edit_spellcheck=Check Spelling
-permaLinkButton=permaLinkButton.png
-
-editButton=editButton.png
-recentButton=recentChanges.gif
-historyButton=historyButton.png
-attachButton=attachButton.png
-
-rssButton=RSSButton.gif
-rdfButton=RDFButton.gif
-atomButton=ATOMButton.gif
-
-pageLastChanged=The page last changed on
-by=by
-
-historytitle=History of page \:
-version=Version
-date=Date
-author=Author
-size=Size
-changesFromPrev=Changes from previous
-goback=Go back
-thisIsVer=This is version
-ofPage=of page
-toRollback=For rolling back this page just press EDIT.
-changesBetween=Changes between versions
-andChng=and
-
-addFile=Add file
-upload_error=File couldn't have been uploaded
-search=Search
-
-new_att=/Add new attachment/
-selectAtt=Select attachment
-selectFile=Select a file to attach:
-attachFile=Attach a file
-close=Close
-
-print=Print
-
-save=Save
-prefsSaved=Preferences saved
-
-page_edited_by=I'm sorry, but this page is currently edited by\:
-lock_started=Lock started\:
-edit_session_invalidated=It will be invalidated on\:
-stop_you_edit=I won't stop you from editing this page but consider that your changes might be lost
-
-wikiHome=Wiki Home
-permalink=Permalink
-recentChanges=Recent Changes
-attach=Attach
-edit=Edit
-history=History
-rss=RSS Feed
-rdf=RDF Feed
-atom=Atom Feed
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml 2007-11-23 16:27:41 UTC (rev 16761)
@@ -8,7 +8,8 @@
<application>
<!-- JBoss Portal-facelets integration -->
<property-resolver>org.jboss.portal.faces.el.DelegatingPropertyResolver</property-resolver>
-
+
+ <!-- view-handler>com.sun.facelets.FaceletViewHandler</view-handler-->
<view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler>
<locale-config>
<default-locale>en</default-locale>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp 2007-11-23 16:27:41 UTC (rev 16761)
@@ -6,6 +6,7 @@
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" contentType="text/html; charset=UTF-8"%>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
<%@ page isELIgnored ="false" %>
+<%@page import="org.jboss.wiki.credentials.Credentials"%>
<portlet:defineObjects />
<%
@@ -20,7 +21,7 @@
String atomLink = (String)request.getAttribute("atomLink");
String type = (String)request.getParameter("type");
java.util.Date editDate = (java.util.Date)request.getAttribute("editDate");
- org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author");
+ Credentials author = (Credentials)request.getAttribute("author");
String wikiImagesUrl = (String)request.getAttribute("wikiImagesUrl");
String curLang = (String)request.getAttribute("currentLanguage");
boolean isAdmin = ((Boolean)request.getAttribute("isAdmin")).booleanValue();
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/lib/urlrewrite-3.0.4.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/lib/urlrewrite-3.0.4.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/urlrewrite.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/urlrewrite.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/urlrewrite.xml 2007-11-23 16:27:41 UTC (rev 16761)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE urlrewrite PUBLIC "-//tuckey.org//DTD UrlRewrite 3.0//EN"
+ "http://tuckey.org/res/dtds/urlrewrite3.0.dtd">
+
+<!--
+
+ Configuration file for UrlRewriteFilter
+ http://tuckey.org/urlrewrite/
+
+-->
+<urlrewrite>
+ <rule>
+ <from>/(.*/file:.*)</from>
+ <to last="true">null</to>
+ </rule>
+
+ <rule>
+ <from>/auth/(.*)</from>
+ <to last="true" type="redirect">%{context-path}/$1</to>
+ </rule>
+
+ <rule>
+ <from casesensitive="true" >/([A-Z].*)</from>
+ <to>/views/wiki_view.jsf?page=$1</to>
+ </rule>
+
+
+ <!--
+
+ INSTALLATION
+
+ in your web.xml add...
+
+ <filter>
+ <filter-name>UrlRewriteFilter</filter-name>
+ <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
+ <init-param>
+ <param-name>logLevel</param-name>
+ <param-value>WARN</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>UrlRewriteFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ EXAMPLES
+
+ Redirect one url
+ <rule>
+ <from>/some/old/page.html</from>
+ <to type="redirect">/very/new/page.html</to>
+ </rule>
+
+ Redirect a directory
+ <rule>
+ <from>/some/olddir/(.*)</from>
+ <to type="redirect">/very/newdir/$1</to>
+ </rule>
+
+ Clean a url
+ <rule>
+ <from>/products/([0-9]+)</from>
+ <to>/products/index.jsp?product_id=$1</to>
+ </rule>
+ eg, /products/1234 will be passed on to /products/index.jsp?product_id=1234 without the user noticing.
+
+ Browser detection
+ <rule>
+ <condition name="user-agent">Mozilla/[1-4]</condition>
+ <from>/some/page.html</from>
+ <to>/some/page-for-old-browsers.html</to>
+ </rule>
+ eg, will pass the request for /some/page.html on to /some/page-for-old-browsers.html only for older
+ browsers whose user agent srtings match Mozilla/1, Mozilla/2, Mozilla/3 or Mozilla/4.
+
+ -->
+
+</urlrewrite>
+
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/web.xml 2007-11-23 16:27:41 UTC (rev 16761)
@@ -1,130 +1,147 @@
<?xml version="1.0"?>
-
- <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <context-param>
- <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
- <param-value>true</param-value>
- </context-param>
- <context-param>
- <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
- <param-value>false</param-value>
- </context-param>
- <context-param>
- <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
- <param-value>false</param-value>
- </context-param>
- <context-param>
- <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name>
- <param-value>false</param-value>
- </context-param>
- <context-param>
- <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
- <param-value>true</param-value>
- </context-param>
-
-
- <!-- Use Documents Saved as *.xhtml -->
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.xhtml</param-value>
- </context-param>
-
- <context-param>
- <param-name>facelets.SKIP_COMMENTS</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <param-name>facelets.VIEW_MAPPINGS</param-name>
- <param-value>*.xhtml</param-value>
- </context-param>
-
- <!-- Special Debug Output for Development -->
- <context-param>
- <param-name>facelets.DEVELOPMENT</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <param-name>facelets.LIBRARIES</param-name>
- <param-value>/WEB-INF/tomahawk.taglib.xml</param-value>
- </context-param>
-
- <filter>
- <filter-name>MyFacesExtensionsFilter</filter-name>
- <filter-class>
- org.apache.myfaces.webapp.filter.ExtensionsFilter
- </filter-class>
- <init-param>
- <description>
- Set the size limit for uploaded files. Format: 10 - 10
- bytes 10k - 10 KB 10m - 10 MB 1g - 1 GB
- </description>
- <param-name>maxFileSize</param-name>
- <param-value>20m</param-value>
- </init-param>
- </filter>
-
- <!-- extension mapping for adding <script/>, <link/>, and other resource tags to JSF-pages -->
- <filter-mapping>
- <filter-name>MyFacesExtensionsFilter</filter-name>
- <!-- servlet-name must match the name of your javax.faces.webapp.FacesServlet entry -->
- <servlet-name>Faces Servlet</servlet-name>
- </filter-mapping>
-
- <!-- extension mapping for serving page-independent resources (javascript, stylesheets, images, etc.) -->
- <filter-mapping>
- <filter-name>MyFacesExtensionsFilter</filter-name>
- <url-pattern>/faces/myFacesExtensionResource/*</url-pattern>
- </filter-mapping>
-
- <!-- <context-param>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <context-param>
+ <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name>
+ <param-value>false</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <!-- Use Documents Saved as *.xhtml -->
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>facelets.SKIP_COMMENTS</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>facelets.VIEW_MAPPINGS</param-name>
+ <param-value>*.xhtml</param-value>
+ </context-param>
+ <!-- Special Debug Output for Development -->
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>facelets.LIBRARIES</param-name>
+ <param-value>/WEB-INF/tomahawk.taglib.xml</param-value>
+ </context-param>
+ <filter>
+ <filter-name>MyFacesExtensionsFilter</filter-name>
+ <filter-class>org.apache.myfaces.webapp.filter.ExtensionsFilter</filter-class>
+ <init-param>
+ <description>Set the size limit for uploaded files. Format: 10 - 10
+ bytes 10k - 10 KB 10m - 10 MB 1g - 1 GB</description>
+ <param-name>maxFileSize</param-name>
+ <param-value>20m</param-value>
+ </init-param>
+ </filter>
+ <filter>
+ <filter-name>wikiFileAccessFilter</filter-name>
+ <filter-class>org.jboss.wiki.fileaccess.WikiFileAccessFilter</filter-class>
+ </filter>
+ <filter>
+ <filter-name>UrlRewriteFilter</filter-name>
+ <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
+ <init-param>
+ <param-name>logLevel</param-name>
+ <param-value>WARN</param-value>
+ </init-param>
+ </filter>
+ <!-- extension mapping for adding <script/>, <link/>, and other resource tags to JSF-pages -->
+ <filter-mapping>
+ <filter-name>MyFacesExtensionsFilter</filter-name>
+ <!-- servlet-name must match the name of your javax.faces.webapp.FacesServlet entry -->
+ <servlet-name>Faces Servlet</servlet-name>
+ </filter-mapping>
+ <!-- extension mapping for serving page-independent resources (javascript, stylesheets, images, etc.) -->
+ <filter-mapping>
+ <filter-name>MyFacesExtensionsFilter</filter-name>
+ <url-pattern>/faces/myFacesExtensionResource/*</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>wikiFileAccessFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+ <!-- UNCOMMENT FOR SERVLET<filter-mapping>
+ <filter-name>wikiFileAccessFilter</filter-name>
+ <url-pattern>/_WikiButtons/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>wikiFileAccessFilter</filter-name>
+ <url-pattern>/_Files/*</url-pattern>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>UrlRewriteFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping> -->
+ <!-- <context-param>
<param-name>facelets.LIBRARIES</param-name>
<param-value>/WEB-INF/wiki.taglib.xml</param-value>
- </context-param> -->
-
- <!--<listener>
+ </context-param>
+ <listener>
<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
- </listener>-->
-
- <listener>
- <listener-class>
- com.thoughtworks.guice.GuiceServletContextListener
- </listener-class>
- </listener>
+ </listener> -->
+ <listener>
+ <listener-class>com.thoughtworks.guice.GuiceServletContextListener</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ <!-- UNCOMMENT FOR SERVLET <security-role-ref>
+ <role-name>Authenticated</role-name>
+ <role-link>Authenticated</role-link>
+ </security-role-ref> -->
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.jsf</url-pattern>
- </servlet-mapping>
-
- <filter>
- <filter-name>wikiFileAccessFilter</filter-name>
- <filter-class>org.jboss.wiki.fileaccess.WikiFileAccessFilter</filter-class>
- </filter>
-
- <!-- <filter>
- <filter-name>wikiFileAccessFilter</filter-name>
- <filter-class>org.jboss.wiki.redirect.WikiRedirectFilter</filter-class>
- </filter> -->
-
- <filter-mapping>
- <filter-name>wikiFileAccessFilter</filter-name>
- <url-pattern>/*</url-pattern>
- <dispatcher>REQUEST</dispatcher>
- </filter-mapping>
+ <!-- UNCOMMENT FOR SERVLET
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Authenticated</web-resource-name>
+ <url-pattern>/auth/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>Authenticated</role-name>
+ </auth-constraint>
+ </security-constraint>
+ <login-config>
+ <auth-method>FORM</auth-method>
+ <realm-name>file</realm-name>
+ <form-login-config>
+ <form-login-page>/logon.jsp</form-login-page>
+ <form-error-page>/logonError.jsp</form-error-page>
+ </form-login-config>
+ </login-config>
+ <security-role>
+ <role-name>Authenticated</role-name>
+ </security-role> -->
</web-app>
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/logon.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/logon.jsp (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/logon.jsp 2007-11-23 16:27:41 UTC (rev 16761)
@@ -0,0 +1,17 @@
+<html>
+<head>
+ <title>Login Page</title>
+</head>
+
+<h2>Hello, please log in:</h2>
+<br><br>
+<form action="j_security_check" method=post>
+ <p><strong>Please Enter Your User Name: </strong>
+ <input type="text" name="j_username" size="25">
+ <p><p><strong>Please Enter Your Password: </strong>
+ <input type="password" size="15" name="j_password">
+ <p><p>
+ <input type="submit" value="Submit">
+ <input type="reset" value="Reset">
+</form>
+</html>
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/logonError.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/logonError.jsp (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/logonError.jsp 2007-11-23 16:27:41 UTC (rev 16761)
@@ -0,0 +1,14 @@
+<html>
+<head>
+ <title>Login Error</title>
+</head>
+<body>
+ <c:url var="url" value="/index.jsp"/>
+ <h2>Invalid user name or password.</h2>
+
+ <p>Please enter a user name or password that is authorized to access this
+ application. For this application, this means a user that has been created in the
+ <code>file</code> realm and has been assigned to the <em>group</em> of
+ <code>user</code>. Click here to <a href="${url}">Try Again</a></p>
+</body>
+</html>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml 2007-11-23 16:27:41 UTC (rev 16761)
@@ -24,6 +24,16 @@
<f:loadBundle basename="Messages" var="msg"/>
<h:panelGroup rendered="#{wikiCommon.userLoggedIn}" id="tagMeWiki" />
+ <h:panelGroup rendered="#{wikiCommon.showLogin}" id="showLogin" styleClass="floatright">
+ <c:if test="#{wikiCommon.userLoggedIn}">
+ <h:outputText value="#{msg.userLoggedIn} #{wikiCommon.userName}"/>
+ </c:if>
+ <c:if test="#{not wikiCommon.userLoggedIn}">
+ <h:outputLink value="#{wikiView.loginURL}">
+ <h:outputText value="#{msg.login}" />
+ </h:outputLink>
+ </c:if>
+ </h:panelGroup>
<h:panelGroup styleClass="floatright">
<h:form>
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/build.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/build.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/build.xml 2007-11-23 16:27:41 UTC (rev 16761)
@@ -0,0 +1,34 @@
+<project xmlns:ivy="antlib:fr.jayasoft.ivy.ant" name="wiki-common" default="all">
+ <!-- some variables used -->
+ <property name="lib.dir" value="lib" />
+ <property name="build.dir" value="build-ant" />
+ <property name="src.dir" value="src/java" />
+
+ <!-- paths used for compilation and run -->
+ <path id="lib.path.id">
+ <fileset dir="${lib.dir}" />
+ <fileset dir="../../binaries/portal/to-copy/jboss-portal.sar/lib/" />
+ <fileset dir="../../binaries/as/to-copy/lib" />
+ <fileset dir="../../binaries/as/to-copy/server/default/lib" />
+ </path>
+
+ <target name="all" description="--> build package and create distribution binaries">
+
+ </target>
+
+ <target name="build" depends="resolve">
+ <mkdir dir="${build.dir}" />
+ <javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.path.id" />
+ </target>
+
+ <target name="package">
+
+ </target>
+
+ <!-- =================================
+ target: resolve
+ ================================= -->
+ <target name="resolve" description="--> retrieve dependencies with ivy">
+ <ivy:retrieve />
+ </target>
+</project>
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/ivy.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/ivy.xml (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/ivy.xml 2007-11-23 16:27:41 UTC (rev 16761)
@@ -0,0 +1,7 @@
+<ivy-module version="1.0">
+ <info organisation="org.jboss.wiki" module="wiki-common" />
+ <dependencies>
+ <dependency org="log4j" name="log4j" rev="1.2.9" />
+ <dependency org="jboss" name="jboss-client" rev="4.0.2" />
+ </dependencies>
+</ivy-module>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/JBossWiki.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/JBossWiki.properties 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/JBossWiki.properties 2007-11-23 16:27:41 UTC (rev 16761)
@@ -10,6 +10,7 @@
#credentialsClass - class to use for portlet credentials
credentialsClass=org.jboss.wiki.credentials.JBossPortalCredentials
+#credentialsClass=org.jboss.wiki.credentials.ServletCredentials
#credentialsClass=org.jboss.wiki.credentials.LiferayCredentials
#mediaDataSourceClass class to use for mediaDataSource
@@ -30,5 +31,8 @@
#default wikicontext - if you wanna use application context instead - just delete this property
wikiContext=/wiki
+#should wiki show login button and information
+showLogin=false
+
#number of minutes after which page lock will expire
lockTime=30
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/ImagePlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/ImagePlugin.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/ImagePlugin.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -2,6 +2,7 @@
import java.util.HashMap;
+import org.jboss.wiki.WikiCommon;
import org.jboss.wiki.WikiInsidePlugin;
import org.jboss.wiki.WikiPage;
import org.jboss.wiki.WikiSession;
@@ -34,22 +35,24 @@
}
if (!HTMLTranslatorParts.isExternalLink(src)) {
- src = wikiSession.getAttribute("hostURL") + "/wiki/"
+ src = (String) wikiSession.getAttribute(WikiSession.HOST_URL)
+ + wikiSession.getAttribute(WikiSession.APP_CONTEXT) + "/"
+ + WikiCommon.WIKI_FILES + "/"
+ wikiPage.getLangCode().toLowerCase() + "/" + src;
String[] tokens = src.split("/");
String imgName = tokens[tokens.length - 1];
- if (HTMLTranslatorParts.checkImageLink(imgName)
- && !imgName.startsWith("file:")) {
- String newSrc = tokens[0];
- tokens[tokens.length - 1] = wikiPage.getName() + "/" + "file:" + imgName;
-
- for (int i = 1; i < tokens.length; i++) {
- newSrc += "/" + tokens[i];
- }
-
- src = newSrc;
- }
+ /*
+ * if (HTMLTranslatorParts.checkImageLink(imgName) &&
+ * !imgName.startsWith("file:")) { String newSrc = tokens[0];
+ * tokens[tokens.length - 1] = wikiPage.getName() + "/" + "file:" +
+ * imgName;
+ *
+ * for (int i = 1; i < tokens.length; i++) { newSrc += "/" +
+ * tokens[i]; }
+ *
+ * src = newSrc; }
+ */
}
String align = attributes.get("align");
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -43,11 +43,13 @@
*/
public class WikiCommon {
- public static final String WIKI_BUTTONS = "!WikiButtons";
+ public static final String WIKI_BUTTONS = "_WikiButtons";
public static final String WIKI_SERVICE_NAME = "wiki:service=wikiService";
public static final Object TINY_MCE = "tiny_mce";
+
+ public static final String WIKI_FILES = "_Files";
private static Logger log = Logger.getLogger(WikiCommon.class);
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiSession.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiSession.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiSession.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -27,6 +27,7 @@
public static final String CREDENTIALS = "credentials";
public static final String HOST_URL = "hostURL";
public static final String IS_SECURE = "isSecure";
+ public static final String APP_CONTEXT = "appContext";
public Object getAttribute(String attributeName);
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/configuration/ConfigurationParser.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/configuration/ConfigurationParser.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/configuration/ConfigurationParser.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -41,7 +41,7 @@
private static final String PROPERTIES_FILENAME = "JBossWiki.properties";
private static final String DEFAULT_LANGUAGE_PROP = "defaultLanguageCode";
-
+
private static final String LOCK_TIME_PROP = "lockTime";
private static String defaultLangugeCode = "EN";
@@ -57,12 +57,17 @@
private static String wikiContext;
private static Class credentialsClass;
-
+
+ private static boolean showLogin;
+
/* number of minutes after which page lock will expire */
private static int lockTime = 30;
-
- private static final Logger log = Logger.getLogger(ConfigurationParser.class);
+ private static final Logger log = Logger
+ .getLogger(ConfigurationParser.class);
+
+ private static final String SHOWLOGIN_PROP = "showLogin";
+
static {
// load properties
reload();
@@ -82,13 +87,13 @@
if (jbosswikiprops.getProperty("defaultPage") != null) {
defaultPage = jbosswikiprops.getProperty("defaultPage");
}
- log.info("Default page: "+defaultPage);
+ log.info("Default page: " + defaultPage);
if (jbosswikiprops.getProperty("sessionIdExpireTime") != null) {
sessionIdExpireTime = Integer.valueOf(jbosswikiprops
.getProperty("sessionIdExpireTime"));
}
- log.info("SessionIdExpireTime: "+sessionIdExpireTime);
+ log.info("SessionIdExpireTime: " + sessionIdExpireTime);
if (jbosswikiprops.getProperty(DEFAULT_LANGUAGE_PROP) != null) {
defaultLangugeCode = jbosswikiprops
@@ -97,40 +102,51 @@
log.info("Default Language Code: " + defaultLangugeCode);
wikiContext = jbosswikiprops.getProperty("wikiContext");
-
- log.info("WikiContext: "+wikiContext);
+ log.info("WikiContext: " + wikiContext);
+
mediaDataSourceClass = jbosswikiprops
.getProperty("mediaDataSourceClass");
attachmentDataSourceClass = jbosswikiprops
.getProperty("attachmentDataSourceClass");
wikiPageDictionaryClass = jbosswikiprops
.getProperty("wikiPageDictionaryClass");
-
- log.info("MediaDataSource: "+mediaDataSourceClass);
- log.info("attachmentDataSource: " +attachmentDataSourceClass);
- log.info("WikiPage Dictionary: "+wikiPageDictionaryClass);
-// load credential class
+ log.info("MediaDataSource: " + mediaDataSourceClass);
+ log.info("attachmentDataSource: " + attachmentDataSourceClass);
+ log.info("WikiPage Dictionary: " + wikiPageDictionaryClass);
+
+ // load credential class
try {
credentialsClass = Thread.currentThread().getContextClassLoader()
.loadClass(jbosswikiprops.getProperty("credentialsClass"));
} catch (ClassNotFoundException e) {
log.error(e);
}
-
-// if credentialClass didn't load or wasn't set
+
+ // if credentialClass didn't load or wasn't set
if (credentialsClass == null) {
credentialsClass = SimpleCredentials.class;
}
-
+
log.info("CredentialsClass: " + credentialsClass);
-
+
if (jbosswikiprops.getProperty(LOCK_TIME_PROP) != null) {
lockTime = Integer.parseInt(jbosswikiprops
.getProperty(LOCK_TIME_PROP));
}
log.info("Lock time: " + lockTime);
+
+ try {
+ showLogin = Boolean.parseBoolean(jbosswikiprops
+ .getProperty(SHOWLOGIN_PROP));
+ } catch (Exception e) {
+ // show login not set/wrong ?
+ log.info("showLogin not set or set wrong - use true or false");
+ showLogin = false;
+ } finally {
+ log.info("Show login: " + showLogin);
+ }
}
public static String getDefaultLangugeCode() {
@@ -169,4 +185,8 @@
return lockTime;
}
+ public static boolean isShowLogin() {
+ return showLogin;
+ }
+
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/AdminSimpleCredentials.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/AdminSimpleCredentials.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/AdminSimpleCredentials.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -24,13 +24,10 @@
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
*
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/ServletCredentials.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/ServletCredentials.java (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/ServletCredentials.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -0,0 +1,66 @@
+package org.jboss.wiki.credentials;
+
+import java.security.Principal;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class ServletCredentials extends Credentials {
+
+ private static final String ADMIN_ROLE = "admin";
+ private String name;
+ private boolean admin;
+ private boolean logged;
+
+ private HttpServletRequest request;
+
+ @Override
+ public Set<String> getAllRoles() {
+ // TODO Auto-generated method stub
+ return new HashSet<String>();
+ }
+
+ @Override
+ public String getEmail() {
+ // TODO Auto-generated method stub
+ return "admin at localhost";
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public boolean isAdmin() {
+ return admin;
+ }
+
+ @Override
+ public boolean isLoggedIn() {
+ return logged;
+ }
+
+ @Override
+ public boolean isUserInRole(String role) {
+ return request.isUserInRole(role);
+ }
+
+ @Override
+ public void setParam(Object param) {
+ if (param instanceof HttpServletRequest) {
+ request = (HttpServletRequest)param;
+
+ Principal principal = request.getUserPrincipal();
+
+ logged = principal != null;
+ admin = request.isUserInRole(ADMIN_ROLE);
+
+ if (principal != null) {
+ name = principal.getName();
+ }
+ }
+ }
+
+}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/ATOMPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/ATOMPlugin.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/ATOMPlugin.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -64,23 +64,29 @@
atomFeed.append("<title mode=\"escaped\">JBoss Forge Wiki: ").append(
wikiPage.getName()).append("</title>\n");
- atomFeed.append("<link rel=\"alternate\" type=\"text/xml\" href=\"")
- .append((String) wikiSession.getAttribute("hostURL")).append(
- "/wiki/").append(
- wikiPage.getLangCode().equals(
- ConfigurationParser.getDefaultLangugeCode()) ? "" : wikiPage
- .getLangCode().toLowerCase()
- + "/").append("atom/").append(wikiPage.getName()).append(
- "\" />");
+ atomFeed
+ .append("<link rel=\"alternate\" type=\"text/xml\" href=\"")
+ .append((String) wikiSession.getAttribute(WikiSession.HOST_URL))
+ .append(
+ (String) wikiSession
+ .getAttribute(WikiSession.APP_CONTEXT))
+ .append(
+ wikiPage.getLangCode().equals(
+ ConfigurationParser.getDefaultLangugeCode()) ? ""
+ : wikiPage.getLangCode().toLowerCase() + "/")
+ .append("atom/").append(wikiPage.getName()).append("\" />");
- atomFeed.append("<link href=\"").append(
- (String) wikiSession.getAttribute("hostURL")).append("/wiki/")
+ atomFeed
+ .append("<link href=\"")
+ .append((String) wikiSession.getAttribute(WikiSession.HOST_URL))
.append(
+ (String) wikiSession
+ .getAttribute(WikiSession.APP_CONTEXT))
+ .append(
wikiPage.getLangCode().equals(
- ConfigurationParser.getDefaultLangugeCode()) ? "" : wikiPage
- .getLangCode().toLowerCase()
- + "/").append(wikiPage.getName()).append(
- "\" />\n");
+ ConfigurationParser.getDefaultLangugeCode()) ? ""
+ : wikiPage.getLangCode().toLowerCase() + "/")
+ .append(wikiPage.getName()).append("\" />\n");
atomFeed.append("<tagline>").append(wikiPage.getName()).append(
"</tagline>\n");
@@ -111,12 +117,13 @@
}
addItem(atomFeed, wikiPage.getName() + " rev: " + i,
- (String) wikiSession.getAttribute("hostURL")
+ (String) wikiSession.getAttribute(WikiSession.HOST_URL)
+ getProperty("wikiHome").replaceAll("&", "&")
+ "&page=" + wikiPage.getName()
- + "&version=" + i + "&language=" + wikiPage.getLangCode(), content, wikiPage
+ + "&version=" + i + "&language="
+ + wikiPage.getLangCode(), content, wikiPage
.getEditDate(), (String) wikiSession
- .getAttribute("hostURL"));
+ .getAttribute(WikiSession.HOST_URL));
}
atomFeed.append("</feed>\n");
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -41,7 +41,7 @@
if (wikiEngine.pageExists(wikiPage.getName(), wikiPage.getLangCode())
&& credentials.isAdmin()) {
- String actionURL = (String) wikiSession.getAttribute("actionURL");
+ String actionURL = (String) wikiSession.getAttribute(WikiSession.ACTION_URL);
String errorMsg = "";
boolean editable = wikiPage.isEditableForAll();
@@ -124,7 +124,7 @@
adminConsole.append("\n<hr><h3>Admin console</h3>\n");
adminConsole.append("Go to <a href=\"").append(actionURL).append(
- "&type=admin").append("&language=").append(
+ "type=admin").append("&language=").append(
wikiPage.getLangCode()).append(
"\">Admin general console</a><br />\n");
if (errorMsg.length() > 0) {
@@ -142,7 +142,7 @@
for (String att : attSet) {
adminConsole.append("<tr><td>").append(att).append(
"</td><td>[<a href=\"").append(actionURL)
- .append("&page=").append(wikiPage.getName())
+ .append("page=").append(wikiPage.getName())
.append("&var1=deleteAtt").append("&var2=")
.append(att).append("\" >Delete</a>]</td></tr>");
}
@@ -156,7 +156,7 @@
// delete page button
adminConsole.append("[<a href=\"").append(actionURL).append(
- "&page=Main").append("&var1=deletePage").append(
+ "page=Main").append("&var1=deletePage").append(
"&var2=").append(wikiPage.getName()).append(
"&var3=false").append(
"\" >Delete this page</a>]<br />\n");
@@ -165,7 +165,7 @@
adminConsole
.append("[<a href=\"")
.append(actionURL)
- .append("&page=Main")
+ .append("page=Main")
.append("&var1=deletePage")
.append("&var2=")
.append(wikiPage.getName())
@@ -179,7 +179,7 @@
adminConsole.append("This page ").append(
(editable) ? "is" : "isn't").append(" editable ");
adminConsole.append("[<a href=\"").append(actionURL)
- .append("&page=").append(wikiPage.getName()).append(
+ .append("page=").append(wikiPage.getName()).append(
"&var1=chmod").append("&var2=").append(!editable)
.append("&var3=").append(viewable).append("\" >Make ")
.append((editable) ? "not" : "").append(
@@ -190,7 +190,7 @@
(viewable) ? "is" : "isn't").append(" viewable ");
adminConsole.append("[<a href=\"").append(actionURL)
- .append("&page=").append(wikiPage.getName()).append(
+ .append("page=").append(wikiPage.getName()).append(
"&var1=chmod").append("&var2=").append(editable)
.append("&var3=").append(!viewable)
.append("\" >Make ").append((viewable) ? "not" : "")
@@ -207,7 +207,7 @@
for (String role : allRoles) {
String roleEd = "<a href=\""
+ actionURL
- + "&page="
+ + "page="
+ wikiPage.getName()
+ "&var1=editRole&var2="
+ role
@@ -216,7 +216,7 @@
: " Add this role") + "</a>";
String roleVi = "<a href=\""
+ actionURL
- + "&page="
+ + "page="
+ wikiPage.getName()
+ "&var1=viewRole&var2="
+ role
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -49,10 +49,10 @@
Credentials credentials = (Credentials) wikiSession
.getAttribute("credentials");
- String actionURL = (String) wikiSession.getAttribute("actionURL");
+ String actionURL = (String) wikiSession.getAttribute(WikiSession.ACTION_URL);
StringBuilder adminContent = new StringBuilder("<h2><a href=\"")
.append(actionURL).append(
- "&type=admin \">Admin</a></h2><br />\n");
+ "type=admin \">Admin</a></h2><br />\n");
if (credentials.isAdmin()) {
@@ -122,7 +122,7 @@
.getLangCode());
adminContent.append("<form method=\"POST\" action=\"").append(
- actionURL).append("&type=admin \" >\n");
+ actionURL).append("type=admin \" >\n");
adminContent.append("<select name=\"var2\" >\n");
for (String pageName : allPages) {
@@ -152,7 +152,7 @@
adminContent.append("</table>\n<h4>Add new language</h4>");
adminContent.append("<form method=\"POST\" action=\"").append(
- actionURL).append("&type=admin \" >\n");
+ actionURL).append("type=admin \" >\n");
adminContent.append("<select name=\"var2\" >\n");
for (String langCode : langCodes.keySet()) {
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachementInfoPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachementInfoPlugin.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachementInfoPlugin.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -22,6 +22,7 @@
package org.jboss.wiki.plugins;
import org.jboss.wiki.WikiAttachment;
+import org.jboss.wiki.WikiCommon;
import org.jboss.wiki.WikiPage;
import org.jboss.wiki.WikiPlugin;
import org.jboss.wiki.WikiSession;
@@ -37,9 +38,11 @@
String attachementName = (String) wikiSession.getAttribute("var1");
Object rollbackToVer = wikiSession.getAttribute("var2");
- String attURL = (String) wikiSession.getAttribute("hostURL") + "/wiki/"
- + wikiPage.getName() + "/file:";
- String actionURL = (String) wikiSession.getAttribute("actionURL");
+ String attURL = (String) wikiSession.getAttribute(WikiSession.HOST_URL)
+ + wikiSession.getAttribute(WikiSession.APP_CONTEXT) + "/"
+ + WikiCommon.WIKI_FILES + "/" + wikiPage.getName() + "/";
+ String actionURL = (String) wikiSession
+ .getAttribute(WikiSession.ACTION_URL);
if (((wikiPage.isEditable(credentials)) || (credentials.isAdmin()))
&& (rollbackToVer != null)
@@ -63,14 +66,15 @@
.append("<tr><th class='historyTableheader'>Version</th><th class='historyTableheader'>Date</th><th class='historyTableheader'>Author</th><th class='historyTableheader'>Size</th><th class='historyTableheader'>Rollback</th></tr>\n");
boolean odd = true;
-
+
int lastVer = wikiEngine.getLastAttachmentVersion(wikiPage.getName(),
attachementName, wikiPage.getLangCode());
for (int i = lastVer; i > 0; i--) {
WikiAttachment wikiAttachment = wikiEngine.getAttachment(wikiPage
.getName(), attachementName, i, wikiPage.getLangCode());
- history.append("<tr class='").append(odd ? "oddRow" : "evenRow").append("'><td><a href=\"").append(attURL)
- .append(attachementName).append(
+ history.append("<tr class='").append(odd ? "oddRow" : "evenRow")
+ .append("'><td><a href=\"").append(attURL).append(
+ attachementName).append(
(i != lastVer) ? ":" + i : "").append("\" >")
.append(i).append("</a></td>").append("<td>").append(
wikiAttachment.getDate()).append("</td>").append(
@@ -85,7 +89,7 @@
&& ((wikiPage.isEditable(credentials)) || (credentials
.isAdmin())))
history.append("<a href=\"").append(actionURL).append(
- "&type=fileInfo&page=").append(wikiPage.getName())
+ "type=fileInfo&page=").append(wikiPage.getName())
.append("&var1=").append(attachementName).append(
"&var2=").append(i).append("\" >");
@@ -112,7 +116,7 @@
}
history.append("</tr>\n");
-
+
odd = !odd;
}
history.append("</table>\n");
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -35,16 +35,17 @@
@Override
public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) {
- host = (String) wikiSession.getAttribute("hostURL")
- + "/wiki/"
- + (!wikiPage.getLangCode().equals(ConfigurationParser.getDefaultLangugeCode()) ? wikiPage
+ host = (String) wikiSession.getAttribute(WikiSession.HOST_URL)
+ + (String) wikiSession.getAttribute(WikiSession.APP_CONTEXT)
+ + (!wikiPage.getLangCode().equals(
+ ConfigurationParser.getDefaultLangugeCode()) ? wikiPage
.getLangCode().toLowerCase()
- + "/"
- : "");
-
- String fileEditURL = (String) wikiSession.getAttribute("actionURL")
- + "&type=fileInfo&page=" + wikiPage.getName();
+ + "/" : "");
+ String fileEditURL = (String) wikiSession
+ .getAttribute(WikiSession.ACTION_URL)
+ + "type=fileInfo&page=" + wikiPage.getName();
+
WikiPage newPage = null;
try {
@@ -61,7 +62,8 @@
newContent += "\n<hr />\n<h3>Attachments:</h3>\n<table border='0'>";
for (String file : attachements) {
- String href = host + newPage.getName() + "/file:" + file;
+ String href = host + "/" + WikiCommon.WIKI_FILES + "/"
+ + newPage.getName() + "/" + file;
newContent += "<tr><td><a href=\"" + href + "\">" + href
+ "</a></td>";
newContent += "<td>[<a href=\"" + fileEditURL + "&var1=" + file
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/EditTinyMCE.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/EditTinyMCE.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/EditTinyMCE.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -45,7 +45,7 @@
StringBuffer buf = new StringBuffer(
"\n<script language='javascript' type='text/javascript' src='")
- .append((String) wikiSession.getAttribute("hostURL"))
+ .append((String) wikiSession.getAttribute(WikiSession.HOST_URL))
.append("/wiki/tiny_mce/tiny_mce.js'></script>\n")
.append(
"<script language='javascript' type='text/javascript'>\n")
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -34,44 +34,55 @@
private String url;
private String pattern;
-
+
private String translateLinks(String content) {
- //<a href="http://localhost:8080/portal/index.html?ctrl:id=window.default.WikiPortletWindow&ctrl:type=action&page=JBossWiki">
+ // <a
+ // href="http://localhost:8080/portal/index.html?ctrl:id=window.default.WikiPortletWindow&ctrl:type=action&page=JBossWiki">
String newContent = content;
Vector<String> replaces = new Vector<String>();
-
+
Matcher matcher = Pattern.compile(pattern).matcher(newContent);
-
+
while (matcher.find()) {
String link = content.substring(matcher.start(), matcher.end());
- String page = link.substring(link.lastIndexOf("&page=")+("&page=".length()), link.lastIndexOf("&language="));
- String lang = link.substring(link.lastIndexOf("&language=")+("&language=".length()), link.length() - 2).toLowerCase() + "/";
- if (lang.equals(ConfigurationParser.getDefaultLangugeCode().toLowerCase() + "/")) {
+ String page = link.substring(link.lastIndexOf("page=")
+ + ("page=".length()), link.lastIndexOf("&language="));
+ String lang = link.substring(
+ link.lastIndexOf("&language=") + ("&language=".length()),
+ link.length() - 2).toLowerCase()
+ + "/";
+
+ if (lang.equals(ConfigurationParser.getDefaultLangugeCode()
+ .toLowerCase()
+ + "/")) {
lang = "";
}
-
- replaces.add("<a href=\""+url+lang+page+"\" >");
+
+ replaces.add("<a href=\"" + url + lang + page + "\" >");
}
-
+
for (int i = 0; i < replaces.size(); i++) {
matcher = Pattern.compile(pattern).matcher(newContent);
newContent = matcher.replaceFirst(replaces.get(i));
}
-
- //System.out.println(content);
-
+
+ // System.out.println(content);
+
return newContent;
}
-
+
@Override
public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) {
- url = (String)wikiSession.getAttribute("hostURL")+"/wiki/";
-
- pattern = "<a href=\""+(((String)wikiSession.getAttribute("hostURL")+(String)wikiSession.getAttribute("actionURL")).replaceAll("\\.","\\\\.").replaceAll("\\?", "\\\\?"))+"&page=\\w+(/\\w+)*&language=\\w+(/\\w+)*\">";
-
- //System.out.println(pattern);
-
+ url = (String) wikiSession.getAttribute(WikiSession.HOST_URL)
+ + (String) wikiSession.getAttribute(WikiSession.APP_CONTEXT) +"/";
+
+ pattern = "<a href=\""
+ + (((String) wikiSession.getAttribute(WikiSession.HOST_URL) + (String) wikiSession
+ .getAttribute(WikiSession.ACTION_URL)).replaceAll(
+ "\\.", "\\\\.").replaceAll("\\?", "\\\\?"))
+ + "page=\\w+(/\\w+)*&language=\\w+(/\\w+)*\">";
+
WikiPage newPage = null;
try {
@@ -87,7 +98,7 @@
@Override
public void init() {
-
+
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/HTMLTranslatorParts.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -81,7 +81,7 @@
// private String actionType = "&ctrl:type=";
- private String page = "&page=";
+ private String page = "page=";
private String language = "&language=";
@@ -876,8 +876,9 @@
// check if not an image link as well
else if (checkImageLink(link)) {
- result = "<img src=\"" + imagePath + "/" + pageName + "/file:"
- + link + "\" alt=\"" + text + "\" />";
+ result = "<img src=\"" + imagePath + "/"
+ + WikiCommon.WIKI_FILES + "/" + pageName + "/" + link
+ + "\" alt=\"" + text + "\" />";
}
// check for attachments later on
@@ -1038,7 +1039,7 @@
+ (String) wikiSession.getAttribute(WikiSession.ACTION_URL);
wikiHome = "";
imagePath = (String) wikiSession.getAttribute(WikiSession.HOST_URL)
- + "/wiki"
+ + wikiSession.getAttribute(WikiSession.APP_CONTEXT)
+ (!wikiPage.getLangCode().equals(
ConfigurationParser.getDefaultLangugeCode()) ? "/"
+ wikiPage.getLangCode().toLowerCase() : "");
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/LinkPagePlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/LinkPagePlugin.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/LinkPagePlugin.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -90,7 +90,7 @@
.append(
wikiSession
.getAttribute(WikiSession.ACTION_URL))
- .append("&page=")
+ .append("page=")
.append(wikiPage.getName())
.append("&type=")
.append(wikiType.getName())
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -47,7 +47,7 @@
if (credentials.isLoggedIn() && wikiPage.isEditable(credentials)) {
content.append(" [<a href=\"").append(
wikiSession.getAttribute(WikiSession.ACTION_URL))
- .append("&page=").append(wikiPage.getName()).append(
+ .append("page=").append(wikiPage.getName()).append(
"&type=linkPage\">Make link</a>]<br />\n");
} else {
content
@@ -65,7 +65,7 @@
String[] otherLangsArray = otherLangs.split("[,]");
for (int i = 0; i < otherLangsArray.length; i += 2) {
- content.append("[").append(hostURL).append("/wiki/")
+ content.append("[").append(hostURL).append(wikiSession.getAttribute(WikiSession.APP_CONTEXT))
.append(otherLangsArray[i].toLowerCase()).append(
"/").append(
wikiEngine.getRealName(
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RDFPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RDFPlugin.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RDFPlugin.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -51,7 +51,7 @@
"<!-- name=\"generator\" content=\"JBoss Wiki RDFPlugin\" -->\n");
rdfFeed.append("<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns=\"http://purl.org/rss/1.0/\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:sy=\"http://purl.org/rss/1.0/modules/syndication/\">\n");
rdfFeed.append("<channel rdf:about=\"").append(
- (String) wikiSession.getAttribute("hostURL")).append("/wiki/")
+ (String) wikiSession.getAttribute(WikiSession.HOST_URL)).append(wikiSession.getAttribute(WikiSession.APP_CONTEXT))
.append(
wikiPage.getLangCode().equals(
ConfigurationParser.getDefaultLangugeCode()) ? "" : wikiPage
@@ -60,8 +60,8 @@
"\">\n");
rdfFeed.append("<title>JBoss Forge Wiki: " + wikiPage.getName()
+ "</title>\n");
- rdfFeed.append("<link>" + (String) wikiSession.getAttribute("hostURL"))
- .append("/wiki/").append(
+ rdfFeed.append("<link>" + (String) wikiSession.getAttribute(WikiSession.HOST_URL))
+ .append(wikiSession.getAttribute(WikiSession.APP_CONTEXT)).append(
wikiPage.getLangCode().equals(
ConfigurationParser.getDefaultLangugeCode()) ? "" : wikiPage
.getLangCode().toLowerCase()
@@ -90,7 +90,7 @@
content = "This is first version of the page so it doesn't have diff yet";
}
- String url = (String) wikiSession.getAttribute("hostURL")
+ String url = (String) wikiSession.getAttribute(WikiSession.HOST_URL)
+ getProperty("wikiHome").replaceAll("&", "&")
+ "&page=" + wikiPage.getName() + "&version=" + i
+ "&language=" + wikiPage.getLangCode();
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RSSPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RSSPlugin.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RSSPlugin.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -50,7 +50,8 @@
rssFeed.append("<title>JBoss Forge Wiki: " + wikiPage.getName()
+ "</title>\n");
rssFeed.append("<link>").append(
- (String) wikiSession.getAttribute("hostURL")).append("/wiki/")
+ (String) wikiSession.getAttribute(WikiSession.HOST_URL))
+ .append(wikiSession.getAttribute(WikiSession.APP_CONTEXT))
.append(
wikiPage.getLangCode().equals(
ConfigurationParser.getDefaultLangugeCode()) ? "" : wikiPage
@@ -78,7 +79,7 @@
}
addItem(rssFeed, wikiPage.getName() + " rev: " + i,
- (String) wikiSession.getAttribute("hostURL")
+ (String) wikiSession.getAttribute(WikiSession.HOST_URL)
+ getProperty("wikiHome").replaceAll("&", "&")
+ "&page=" + wikiPage.getName()
+ "&version=" + i + "&language="
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/WatchListPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/WatchListPlugin.java 2007-11-23 08:32:59 UTC (rev 16760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/WatchListPlugin.java 2007-11-23 16:27:41 UTC (rev 16761)
@@ -107,7 +107,7 @@
: "You are not watching this page. ").append(
"<a href=\"").append(
wikiSession.getAttribute(WikiSession.ACTION_URL)).append(
- "&page=").append(wikiPage.getName()).append(
+ "page=").append(wikiPage.getName()).append(
"&var1=watch&var2=toggle\" >[").append(
(watcher) ? "Stop watching this page" : "Watch this page")
.append("]</a><br />");
More information about the jboss-svn-commits
mailing list