[jboss-svn-commits] JBL Code SVN: r19660 - in labs/jbosslabs/qa/portal-extensions/jbosswiki: forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Apr 20 14:04:24 EDT 2008
Author: szimano
Date: 2008-04-20 14:04:24 -0400 (Sun, 20 Apr 2008)
New Revision: 19660
Added:
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml
Removed:
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml
Modified:
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_diff.xhtml
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml
labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/JBossPortalCredentials.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java
Log:
svn merge -r 19656:19659 https://svn.labs.jboss.org/labs/jbosslabs/trunk/portal-extensions .
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java 2008-04-20 17:55:00 UTC (rev 19659)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java 2008-04-20 18:04:24 UTC (rev 19660)
@@ -33,7 +33,7 @@
*/
public interface AttributesExtractor {
- public static final String PLUGIN_VAR_REGEX = "var[123456789]\\d*";
+ public static final String PLUGIN_VAR_REGEX = "var\\d+";
public String getHostURL();
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java 2008-04-20 17:55:00 UTC (rev 19659)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java 2008-04-20 18:04:24 UTC (rev 19660)
@@ -79,7 +79,7 @@
private String userDefaultLang;
private String userDefaultPage;
-
+
private String viewID;
public PortletAttributesExctractor(Object request, WikiEngine wikiEngine) {
@@ -125,7 +125,7 @@
userDefaultPage = rReq.getPreferences().getValue(USER_PAGE,
ConfigurationParser.getDefaultPage());
-
+
viewID = rReq.getParameter(MyFacesGenericPortlet.VIEW_ID);
} else {
@@ -291,15 +291,19 @@
if (request instanceof PortletRequest) {
PortletRequest rReq = (PortletRequest) request;
- for (Object k : rReq.getParameterMap().keySet()) {
- String key = (String) k;
+ if (rReq.getAttribute("passedVarsForPlugins") == null) {
+ for (Object k : rReq.getParameterMap().keySet()) {
+ String key = (String) k;
- if (key.matches(PLUGIN_VAR_REGEX)) {
- wikiSession.setAttribute(key, rReq.getParameter(key));
+ if (key.matches(PLUGIN_VAR_REGEX)) {
+ wikiSession.setAttribute(key, rReq.getParameter(key));
- log.debug("Wiki Param: " + key + " = "
- + rReq.getParameter(key));
+ log.debug("Wiki Param: " + key + " = "
+ + rReq.getParameter(key));
+ }
}
+
+ rReq.setAttribute("passedVarsForPlugins", true);
}
} else {
throw new IllegalArgumentException("Unknow type request: "
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2008-04-20 17:55:00 UTC (rev 19659)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2008-04-20 18:04:24 UTC (rev 19660)
@@ -300,7 +300,7 @@
if (version == -1) {
- log.info("Page: " + pageName + " File: " + fileName
+ log.debug("Page: " + pageName + " File: " + fileName
+ " LangCode: " + langCode);
wikiAttachment = wikiEngine.getAttachment(pageName,
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2008-04-20 17:55:00 UTC (rev 19659)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2008-04-20 18:04:24 UTC (rev 19660)
@@ -99,8 +99,8 @@
Map paramMap = request.getParameterMap();
- for (String key : (Set<String>) paramMap.keySet()) {
- if (key.matches("var[123456789]\\d*")) {
+ /*for (String key : (Set<String>) paramMap.keySet()) {
+ if (key.matches("var\\d+")) {
FacesContext facesContext = facesContext(request, response);
Map map = facesContext.getExternalContext().getApplicationMap();
@@ -112,7 +112,7 @@
log.debug("Wiki Param: " + key + " = "
+ ((String[]) paramMap.get(key))[0]);
}
- }
+ }*/
// if default view - do nonFacesRequest
if (request.getParameter(VIEW_ID) != null
@@ -281,7 +281,7 @@
}
}
- log.info("page: " + paramMap.get("page") + " view_id: "+ paramMap.get(VIEW_ID));
+ log.debug("page: " + paramMap.get("page") + " view_id: "+ paramMap.get(VIEW_ID));
if (paramMap.get("page") == null
&& paramMap.get(VIEW_ID).toString().endsWith("wiki_view.xhtml")) {
@@ -290,7 +290,7 @@
}
private boolean paramMatches(String paramName) {
- return (paramName.matches("var[123456789]\\d*") || paramName
+ return (/*paramName.matches("var\\d+") ||*/ paramName
.equals(VIEW_ID))
|| (paramName.equals("type"))
|| (paramName.equals("page"))
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml 2008-04-20 17:55:00 UTC (rev 19659)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml 2008-04-20 18:04:24 UTC (rev 19660)
@@ -67,6 +67,18 @@
</navigation-rule>
<navigation-rule>
+ <from-view-id>/views/wiki_attach.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>edit</from-outcome>
+ <to-view-id>/views/wiki_edit.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
+ <from-outcome>history</from-outcome>
+ <to-view-id>/views/wiki_history.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
<from-view-id>/views/wiki_edit.xhtml</from-view-id>
<navigation-case>
<from-outcome>save</from-outcome>
Deleted: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml 2008-04-20 17:55:00 UTC (rev 19659)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml 2008-04-20 18:04:24 UTC (rev 19660)
@@ -1,43 +0,0 @@
-<div xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:c="http://java.sun.com/jstl/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:t="http://myfaces.apache.org/tomahawk">
-<ui:composition template="wiki_view.xhtml">
-
- <ui:define name="attachment">
-
- <h:panelGrid styleClass="wikiGreybkgSection">
- <h:outputText styleClass="h2" value="#{msg.attachFile}" />
- <h:form id="uploadForm" enctype="multipart/form-data">
- <h:panelGrid>
- <h:outputText value="#{msg.selectAtt}"/>
- <h:selectOneMenu value="#{wikiEdit.attName}" >
- <f:selectItems value="#{wikiEdit.fileNames}" />
- </h:selectOneMenu>
-
- <h:outputText value="#{msg.selectFile}"/>
- <h:panelGrid columns="2">
- <t:inputFileUpload id="file"
- value="#{wikiEdit.newFile}"
- required="true"/>
- <t:commandLink value="#{msg.addFile}" action="#{wikiEdit.addFile}">
- <f:param name="page" value="#{wikiView.pageName}" />
- </t:commandLink>
- </h:panelGrid>
- </h:panelGrid>
- </h:form>
-
- <h:form>
- <h:commandLink action="goback">
- <h:outputText value="#{msg.close}" />
- <f:param name="page" value="#{wikiView.pageName}" />
- </h:commandLink>
- </h:form>
- </h:panelGrid>
-
- </ui:define>
-
-</ui:composition>
-</div>
Copied: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml (from rev 19659, labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml)
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml (rev 0)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml 2008-04-20 18:04:24 UTC (rev 19660)
@@ -0,0 +1,45 @@
+<div xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
+<ui:composition template="wiki_view.xhtml">
+
+ <ui:define name="attachment">
+
+ <h:panelGrid styleClass="wikiGreybkgSection">
+ <h:outputText styleClass="h2" value="#{msg.attachFile}" />
+ <h:form id="uploadForm" enctype="multipart/form-data">
+ <h:panelGrid>
+ <h:outputText value="#{msg.selectAtt}"/>
+ <h:selectOneMenu value="#{wikiEdit.attName}" >
+ <f:selectItems value="#{wikiEdit.fileNames}" />
+ </h:selectOneMenu>
+
+ <h:outputText value="#{msg.selectFile}"/>
+ <h:panelGrid columns="2">
+ <t:inputFileUpload id="file"
+ value="#{wikiEdit.newFile}"
+ required="true"/>
+ <t:commandLink value="#{msg.addFile}" action="#{wikiEdit.addFile}">
+ <f:param name="page" value="#{wikiView.pageName}" />
+ <f:param name="language" value="#{wikiCommon.langCode}" />
+ </t:commandLink>
+ </h:panelGrid>
+ </h:panelGrid>
+ </h:form>
+
+ <h:form>
+ <h:commandLink action="goback">
+ <h:outputText value="#{msg.close}" />
+ <f:param name="page" value="#{wikiView.pageName}" />
+ <f:param name="language" value="#{wikiCommon.langCode}" />
+ </h:commandLink>
+ </h:form>
+ </h:panelGrid>
+
+ </ui:define>
+
+</ui:composition>
+</div>
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_diff.xhtml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_diff.xhtml 2008-04-20 17:55:00 UTC (rev 19659)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_diff.xhtml 2008-04-20 18:04:24 UTC (rev 19660)
@@ -14,6 +14,7 @@
<h:commandLink action="goback">
<h:outputText value="#{msg.goback}" />
<f:param name="page" value="#{wikiView.pageName}" />
+ <f:param name="language" value="#{wikiCommon.langCode}" />
</h:commandLink>
</h:form>
</ui:define>
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2008-04-20 17:55:00 UTC (rev 19659)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2008-04-20 18:04:24 UTC (rev 19660)
@@ -25,21 +25,25 @@
<h:commandLink styleClass="submit" value="#{msg.edit_save}"
action="#{wikiEdit.save}">
<f:param name="page" value="#{wikiCommon.pageName}" />
+ <f:param name="language" value="#{wikiCommon.langCode}" />
</h:commandLink>
<h:outputText value=" "/>
<h:commandLink styleClass="submit" value="#{msg.edit_preview}"
action="#{wikiEdit.preview}">
<f:param name="page" value="#{wikiCommon.pageName}" />
+ <f:param name="language" value="#{wikiCommon.langCode}" />
</h:commandLink>
<h:outputText value=" "/>
<h:commandLink styleClass="submit" value="#{msg.edit_cancel}"
action="#{wikiEdit.cancel}">
<f:param name="page" value="#{wikiCommon.pageName}" />
+ <f:param name="language" value="#{wikiCommon.langCode}" />
</h:commandLink>
<h:outputText value=" "/>
<h:commandLink styleClass="submit" value="#{msg.edit_spellcheck}"
onclick="openSpellChecker(); return false;">
<f:param name="page" value="#{wikiCommon.pageName}" />
+ <f:param name="language" value="#{wikiCommon.langCode}" />
</h:commandLink>
</h:panelGroup>
</h:panelGrid>
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml 2008-04-20 17:55:00 UTC (rev 19659)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml 2008-04-20 18:04:24 UTC (rev 19660)
@@ -51,6 +51,7 @@
<h:outputText value="#{msg.changesBetween} #{hisElem.version - 1} #{msg.andChng} #{hisElem.version}" />
<f:param name="version" value="#{hisElem.version}" />
<f:param name="page" value="#{wikiView.pageName}" />
+ <f:param name="language" value="#{wikiCommon.langCode}" />
</h:commandLink>
</h:form>
</h:column>
@@ -60,6 +61,7 @@
<h:commandLink action="goback">
<h:outputText value="#{msg.goback}" />
<f:param name="page" value="#{wikiView.pageName}" />
+ <f:param name="language" value="#{wikiCommon.langCode}" />
</h:commandLink>
</h:form>
</ui:define>
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2008-04-20 17:55:00 UTC (rev 19659)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2008-04-20 18:04:24 UTC (rev 19660)
@@ -45,13 +45,15 @@
<f:param name="version" value="#{wikiView.pageVersion}" />
</c:if>
<f:param name="page" value="#{wikiView.pageName}" />
-
+ <f:param name="language" value="#{wikiCommon.langCode}" />
+
<h:outputText value="#{msg.edit}" />
</h:commandLink>
<h:outputText value="] [" />
<h:commandLink action="attach">
<h:outputText value="#{msg.attach}" />
<f:param name="page" value="#{wikiView.pageName}" />
+ <f:param name="language" value="#{wikiCommon.langCode}" />
</h:commandLink>
<h:outputText value="] " />
</h:form>
@@ -63,6 +65,7 @@
<h:commandLink action="history">
<h:outputText value="#{msg.history}" />
<f:param name="page" value="#{wikiView.pageName}" />
+ <f:param name="language" value="#{wikiCommon.langCode}" />
</h:commandLink>
<h:outputText value="]" />
</h:form>
@@ -74,6 +77,7 @@
styleClass="standardFeedLink">
<h:outputText value="#{msg.rss}" />
<f:param name="page" value="#{wikiView.pageName}" />
+ <f:param name="language" value="#{wikiCommon.langCode}" />
</h:outputLink>
<h:outputText value="]" />
</h:panelGroup>
@@ -84,6 +88,7 @@
styleClass="standardFeedLink">
<h:outputText value="#{msg.rdf}" />
<f:param name="page" value="#{wikiView.pageName}" />
+ <f:param name="language" value="#{wikiCommon.langCode}" />
</h:outputLink>
<h:outputText value="]" />
</h:panelGroup>
@@ -94,6 +99,7 @@
styleClass="standardFeedLink">
<h:outputText value="#{msg.atom}" />
<f:param name="page" value="#{wikiView.pageName}" />
+ <f:param name="language" value="#{wikiCommon.langCode}" />
</h:outputLink>
<h:outputText value="]" />
</h:panelGroup>
@@ -104,6 +110,7 @@
onclick="#{wikiView.printURL}">
<h:outputText value="#{msg.print}" />
<f:param name="page" value="#{wikiView.pageName}" />
+ <f:param name="language" value="#{wikiCommon.langCode}" />
</h:outputLink>
<h:outputText value="]" />
</h:panelGroup>
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml 2008-04-20 17:55:00 UTC (rev 19659)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/etc/WikiTypes.xml 2008-04-20 18:04:24 UTC (rev 19660)
@@ -13,6 +13,23 @@
<class>org.jboss.wiki.plugins.TrailPlugin</class>
</plugin>
<plugin>
+ <name>wikiToHtmlTranslator</name>
+ <class>org.jboss.wiki.plugins.HTMLTranslatorParts</class>
+ </plugin>
+ <plugin>
+ <name>wikiToHtmlTranslatorNoPlugins</name>
+ <class>org.jboss.wiki.plugins.HTMLTranslatorNoPlugins</class>
+ </plugin>
+ <plugin>
+ <name>friendlyLinks</name>
+ <class>org.jboss.wiki.plugins.FriendlyLinkPlugin</class>
+ </plugin>
+ </wikiType>
+ <wikiType>
+ <name>post-html</name>
+ <cached>false</cached>
+ <class>org.jboss.wiki.plugins.DefaultWikiType</class>
+ <plugin>
<name>watchList</name>
<class>org.jboss.wiki.plugins.WatchListPlugin</class>
</plugin>
@@ -33,17 +50,9 @@
<class>org.jboss.wiki.plugins.AttachmentListPlugin</class>
</plugin>
<plugin>
- <name>wikiToHtmlTranslator</name>
- <class>org.jboss.wiki.plugins.HTMLTranslatorParts</class>
- </plugin>
- <plugin>
<name>wikiToHtmlTranslatorNoPlugins</name>
<class>org.jboss.wiki.plugins.HTMLTranslatorNoPlugins</class>
</plugin>
- <plugin>
- <name>friendlyLinks</name>
- <class>org.jboss.wiki.plugins.FriendlyLinkPlugin</class>
- </plugin>
</wikiType>
<wikiType>
<name>diff</name>
@@ -219,6 +228,7 @@
</wikiType>
<wikiType>
<name>linkPage</name>
+ <cached>false</cached>
<class>org.jboss.wiki.plugins.DirectReferenceWikiType</class>
<plugin>
<name>linkPagePlugin</name>
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java 2008-04-20 17:55:00 UTC (rev 19659)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java 2008-04-20 18:04:24 UTC (rev 19660)
@@ -138,6 +138,18 @@
cachedPages.put(key, newPage.getContent());
}
+ // remove ALL temp variables for this session (as they are REALLY temp)
+ newPage.clearTempVariables(wikiSession);
+
+ // check if there is a post- type and if yes - postprocess
+ if (!name.startsWith("post-")) {
+ WikiType postType = wikiEngine.getWikiType("post-"+name);
+
+ if (postType != null) {
+ newPage = postType.process(newPage, wikiSession);
+ }
+ }
+
// clear session attributes passed in uri
int i = 1;
@@ -147,9 +159,6 @@
i++;
}
- // remove ALL temp variables for this session (as they are REALLY temp)
- newPage.clearTempVariables(wikiSession);
-
return newPage;
}
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/JBossPortalCredentials.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/JBossPortalCredentials.java 2008-04-20 17:55:00 UTC (rev 19659)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/credentials/JBossPortalCredentials.java 2008-04-20 18:04:24 UTC (rev 19660)
@@ -111,7 +111,13 @@
}
try {
- return membershipModule.getUsers(roleModule.findRoleByName(ADMIN_ROLE_NAME)).contains(user);
+ for(Object u : membershipModule.getUsers(roleModule.findRoleByName(ADMIN_ROLE_NAME))) {
+ if (((User)u).getUserName().equals(user.getUserName())) {
+ return true;
+ }
+ }
+
+ return false;
} catch (IdentityException e) {
log.error(e);
return false;
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java 2008-04-20 17:55:00 UTC (rev 19659)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java 2008-04-20 18:04:24 UTC (rev 19660)
@@ -65,7 +65,7 @@
String[] otherLangsArray = otherLangs.split("[,]");
for (int i = 0; i < otherLangsArray.length; i += 2) {
- content.append("[").append(hostURL).append(wikiSession.getAttribute(WikiSession.APP_CONTEXT))
+ content.append("[").append(hostURL).append(wikiSession.getAttribute(WikiSession.APP_CONTEXT)).append("/")
.append(otherLangsArray[i].toLowerCase()).append(
"/").append(
wikiEngine.getRealName(
More information about the jboss-svn-commits
mailing list