[jboss-svn-commits] JBL Code SVN: r15538 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki: forge-wiki/src/java/org/jboss/wiki/ui and 1 other directories.

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

Author: szimano
Date: 2007-10-03 07:51:07 -0400 (Wed, 03 Oct 2007)
New Revision: 15538

Modified:
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java
Log:
weird problem with edit in wiki

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java	2007-10-03 11:01:52 UTC (rev 15537)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java	2007-10-03 11:51:07 UTC (rev 15538)
@@ -82,6 +82,7 @@
 
 		log.debug("edit");
 		nonFacesRequest(request, response, EDIT_VIEW);
+		renderCleanup(request);
 	}
 
 	@Override
@@ -109,6 +110,7 @@
 			log.debug("performing nonFacesRender");
 			setPortletRequestFlag(request);
 			nonFacesRequest(request, response, getInitParameter(DEFAULT_VIEW));
+			renderCleanup(request);
 			return;
 		}
 

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	2007-10-03 11:01:52 UTC (rev 15537)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java	2007-10-03 11:51:07 UTC (rev 15538)
@@ -125,7 +125,7 @@
 
 		WikiPage wikiPage = null;
 
-		log.info("Page version: " + attributesExtractor.getPageVersion());
+		log.debug("Page version: " + attributesExtractor.getPageVersion());
 		if (attributesExtractor.getPageVersion() != null) {
 			log.info("getting page at version: "
 					+ attributesExtractor.getPageVersion());

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java	2007-10-03 11:01:52 UTC (rev 15537)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java	2007-10-03 11:51:07 UTC (rev 15538)
@@ -1,5 +1,4 @@
 /*
- * JBoss, Home of Professional Open Source
  * Copyright 2005, JBoss Inc., and individual contributors as indicated
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
@@ -328,7 +327,7 @@
 			// page isn't locked or lock expired. Lets lock it.
 			this.lockTime = now;
 			this.lockUser = user.getName();
-			log.info("LOCK: " + lockUser);
+			log.debug("LOCK: " + lockUser);
 			retDate = null;
 		}