Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r927 - in trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki: . fileaccess plugins
|
From: <jbo...@li...> - 2005-08-23 17:18:51
|
Author: szimano
Date: 2005-08-23 13:18:42 -0400 (Tue, 23 Aug 2005)
New Revision: 927
Removed:
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypeDescriptor.java
Modified:
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiContext.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/WikiPlugin.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachementListPlugin.java
Log:
some changes...
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiContext.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiContext.java 2005-08-23 15:52:54 UTC (rev 926)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiContext.java 2005-08-23 17:18:42 UTC (rev 927)
@@ -14,10 +14,8 @@
* @author <a href="mailto:tom...@jb...">Tomasz Szymanski</a>
* @version $Id$
*/
-import java.util.Date;
-
+
import org.jboss.portal.core.model.User;
-import org.jboss.wiki.plugins.HTMLTranslator;
/**
* <p></p>
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-23 15:52:54 UTC (rev 926)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java 2005-08-23 17:18:42 UTC (rev 927)
@@ -10,13 +10,9 @@
import java.util.Date;
import java.util.HashMap;
-import java.util.Map;
-
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.jboss.wiki.plugins.DifferenceEngine;
-import org.xml.sax.SAXException;
/**
*
@@ -34,32 +30,15 @@
/**
* <p>
- * Represents ...
* </p>
*
*/
- private String urlBase;
-
- /**
- * <p>
- * Represents ...
- * </p>
- *
- */
- private Map wikiTypePlugins;
-
- /**
- * <p>
- * </p>
- *
- */
private HashMap<String, WikiPage> pages;
private HashMap<String, WikiType> wikiTypes;
private MediaDataSource mediaDataSource;
- private String wikiID = (new Date()).toString();
/**
* <p>
* Does ...
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java 2005-08-23 15:52:54 UTC (rev 926)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java 2005-08-23 17:18:42 UTC (rev 927)
@@ -8,7 +8,6 @@
*************************************************/
package org.jboss.wiki;
-import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
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-23 15:52:54 UTC (rev 926)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java 2005-08-23 17:18:42 UTC (rev 927)
@@ -12,7 +12,6 @@
import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import java.util.Set;
import javax.portlet.*;
import org.jboss.portlet.*;
@@ -71,8 +70,8 @@
// write the uploaded file to a new location
String fieldName = item.getFieldName();
String fileName = item.getName();
- String contentType = item.getContentType();
- long size = item.getSize();
+ //String contentType = item.getContentType();
+ //long size = item.getSize();
/*
* rResp .setRenderParameter("size",
* Long.toString(size));
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-23 15:52:54 UTC (rev 926)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java 2005-08-23 17:18:42 UTC (rev 927)
@@ -8,8 +8,6 @@
*************************************************/
package org.jboss.wiki;
-import java.util.List;
-import java.util.Set;
import java.util.Vector;
/**
@@ -31,55 +29,14 @@
/**
* <p>
- * Represents ...
* </p>
*
*/
- protected List pluginChain;
-
- /**
- * <p>
- * </p>
- *
- */
- protected WikiTypeDescriptor wikiTypeDescriptor;
-
- /**
- * <p>
- * </p>
- *
- */
protected WikiContext wikiContext;
protected Vector<WikiPlugin> plugins = new Vector<WikiPlugin>();
- /**
- * <p>
- * Does ...
- * </p>
- *
- *
- * @return
- */
- public void getPluginChain() {
- // your code here
- // return null;
- }
- /**
- * <p>
- * Does ...
- * </p>
- *
- *
- * @return
- */
-
- public void initPluginChain() {
- // your code here
- // return null;
- }
-
public void addPlugin(String pluginName, String pluginClass) {
WikiPlugin plugin = null;
@@ -109,14 +66,17 @@
/**
* <p>
- * Does ...
+ * Processes given WikiPage with the apropriate plugins, connected to this WikiType
* </p>
*
*
- * @return
- * @param content
+ * @return processed WikiPage (copy - not exact reference)
+ * @param wikiPage page to process
+ * @param wikiSession current session
*/
public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) {
+ // process through all plugins
+
WikiPage newPage = null;
try {
Deleted: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypeDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypeDescriptor.java 2005-08-23 15:52:54 UTC (rev 926)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypeDescriptor.java 2005-08-23 17:18:42 UTC (rev 927)
@@ -1,31 +0,0 @@
-/**************************************************
- * *
- * JBoss Labs: Creating Professional Open Source *
- * *
- * Distributable under LGPL license. *
- * See terms of license at gnu.org. *
- * *
- *************************************************/
- package org.jboss.wiki;
-
-import java.util.List;
-
- /**
- *
- * @author <a href="mailto:ds...@jb...">Damon Sicore</a>
- * @author <a href="mailto:tom...@jb...">Tomasz Szymanski</a>
- * @version $Id$
- */
-public class WikiTypeDescriptor {
-
-/**
- * <p>Represents ...</p>
- *
- */
- private List pluginNameList;
-/**
- * <p></p>
- *
- */
- public WikiType wikiType;
- }
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-08-23 15:52:54 UTC (rev 926)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-08-23 17:18:42 UTC (rev 927)
@@ -29,11 +29,12 @@
// import org.jboss.forge.common.ForgeHelper;
/**
- * A filter that enables to download files which are stored in a working copy of
- * a content repository.
+ * A filter that enables to download files form the jspwiki structure
*
- * @author adamw
+ * @author tomek
*/
+
+
public class WikiFileAccessFilter implements Filter {
/**
* <code>BUF_SIZE</code> - size of a buffer, which is used while reading a
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachementListPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachementListPlugin.java 2005-08-23 15:52:54 UTC (rev 926)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachementListPlugin.java 2005-08-23 17:18:42 UTC (rev 927)
@@ -1,3 +1,12 @@
+/**************************************************
+ * *
+ * JBoss Labs: Creating Professional Open Source *
+ * *
+ * Distributable under LGPL license. *
+ * See terms of license at gnu.org. *
+ * *
+ *************************************************/
+
package org.jboss.wiki.plugins;
import java.util.Set;
|
