[Jboss-svn-commits] JBL Code SVN: r889 - in trunk/forge/portal-extensions/forge-wiki/src: java/org/jboss/wiki web/WEB-INF/jsp

[<jbo...@li...>]

Author: szimano
Date: 2005-08-17 12:30:41 -0400 (Wed, 17 Aug 2005)
New Revision: 889

Modified:
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
   trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp
Log:
new page creation works


Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java	2005-08-17 16:10:07 UTC (rev 888)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java	2005-08-17 16:30:41 UTC (rev 889)
@@ -149,6 +149,8 @@
 				
 				properties.store(pageWriter, "Saved by FileDataSource of JBoss Wiki");
 				
+				pageWriter.close();
+				
 				pageWriter = new FileOutputStream(new File(pathToMedia+"/"+page.getName()+".txt"));
 				
 				String pageContent = page.getContent();
@@ -157,6 +159,8 @@
 					pageWriter.write((int) pageContent.charAt(i));
 				}
 				
+				pageWriter.close();
+				
 				status = true;
 			}
 			catch (Exception e) {

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java	2005-08-17 16:10:07 UTC (rev 888)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java	2005-08-17 16:30:41 UTC (rev 889)
@@ -305,5 +305,11 @@
 
 		System.out.println(wp.getContent());
 	}
+	
+	public void refreshPage(String pageName) {
+		if (pages.containsKey(pageName)) {
+			pages.remove(pageName);
+		}
+	}
 
 }

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-17 16:10:07 UTC (rev 888)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-17 16:30:41 UTC (rev 889)
@@ -90,8 +90,11 @@
 				// set new data
 				edPage.setEditDate(new Date());
 
-				// finnaly save the page
+				// save the page
 				edPage.save();
+				
+				// and finally remove old page object from memory to force reloading it
+				wikiEngine.refreshPage(edPage.getName());
 			}
 		}
 

Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp	2005-08-17 16:10:07 UTC (rev 888)
+++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Edit.jsp	2005-08-17 16:30:41 UTC (rev 889)
@@ -29,14 +29,44 @@
 <hr />
 <div style="color:#FF0000"><%=lockMsg%></div>
 <form method="post" action="<%=actionURL%>">
-<textarea name="wikiContent" rows="40" cols="80" style="width:100%;">
-
-	<%=wikiContent%>
-
-</textarea>
+<textarea name="wikiContent" rows="40" cols="80" style="width:100%;"><%=wikiContent%></textarea>
 <input type="hidden" name="editedPage" value="<%=wikiPage%>" />
 <input type="hidden" name="page" value="<%=wikiPage%>" />
 <input type="submit" value="Save" name="editAction" />
 <input type="submit" value="Preview" name="editAction" />
 <input type="submit" value="Cancel" name="editAction" />
 </form>
+Here's a short reminder on what elements you have at your disposal:
+<PRE>
+----             Horizontal ruler
+\\               Forced line break
+[link]           Create hyperlink to "link", where "link" can be either an internal 
+                 WikiName or an external link (http://)
+[text|link]      Create a hyperlink where the link text is different from the actual 
+                 hyperlink link.
+[text|wiki:link] Create a hyperlink where the link text is different from the 
+                 actual hyperlink link, and the hyperlink points to a named Wiki. 
+                 This supports interWiki linking.
+
+*                Make a bulleted list (must be in first column). Use more (**) 
+                 for deeper indentations.
+#                Make a numbered list (must be in first column). Use more (##, ###) 
+                 for deeper indentations.
+
+!, !!, !!!       Start a line with an exclamation mark (!) to make a heading. 
+                 More exclamation marks mean bigger headings.
+
+__text__         Makes text bold.
+''text''         Makes text in italics (notice that these are single quotes ('))
+{{text}}         Makes text in monospaced font.
+;term:def        Defines 'term' with 'def'.  Use this with empty 'term' to make short comments.
+
+|text|more text| Makes a table. Double bars for a table heading.
+</PRE>
+<P>
+Don't try to use HTML, since it just won't work.
+<P>
+To embed images just put them available on the web using one of the approved formats, and they will get inlined automatically.
+
+<P>
+To make a code block, use triple {'s to open, and triple }'s to close.