[jboss-svn-commits] JBL Code SVN: r19647 - in labs/jbosslabs/qa/portal-extensions: jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2008-04-20 04:31:22 -0400 (Sun, 20 Apr 2008)
New Revision: 19647

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/fileaccess/WikiFileAccessFilter.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/web/views/wiki_edit.xhtml
Log:
svn merge -r 19641:19646 https://svn.labs.jboss.com/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-20 08:26:22 UTC (rev 19646)
+++ labs/jbosslabs/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/delegating/page/WikiCF.java	2008-04-20 08:31:22 UTC (rev 19647)
@@ -116,10 +116,10 @@
 					&& invocation.getServerContext() != null
 					&& invocation.getServerContext().getBodyParameterMap() != null && invocation
 					.getServerContext().getBodyParameterMap().get("page") != null)) {
-				log.info("\nSeting page Main\n");
+				log.debug("\nSeting page Main\n");
 				params.put("page", "Main");
 			} else {
-				log.info("\nPage set to: "
+				log.debug("\nPage set to: "
 						+ invocation.getServerContext().getBodyParameterMap()
 								.get("page") + "\n");
 			}

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 08:26:22 UTC (rev 19646)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java	2008-04-20 08:31:22 UTC (rev 19647)
@@ -155,6 +155,7 @@
 							+ request.getServerPort());
 
 			wikiSession.setAttribute(WikiSession.HOST_URL, hostURL);
+			wikiSession.setAttribute(WikiSession.APP_CONTEXT, ConfigurationParser.getWikiContext());
 
 			String requestURI = URLDecoder.decode(httpRequest.getRequestURI(),
 					"UTF-8");

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-20 08:26:22 UTC (rev 19646)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java	2008-04-20 08:31:22 UTC (rev 19647)
@@ -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();
@@ -189,6 +189,10 @@
 			getWikiPage(true).unlock(attributesExtractor.getCredentials(),
 					editSessionId);
 
+			wikiEngine.refreshPage(WikiHelper.getWikiCommonSession()
+					.getPageName(), WikiHelper.getWikiCommonSession()
+					.getLangCode());
+
 		} catch (EditSessionExpired e) {
 			log.error(e);
 			return "error";
@@ -332,7 +336,7 @@
 		previPage.setContent(pageContent);
 
 		wikiEngine.refreshPage(previPage.getName(), previPage.getLangCode());
-		
+
 		return wikiEngine.getWikiType("htmlClear").process(previPage,
 				attributesExtractor.getWikiSession()).getContent();
 	}

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 08:26:22 UTC (rev 19646)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml	2008-04-20 08:31:22 UTC (rev 19647)
@@ -26,14 +26,17 @@
 						action="#{wikiEdit.save}">
 						<f:param name="page" value="#{wikiCommon.pageName}" />
 					</h:commandLink>
+					<h:outputText value=" "/>
 					<h:commandLink styleClass="submit" value="#{msg.edit_preview}"
 						action="#{wikiEdit.preview}">
 						<f:param name="page" value="#{wikiCommon.pageName}" />
 					</h:commandLink>
+					<h:outputText value=" "/>
 					<h:commandLink styleClass="submit" value="#{msg.edit_cancel}"
 						action="#{wikiEdit.cancel}">
 						<f:param name="page" value="#{wikiCommon.pageName}" />
 					</h:commandLink>
+					<h:outputText value=" "/>
 					<h:commandLink styleClass="submit" value="#{msg.edit_spellcheck}"
 						onclick="openSpellChecker(); return false;">
 						<f:param name="page" value="#{wikiCommon.pageName}" />