[Jboss-svn-commits] JBL Code SVN: r1520 - in trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki: . plugins

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

Author: szimano
Date: 2005-11-05 09:05:02 -0500 (Sat, 05 Nov 2005)
New Revision: 1520

Modified:
   trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuDataSource.java
   trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RecentlyChangedPagesPlugin.java
Log:
shotoku tests


Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuDataSource.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuDataSource.java	2005-11-05 11:39:15 UTC (rev 1519)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuDataSource.java	2005-11-05 14:05:02 UTC (rev 1520)
@@ -30,6 +30,7 @@
 import java.io.OutputStream;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
@@ -37,6 +38,7 @@
 import org.jboss.logging.Logger;
 import org.jboss.shotoku.ContentManager;
 import org.jboss.shotoku.Node;
+import org.jboss.shotoku.NodeList;
 import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
 import org.jboss.wiki.exceptions.DataSourceException;
 import org.jboss.wiki.exceptions.PageRenamingException;
@@ -56,6 +58,8 @@
 	private ContentManager contentManager = null;
 
 	private final String propsName = "shotoku.properties";
+	
+	private final String pageSuffix = ".txt";
 
 	public ShotokuDataSource() throws DataSourceException {
 		Properties shotokuProps = new Properties();
@@ -93,29 +97,17 @@
 	}
 
 	public WikiPage getPage(String pageName) {
-		StringBuffer pageContent = new StringBuffer();
-
+	
 		try {
-			Node page = contentManager.getNode(pageName + ".txt");
+			Node page = contentManager.getNode(pageName + pageSuffix);
 			
-			InputStream is = page.getContentInputStream();
-			
-			while (is.available() > 0) {
-				pageContent.append((char)is.read());
-			}
-			
-			is.close();
-			
 			return new WikiPage(pageName, new SimpleCredentials("someone"),
-					pageContent.toString(), 1, 1, new Date(page
+					page.getContent(), page.getHistory().getRevisionsCount(), page.getHistory().getRevisionsCount(), new Date(page
 							.getLastModfication()), wikiEngine, true, true);
 			
 		} catch (ResourceDoesNotExist e) {
 			return null;
 		}
-		catch (IOException ee) {
-			return null;
-		}
 	}
 
 	public boolean postGet() {
@@ -156,8 +148,18 @@
 	}
 
 	public Set<String> getAllPageNames() {
-		// TODO Auto-generated method stub
-		return null;
+		//TODO bleble
+		Set<String> ret = new TreeSet<String>();
+		
+		List<Node> nodeList = contentManager.getDirectory("").getNodes().toList();
+		
+		for (Node node : nodeList) {
+			if (node.getName().endsWith(pageSuffix)) {
+				ret.add(node.getName().substring(0, node.getName().length() - (pageSuffix.length())));
+			}
+		}
+		
+		return ret;
 	}
 
 	public Set<String> getPagesFor(String pageName) {

Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RecentlyChangedPagesPlugin.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RecentlyChangedPagesPlugin.java	2005-11-05 11:39:15 UTC (rev 1519)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RecentlyChangedPagesPlugin.java	2005-11-05 14:05:02 UTC (rev 1520)
@@ -50,6 +50,8 @@
 
 		Set<String> pages = wikiEngine.getAllPageNames();
 
+		log.info("GOT PAGE NAMES");
+		
 		TreeMap<String, TreeSet<String>> sortedByDate = new TreeMap<String, TreeSet<String>>();
 
 		// get now date
@@ -58,6 +60,7 @@
 		now.setTime(new Date());
 
 		for (String name : pages) {
+			log.info("getting page: " +name);
 			WikiPage temp = wikiEngine.getByName(name, null);
 
 			//log.debug("name: "+name+" "+temp.getName());