[jboss-svn-commits] JBL Code SVN: r19641 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki: forge-wiki/src/web/WEB-INF and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Apr 19 09:06:49 EDT 2008
Author: szimano
Date: 2008-04-19 09:06:49 -0400 (Sat, 19 Apr 2008)
New Revision: 19641
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/WikiDiff.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.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/faces-config.xml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_diff.xhtml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiSession.java
Log:
no more error prone session bean. wiki fixed with writing on other content
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 2008-04-19 09:44:36 UTC (rev 19640)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2008-04-19 13:06:49 UTC (rev 19641)
@@ -22,12 +22,11 @@
package org.jboss.wiki.ui;
-import java.util.List;
import java.util.Map;
import java.util.Stack;
-import java.util.Vector;
import org.apache.log4j.Logger;
+import org.jboss.wiki.WikiSession;
import org.jboss.wiki.attributesextractor.AttributesExtractor;
import org.jboss.wiki.configuration.ConfigurationParser;
@@ -52,8 +51,6 @@
private Map<String, Integer> searchResults;
- private Stack<String> visitedPages = new Stack<String>();
-
@Inject
public void setAttrExtractor(AttributesExtractor attrExtractor) {
this.attrExtractor = attrExtractor;
@@ -65,7 +62,7 @@
}
- public void update(AttributesExtractor attrExtractor) {
+ private void update(AttributesExtractor attrExtractor) {
if (attrExtractor.getRequestedPageName() != null
&& attrExtractor.getRequestedPageName().length() > 0) {
pageName = attrExtractor.getRequestedPageName();
@@ -77,10 +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 {
@@ -134,10 +141,15 @@
public String getVisitedPagesHrefs() {
StringBuilder sb = new StringBuilder();
- for (String page : visitedPages) {
- sb.append(" <a href='").append(
- ConfigurationParser.getWikiContext()).append("/").append(
- page).append("'>").append(page).append("</a>");
+ 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/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiDiff.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiDiff.java 2008-04-19 09:44:36 UTC (rev 19640)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiDiff.java 2008-04-19 13:06:49 UTC (rev 19641)
@@ -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/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2008-04-19 09:44:36 UTC (rev 19640)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2008-04-19 13:06:49 UTC (rev 19641)
@@ -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/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.java 2008-04-19 09:44:36 UTC (rev 19640)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiPrefs.java 2008-04-19 13:06:49 UTC (rev 19641)
@@ -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/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 2008-04-19 09:44:36 UTC (rev 19640)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2008-04-19 13:06:49 UTC (rev 19641)
@@ -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;
}
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 2008-04-19 09:44:36 UTC (rev 19640)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/WEB-INF/faces-config.xml 2008-04-19 13:06:49 UTC (rev 19641)
@@ -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/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml 2008-04-19 09:44:36 UTC (rev 19640)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml 2008-04-19 13:06:49 UTC (rev 19641)
@@ -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/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_diff.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_diff.xhtml 2008-04-19 09:44:36 UTC (rev 19640)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_diff.xhtml 2008-04-19 13:06:49 UTC (rev 19641)
@@ -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/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml 2008-04-19 09:44:36 UTC (rev 19640)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml 2008-04-19 13:06:49 UTC (rev 19641)
@@ -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/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2008-04-19 09:44:36 UTC (rev 19640)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2008-04-19 13:06:49 UTC (rev 19641)
@@ -51,6 +51,7 @@
<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>
@@ -61,6 +62,7 @@
<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>
@@ -71,6 +73,7 @@
<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>
@@ -80,6 +83,7 @@
<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>
@@ -89,6 +93,7 @@
<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>
@@ -98,6 +103,7 @@
<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>
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 2008-04-19 09:44:36 UTC (rev 19640)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiSession.java 2008-04-19 13:06:49 UTC (rev 19641)
@@ -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);
More information about the jboss-svn-commits
mailing list