[jboss-svn-commits] JBL Code SVN: r19642 - in labs/jbosslabs/qa/portal-extensions: jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Apr 19 09:14:41 EDT 2008
Author: szimano
Date: 2008-04-19 09:14:41 -0400 (Sat, 19 Apr 2008)
New Revision: 19642
Added:
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/log4j.properties.sample
Removed:
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/log4j.properties
Modified:
labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/WikiCF.java
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/attributesextractor/impl/ServletAttributesExtractor.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/java/org/jboss/wiki/ui/WikiCommonSession.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiDiff.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.java
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.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_attach.xhtml
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_template.xhtml
labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiSession.java
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/plugins/TrailPlugin.java
Log:
svn merge -r 19533:19641 https://svn.labs.jboss.org/labs/jbosslabs/trunk/portal-extensions .
Modified: labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/WikiCF.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/WikiCF.java 2008-04-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/WikiCF.java 2008-04-19 13:14:41 UTC (rev 19642)
@@ -1,5 +1,6 @@
package org.jboss.labs.mapper.command.delegating.page;
+import org.jboss.portal.common.invocation.Scope;
import org.jboss.portal.core.controller.ControllerCommand;
import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.model.portal.PortalObjectId;
@@ -106,8 +107,23 @@
Map<String, Object> params = new HashMap<String, Object>();
params.put(MapperTools.JSF_VIEW_ID_PARAM, "/views/wiki_view.xhtml");
- if (page != null)
+ if (page != null) {
params.put("page", page);
+ } else {
+ // check if the page is not set by a parameter - if not - set to
+ // main
+ if (!(invocation != null
+ && invocation.getServerContext() != null
+ && invocation.getServerContext().getBodyParameterMap() != null && invocation
+ .getServerContext().getBodyParameterMap().get("page") != null)) {
+ log.info("\nSeting page Main\n");
+ params.put("page", "Main");
+ } else {
+ log.info("\nPage set to: "
+ + invocation.getServerContext().getBodyParameterMap()
+ .get("page") + "\n");
+ }
+ }
if (language != null) {
params.put("language", language);
}
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-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/AttributesExtractor.java 2008-04-19 13:14:41 UTC (rev 19642)
@@ -66,4 +66,6 @@
public void setUserDefaultLang(String lang, Object request) throws WikiUserPreferenceException;
public void setPluginVars(Object request);
+
+ public String getViewID();
}
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-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/PortletAttributesExctractor.java 2008-04-19 13:14:41 UTC (rev 19642)
@@ -79,6 +79,8 @@
private String userDefaultLang;
private String userDefaultPage;
+
+ private String viewID;
public PortletAttributesExctractor(Object request, WikiEngine wikiEngine) {
@@ -123,6 +125,8 @@
userDefaultPage = rReq.getPreferences().getValue(USER_PAGE,
ConfigurationParser.getDefaultPage());
+
+ viewID = rReq.getParameter(MyFacesGenericPortlet.VIEW_ID);
} else {
throw new IllegalArgumentException("Unknow type request: "
@@ -303,4 +307,8 @@
}
}
+ public String getViewID() {
+ return viewID;
+ }
+
}
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/ServletAttributesExtractor.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/ServletAttributesExtractor.java 2008-04-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/attributesextractor/impl/ServletAttributesExtractor.java 2008-04-19 13:14:41 UTC (rev 19642)
@@ -3,6 +3,8 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.log4j.Logger;
+import org.apache.myfaces.portlet.MyFacesGenericPortlet;
+import org.apache.myfaces.webapp.MyFacesServlet;
import org.jboss.wiki.ServletWikiSession;
import org.jboss.wiki.WikiEngine;
import org.jboss.wiki.WikiSession;
@@ -43,6 +45,8 @@
private String userDefaultLang;
private String userDefaultPage;
+
+ private String viewID;
public ServletAttributesExtractor(Object request, WikiEngine wikiEngine) {
if (request instanceof HttpServletRequest) {
@@ -83,6 +87,9 @@
userDefaultLang = ConfigurationParser.getDefaultLangugeCode();
userDefaultPage = ConfigurationParser.getDefaultPage();
+
+ //TODO - nie wiem czy to jest dobrze
+ viewID = rReq.getParameter(MyFacesGenericPortlet.VIEW_ID);
} else {
throw new IllegalArgumentException("Unknow type request: "
+ request);
@@ -191,4 +198,8 @@
}
}
+ public String getViewID() {
+ return viewID;
+ }
+
}
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-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2008-04-19 13:14:41 UTC (rev 19642)
@@ -280,6 +280,13 @@
log.debug("Param: " + key + " = " + request.getParameter(key));
}
}
+
+ log.info("page: " + paramMap.get("page") + " view_id: "+ paramMap.get(VIEW_ID));
+
+ if (paramMap.get("page") == null
+ && paramMap.get(VIEW_ID).toString().endsWith("wiki_view.xhtml")) {
+ response.setRenderParameter("page", "Main");
+ }
}
private boolean paramMatches(String paramName) {
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2008-04-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2008-04-19 13:14:41 UTC (rev 19642)
@@ -23,8 +23,10 @@
package org.jboss.wiki.ui;
import java.util.Map;
+import java.util.Stack;
import org.apache.log4j.Logger;
+import org.jboss.wiki.WikiSession;
import org.jboss.wiki.attributesextractor.AttributesExtractor;
import org.jboss.wiki.configuration.ConfigurationParser;
@@ -52,15 +54,15 @@
@Inject
public void setAttrExtractor(AttributesExtractor attrExtractor) {
this.attrExtractor = attrExtractor;
-
+
update(attrExtractor);
}
-
+
public WikiCommonSession() {
-
+
}
- public void update(AttributesExtractor attrExtractor) {
+ private void update(AttributesExtractor attrExtractor) {
if (attrExtractor.getRequestedPageName() != null
&& attrExtractor.getRequestedPageName().length() > 0) {
pageName = attrExtractor.getRequestedPageName();
@@ -72,6 +74,20 @@
}
}
+ Stack<String> visitedPages = (Stack<String>) attrExtractor
+ .getWikiSession().getAttribute(WikiSession.TRAIL);
+
+ if (visitedPages == null) {
+ visitedPages = new Stack<String>();
+ }
+
+ if (visitedPages.empty() || !pageName.equals(visitedPages.peek())) {
+ visitedPages.push(pageName);
+ }
+
+ attrExtractor.getWikiSession().setAttribute(WikiSession.TRAIL,
+ visitedPages);
+
if (attrExtractor.getRequestedLanguage() != null) {
langCode = attrExtractor.getRequestedLanguage();
} else {
@@ -113,8 +129,29 @@
public Map<String, Integer> getSearchResults() {
return searchResults;
}
-
+
public boolean isShowLogin() {
return ConfigurationParser.isShowLogin();
}
+
+ public void setPageName(String pageName) {
+ this.pageName = pageName;
+ }
+
+ public String getVisitedPagesHrefs() {
+ StringBuilder sb = new StringBuilder();
+
+ Stack<String> visitedPages = (Stack<String>) attrExtractor
+ .getWikiSession().getAttribute(WikiSession.TRAIL);
+
+ if (visitedPages != null) {
+ for (String page : visitedPages) {
+ sb.append(" <a href='").append(
+ ConfigurationParser.getWikiContext()).append("/")
+ .append(page).append("'>").append(page).append("</a>");
+ }
+ }
+
+ return sb.toString();
+ }
}
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiDiff.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiDiff.java 2008-04-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiDiff.java 2008-04-19 13:14:41 UTC (rev 19642)
@@ -62,7 +62,7 @@
public void setAttrExtractor(AttributesExtractor attrExtractor) {
this.attrExtractor = attrExtractor;
- WikiHelper.getWikiCommonSession().update(attrExtractor);
+ // WikiHelper.getWikiCommonSession().update(attrExtractor);
}
public WikiDiff() {
@@ -90,9 +90,8 @@
.getCredentials(), wikiType, attrExtractor.getWikiSession());
WikiPage page = wikiEngine.getByName(WikiHelper.getWikiCommonSession()
- .getPageName(), wikiContext, WikiHelper.getWikiCommonSession()
- .getPageToDiff(), WikiHelper.getWikiCommonSession()
- .getLangCode());
+ .getPageName(), wikiContext, attrExtractor.getPageVersion(),
+ WikiHelper.getWikiCommonSession().getLangCode());
return page.getContent();
}
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2008-04-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2008-04-19 13:14:41 UTC (rev 19642)
@@ -90,7 +90,7 @@
public void setAttrExtractor(AttributesExtractor attrExtractor) {
this.attributesExtractor = attrExtractor;
- WikiHelper.getWikiCommonSession().update(attrExtractor);
+ //WikiHelper.getWikiCommonSession().update(attrExtractor);
if (wikiEngine != null && editSessionId == null) {
init();
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.java 2008-04-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.java 2008-04-19 13:14:41 UTC (rev 19642)
@@ -70,7 +70,7 @@
public void setAttrExtractor(AttributesExtractor attrExtractor) {
this.attrExtractor = attrExtractor;
- WikiHelper.getWikiCommonSession().update(attrExtractor);
+ //WikiHelper.getWikiCommonSession().update(attrExtractor);
}
public WikiPrefs() {
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2008-04-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2008-04-19 13:14:41 UTC (rev 19642)
@@ -78,7 +78,7 @@
public void setAttrExtractor(AttributesExtractor attrExtractor) {
this.attrExtractor = attrExtractor;
- WikiHelper.getWikiCommonSession().update(attrExtractor);
+ //WikiHelper.getWikiCommonSession().update(attrExtractor);
if (wikiEngine != null && currentPage == null) {
getCurrentPage();
@@ -173,7 +173,7 @@
}
}
- log.debug("page loaded: " + currentPage.getName());
+ log.debug("page loaded: " + currentPage);
return currentPage;
}
Deleted: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/log4j.properties
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/log4j.properties 2008-04-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/log4j.properties 2008-04-19 13:14:41 UTC (rev 19642)
@@ -1,9 +0,0 @@
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=INFO, A1
-
-# A1 is set to be a ConsoleAppender.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
Copied: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/log4j.properties.sample (from rev 19641, labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/log4j.properties.sample)
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/log4j.properties.sample (rev 0)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/classes/log4j.properties.sample 2008-04-19 13:14:41 UTC (rev 19642)
@@ -0,0 +1,9 @@
+# Set root logger level to DEBUG and its only appender to A1.
+log4j.rootLogger=INFO, A1
+
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
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-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml 2008-04-19 13:14:41 UTC (rev 19642)
@@ -47,7 +47,7 @@
<managed-bean>
<managed-bean-name>wikiCommon</managed-bean-name>
<managed-bean-class>org.jboss.wiki.ui.WikiCommonSession</managed-bean-class>
- <managed-bean-scope>session</managed-bean-scope>
+ <managed-bean-scope>request</managed-bean-scope>
</managed-bean>
<navigation-rule>
Modified: 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-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml 2008-04-19 13:14:41 UTC (rev 19642)
@@ -22,7 +22,9 @@
<t:inputFileUpload id="file"
value="#{wikiEdit.newFile}"
required="true"/>
- <t:commandButton value="#{msg.addFile}" action="#{wikiEdit.addFile}" />
+ <t:commandLink value="#{msg.addFile}" action="#{wikiEdit.addFile}">
+ <f:param name="page" value="#{wikiView.pageName}" />
+ </t:commandLink>
</h:panelGrid>
</h:panelGrid>
</h:form>
@@ -30,6 +32,7 @@
<h:form>
<h:commandLink action="goback">
<h:outputText value="#{msg.close}" />
+ <f:param name="page" value="#{wikiView.pageName}" />
</h:commandLink>
</h:form>
</h:panelGrid>
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-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_diff.xhtml 2008-04-19 13:14:41 UTC (rev 19642)
@@ -13,6 +13,7 @@
<h:form>
<h:commandLink action="goback">
<h:outputText value="#{msg.goback}" />
+ <f:param name="page" value="#{wikiView.pageName}" />
</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-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2008-04-19 13:14:41 UTC (rev 19642)
@@ -10,28 +10,38 @@
rendered="#{wikiEdit.lockMsg ne ''}">
<h:outputText value="#{wikiEdit.lockMsg}" />
</h:panelGrid>
-
- <h:panelGrid styleClass="wikiGreybkgSection" rendered="#{wikiEdit.previewAvailable}">
- <h:outputText value="#{msg.preview_scroll}" />
- </h:panelGrid>
+ <h:panelGrid styleClass="wikiGreybkgSection"
+ rendered="#{wikiEdit.previewAvailable}">
+ <h:outputText value="#{msg.preview_scroll}" />
+ </h:panelGrid>
+
<h:outputText value="#{wikiEdit.showEditHTML}" escape="false" />
<h:form acceptCharset="UTF-8">
<h:panelGrid styleClass="editPageArea">
<h:inputTextarea rows="40" cols="80" value="#{wikiEdit.pageContent}"
styleClass="editPageArea" />
<h:panelGroup styleClass="formbuttons">
- <h:commandButton styleClass="submit" value="#{msg.edit_save}"
- action="#{wikiEdit.save}" />
- <h:commandButton styleClass="submit" value="#{msg.edit_preview}"
- action="#{wikiEdit.preview}" />
- <h:commandButton styleClass="submit" value="#{msg.edit_cancel}"
- action="#{wikiEdit.cancel}" />
- <h:commandButton styleClass="submit" value="#{msg.edit_spellcheck}"
- onclick="openSpellChecker(); return false;" />
+ <h:commandLink styleClass="submit" value="#{msg.edit_save}"
+ action="#{wikiEdit.save}">
+ <f:param name="page" value="#{wikiCommon.pageName}" />
+ </h:commandLink>
+ <h:commandLink styleClass="submit" value="#{msg.edit_preview}"
+ action="#{wikiEdit.preview}">
+ <f:param name="page" value="#{wikiCommon.pageName}" />
+ </h:commandLink>
+ <h:commandLink styleClass="submit" value="#{msg.edit_cancel}"
+ action="#{wikiEdit.cancel}">
+ <f:param name="page" value="#{wikiCommon.pageName}" />
+ </h:commandLink>
+ <h:commandLink styleClass="submit" value="#{msg.edit_spellcheck}"
+ onclick="openSpellChecker(); return false;">
+ <f:param name="page" value="#{wikiCommon.pageName}" />
+ </h:commandLink>
</h:panelGroup>
</h:panelGrid>
<h:inputHidden value="#{wikiEdit.editSessionId}" />
+ <h:inputHidden value="#{wikiCommon.pageName}" />
</h:form>
<pre>
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-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml 2008-04-19 13:14:41 UTC (rev 19642)
@@ -49,6 +49,8 @@
<h:commandLink action="#{wikiDiff.diff}" rendered="#{hisElem.version > 1}" >
<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}" />
</h:commandLink>
</h:form>
</h:column>
@@ -57,6 +59,7 @@
<h:form>
<h:commandLink action="goback">
<h:outputText value="#{msg.goback}" />
+ <f:param name="page" value="#{wikiView.pageName}" />
</h:commandLink>
</h:form>
</ui:define>
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml 2008-04-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml 2008-04-19 13:14:41 UTC (rev 19642)
@@ -9,7 +9,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a4j="http://richfaces.org/a4j">
<head>
- <title></title>
+ <title>JBossWiki : #{wikiCommon.pageName}</title>
<link rel="stylesheet" href="#{wikiView.wikiImagesURL}wikiStyle.css" type="text/css" media="all" />
<c:if test="#{wikiCommon.userLoggedIn}">
<meta name='gwt:property' content='tagMeSet/wiki/#{wikiCommon.pageName}=/wiki/#{wikiCommon.pageName}' />
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-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2008-04-19 13:14:41 UTC (rev 19642)
@@ -1,75 +1,119 @@
-<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">
+<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"><ui:composition
+ template="wiki_template.xhtml">
-<ui:composition template="wiki_template.xhtml">
+ <ui:define name="content">
- <ui:define name="content">
+ <link rel="alternate" type="application/rss+xml"
+ title="JBoss Wiki: #{wikiView.pageName} RSS Feed"
+ href="#{wikiView.rssURL}" />
+ <link rel="alternate" type="application/atom+xml"
+ title="JBoss Wiki: #{wikiView.pageName} ATOM Feed"
+ href="#{wikiView.atomURL}" />
+ <link rel="alternate" type="application/rss+xml"
+ title="JBoss Wiki: #{wikiView.pageName} RDF Feed"
+ href="#{wikiView.rdfURL}" />
- <link rel="alternate" type="application/rss+xml" title="JBoss Wiki: #{wikiView.pageName} RSS Feed" href="#{wikiView.rssURL}" />
- <link rel="alternate" type="application/atom+xml" title="JBoss Wiki: #{wikiView.pageName} ATOM Feed" href="#{wikiView.atomURL}" />
- <link rel="alternate" type="application/rss+xml" title="JBoss Wiki: #{wikiView.pageName} RDF Feed" href="#{wikiView.rdfURL}" />
+ <h:panelGrid columns="8">
+ <h:panelGroup>
+ <h:outputText value="[" />
+ <h:outputLink value="#{wikiView.wikiFriendlyURL}">
+ <h:outputText value="#{msg.permalink}" />
+ </h:outputLink>
+ <h:outputText value="]" />
+ </h:panelGroup>
- <h:panelGrid columns="8">
- <h:panelGroup>
- <h:outputText value="["/><h:outputLink value="#{wikiView.wikiFriendlyURL}"><h:outputText value="#{msg.permalink}" /></h:outputLink><h:outputText value="]"/>
- </h:panelGroup>
+ <h:panelGroup>
+ <h:form>
+ <h:outputText value="[" />
+ <h:commandLink action="recentChanges">
+ <f:param name="type" value="recentChanges" />
+ <h:outputText value="#{msg.recentChanges}" />
+ </h:commandLink>
+ <h:outputText value="]" />
+ </h:form>
+ </h:panelGroup>
- <h:panelGroup><h:form>
- <h:outputText value="["/>
- <h:commandLink action="recentChanges">
- <f:param name="type" value="recentChanges" />
- <h:outputText value="#{msg.recentChanges}"/>
- </h:commandLink>
- <h:outputText value="]"/>
- </h:form></h:panelGroup>
+ <h:panelGroup>
+ <h:form rendered="#{wikiCommon.userLoggedIn}">
+ <h:outputText value="[" />
+ <h:commandLink action="edit" charset="utf-8">
+ <c:if test="#{wikiView.pageVersion ne null}">
+ <f:param name="version" value="#{wikiView.pageVersion}" />
+ </c:if>
+ <f:param name="page" value="#{wikiView.pageName}" />
- <h:panelGroup><h:form rendered="#{wikiCommon.userLoggedIn}">
- <h:outputText value="["/><h:commandLink action="edit" charset="utf-8">
- <c:if test="#{wikiView.pageVersion ne null}">
- <f:param name="version" value="#{wikiView.pageVersion}" />
- </c:if>
- <f:param name="page" value="#{wikiView.pageName}" id="pageParam" />
+ <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}" />
+ </h:commandLink>
+ <h:outputText value="] " />
+ </h:form>
+ </h:panelGroup>
- <h:outputText value="#{msg.edit}" />
- </h:commandLink>
- <h:outputText value="] [" />
- <h:commandLink action="attach">
- <h:outputText value="#{msg.attach}" />
- </h:commandLink>
- <h:outputText value="] " />
- </h:form></h:panelGroup>
-
- <h:panelGroup><h:form>
+ <h:panelGroup>
+ <h:form>
<h:outputText value="[" />
<h:commandLink action="history">
<h:outputText value="#{msg.history}" />
+ <f:param name="page" value="#{wikiView.pageName}" />
</h:commandLink>
- <h:outputText value="]"/>
- </h:form></h:panelGroup>
+ <h:outputText value="]" />
+ </h:form>
+ </h:panelGroup>
- <h:panelGroup>
- <h:outputText value="["/><h:outputLink value="#{wikiView.rssURL}" styleClass="standardFeedLink" ><h:outputText value="#{msg.rss}" /></h:outputLink><h:outputText value="]"/>
- </h:panelGroup>
+ <h:panelGroup>
+ <h:outputText value="[" />
+ <h:outputLink value="#{wikiView.rssURL}"
+ styleClass="standardFeedLink">
+ <h:outputText value="#{msg.rss}" />
+ <f:param name="page" value="#{wikiView.pageName}" />
+ </h:outputLink>
+ <h:outputText value="]" />
+ </h:panelGroup>
- <h:panelGroup>
- <h:outputText value="["/><h:outputLink value="#{wikiView.rdfURL}" styleClass="standardFeedLink" ><h:outputText value="#{msg.rdf}" /></h:outputLink><h:outputText value="]"/>
- </h:panelGroup>
+ <h:panelGroup>
+ <h:outputText value="[" />
+ <h:outputLink value="#{wikiView.rdfURL}"
+ styleClass="standardFeedLink">
+ <h:outputText value="#{msg.rdf}" />
+ <f:param name="page" value="#{wikiView.pageName}" />
+ </h:outputLink>
+ <h:outputText value="]" />
+ </h:panelGroup>
- <h:panelGroup>
- <h:outputText value="["/><h:outputLink value="#{wikiView.atomURL}" styleClass="standardFeedLink" ><h:outputText value="#{msg.atom}" /></h:outputLink><h:outputText value="]"/>
- </h:panelGroup>
+ <h:panelGroup>
+ <h:outputText value="[" />
+ <h:outputLink value="#{wikiView.atomURL}"
+ styleClass="standardFeedLink">
+ <h:outputText value="#{msg.atom}" />
+ <f:param name="page" value="#{wikiView.pageName}" />
+ </h:outputLink>
+ <h:outputText value="]" />
+ </h:panelGroup>
- <h:panelGroup>
- <h:outputText value="["/><h:outputLink value="http://false.link.print.to" onclick="#{wikiView.printURL}"><h:outputText value="#{msg.print}"/></h:outputLink><h:outputText value="]"/>
- </h:panelGroup>
+ <h:panelGroup>
+ <h:outputText value="[" />
+ <h:outputLink value="http://false.link.print.to"
+ onclick="#{wikiView.printURL}">
+ <h:outputText value="#{msg.print}" />
+ <f:param name="page" value="#{wikiView.pageName}" />
+ </h:outputLink>
+ <h:outputText value="]" />
+ </h:panelGroup>
</h:panelGrid>
- <h:panelGrid styleClass="wikiGreybkgSection" rendered="#{wikiView.otherVersion}" >
+ <h:panelGrid styleClass="wikiGreybkgSection"
+ rendered="#{wikiView.otherVersion}">
<h:panelGroup>
- <h:outputText value="#{msg.thisIsVer} #{wikiView.pageVersion} #{msg.ofPage} " />
+ <h:outputText
+ value="#{msg.thisIsVer} #{wikiView.pageVersion} #{msg.ofPage} " />
<h:outputLink value="#{wikiView.wikiFriendlyURL}">
<h:outputText value="#{wikiCommon.pageName}" />
</h:outputLink>
@@ -81,14 +125,18 @@
<hr />
- <h:panelGroup styleClass="wikiContent">
- <h:outputText value="#{wikiView.pageContent}" escape="false"/>
+ <div class="wikiYourTrail">
+ Your trail: <h:outputText value="#{wikiCommon.visitedPagesHrefs}" escape="false" />
+ </div>
+
+ <h:panelGroup styleClass="wikiContent">
+ <h:outputText value="#{wikiView.pageContent}" escape="false" />
</h:panelGroup>
<hr />
- <h:outputText styleClass="lastEdited" value="#{msg.pageLastChanged} #{wikiView.date} #{msg.by} #{wikiView.lastAuthor}" />
- </ui:define>
+ <h:outputText styleClass="lastEdited"
+ value="#{msg.pageLastChanged} #{wikiView.date} #{msg.by} #{wikiView.lastAuthor}" />
+ </ui:define>
-</ui:composition>
-</div>
+</ui:composition></div>
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiSession.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiSession.java 2008-04-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiSession.java 2008-04-19 13:14:41 UTC (rev 19642)
@@ -28,6 +28,7 @@
public static final String HOST_URL = "hostURL";
public static final String IS_SECURE = "isSecure";
public static final String APP_CONTEXT = "appContext";
+ public static final String TRAIL = "trail";
public Object getAttribute(String attributeName);
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-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiType.java 2008-04-19 13:14:41 UTC (rev 19642)
@@ -123,7 +123,8 @@
.getLangCode());
// if page is cached, just change it's content
- if (cached && cachedPages.get(key) != null) {
+ if (wikiPage.getVersion() == wikiPage.getLastVersion() && cached
+ && cachedPages.get(key) != null) {
newPage.setContent(cachedPages.get(key));
} else {
// if not - execute the plugins
@@ -133,7 +134,7 @@
newPage = (plugins.get(i)).process(newPage, wikiSession);
}
- if (cached)
+ if (cached && wikiPage.getVersion() == wikiPage.getLastVersion())
cachedPages.put(key, newPage.getContent());
}
Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/TrailPlugin.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/TrailPlugin.java 2008-04-19 13:06:49 UTC (rev 19641)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/TrailPlugin.java 2008-04-19 13:14:41 UTC (rev 19642)
@@ -38,7 +38,7 @@
System.err.println(e);
}
- StringBuffer trail = new StringBuffer("<li>").append(
+ /*StringBuffer trail = new StringBuffer("<li>").append(
HTMLTranslatorParts.pagePartRegexStart).append("[").append(
wikiEngine.getUid(newPage.getName(), newPage.getLangCode()))
.append("] ").append(HTMLTranslatorParts.pagePartRegexEnd)
@@ -63,9 +63,10 @@
"<div class=\"wikiYourTrail\">").append("</ul></div>\n<br />\n")
.append(HTMLTranslatorParts.pagePartRegexStart).append(
newPage.getContent()).append(
- HTMLTranslatorParts.pagePartRegexEnd);
+ HTMLTranslatorParts.pagePartRegexEnd);*/
+
- newPage.setContent(trail.toString());
+ newPage.setContent(HTMLTranslatorParts.pagePartRegexStart + newPage.getContent() + HTMLTranslatorParts.pagePartRegexEnd);
return newPage;
}
More information about the jboss-svn-commits
mailing list