Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r882 - in trunk/forge/portal-extensions/forge-wiki: . src src/etc src/etc/org src/etc/org/jboss src/etc/org/jboss/wiki src/java/org/jboss/wiki src/java/org/jboss/wiki/plugins
Author: szimano
Date: 2005-08-17 11:22:57 -0400 (Wed, 17 Aug 2005)
New Revision: 882
Added:
trunk/forge/portal-extensions/forge-wiki/src/etc/
trunk/forge/portal-extensions/forge-wiki/src/etc/org/
trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/
trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/
trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml
trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/filedatasource.properties
trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties
Removed:
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypes.xml
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties
Modified:
trunk/forge/portal-extensions/forge-wiki/project.xml
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypeHandler.java
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java
Log:
wiki prop files moved to /src/etc + added wikiPlugins.properties
Modified: trunk/forge/portal-extensions/forge-wiki/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/project.xml 2005-08-17 13:45:27 UTC (rev 881)
+++ trunk/forge/portal-extensions/forge-wiki/project.xml 2005-08-17 15:22:57 UTC (rev 882)
@@ -42,4 +42,18 @@
<version>3.8.1</version>
<jar>javax.servlet.jsp.jar</jar>
</dependency>
+
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/etc/</directory>
+ <include>**/*.properties</include>
+ </resource>
+ <resource>
+ <directory>src/etc/</directory>
+ <include>**/*.xml</include>
+ </resource>
+ </resources>
+ </build>
</project>
Added: trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml 2005-08-17 13:45:27 UTC (rev 881)
+++ trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml 2005-08-17 15:22:57 UTC (rev 882)
@@ -0,0 +1,22 @@
+<!--
+ JBoss, the OpenSource J2EE webOS
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+ -->
+
+<wikiTypes>
+ <wikiType>
+ <name>HTML</name>
+ <class>org.jboss.wiki.plugins.HTMLWikiType</class>
+ <plugin>
+ <name>wikiToHtmlTranslator</name>
+ <class>org.jboss.wiki.plugins.HTMLTranslator</class>
+ </plugin>
+
+ <!--<plugin>
+ <name>trail</name>
+ <class>org.jboss.wiki.plugins.TrailPlugin</class>
+ </plugin>-->
+
+ </wikiType>
+</wikiTypes>
\ No newline at end of file
Added: trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/filedatasource.properties
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/filedatasource.properties 2005-08-17 13:45:27 UTC (rev 881)
+++ trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/filedatasource.properties 2005-08-17 15:22:57 UTC (rev 882)
@@ -0,0 +1,4 @@
+# FileDataSource configuration file
+
+# pathToMedia - points, where JSPWiki file structure is situated
+pathToMedia = /usr/local/forge/wiki
Added: trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties 2005-08-17 13:45:27 UTC (rev 881)
+++ trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties 2005-08-17 15:22:57 UTC (rev 882)
@@ -0,0 +1,2 @@
+# WikiPlugin properties. Use it wise.
+htmlTranslatorURL = http://localhost:8080/portal/
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-17 13:45:27 UTC (rev 881)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java 2005-08-17 15:22:57 UTC (rev 882)
@@ -8,6 +8,10 @@
*************************************************/
package org.jboss.wiki;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
/**
* <p></p>
*
@@ -21,6 +25,10 @@
public abstract class WikiPlugin {
protected WikiEngine wikiEngine;
+
+ private Properties pluginProps;
+
+ final static String propFileName = "wikiPlugins.properties";
/**
* <p></p>
*
@@ -49,6 +57,25 @@
public void setWikiEngine(WikiEngine wikiEngine) {
this.wikiEngine = wikiEngine;
+
+ // we can treat it as "init" function - it's executed after creating instance of plugin
+ // load props
+
+ pluginProps = new Properties();
+
+ try {
+
+ InputStream propsStream = FileDataSource.class.getResourceAsStream(propFileName);
+
+ pluginProps.load(propsStream);
+ }
+ catch (Exception e) {
+ System.err.println("[WikiPlugin]: Cannot load WikiPlugin property file: "+e);
+ }
}
+
+ protected String getProperty(String propertyName) {
+ return pluginProps.getProperty(propertyName);
+ }
}
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypeHandler.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypeHandler.java 2005-08-17 13:45:27 UTC (rev 881)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypeHandler.java 2005-08-17 15:22:57 UTC (rev 882)
@@ -26,8 +26,6 @@
public class WikiTypeHandler extends DefaultHandler {
- private String lastWikiType = "";
-
private Stack<String> elements = new Stack<String>();
private boolean isInsidePlugin = false;
Deleted: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypes.xml
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypes.xml 2005-08-17 13:45:27 UTC (rev 881)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiTypes.xml 2005-08-17 15:22:57 UTC (rev 882)
@@ -1,22 +0,0 @@
-<!--
- JBoss, the OpenSource J2EE webOS
- Distributable under LGPL license.
- See terms of license at gnu.org.
- -->
-
-<wikiTypes>
- <wikiType>
- <name>HTML</name>
- <class>org.jboss.wiki.plugins.HTMLWikiType</class>
- <plugin>
- <name>wikiToHtmlTranslator</name>
- <class>org.jboss.wiki.plugins.HTMLTranslator</class>
- </plugin>
-
- <!--<plugin>
- <name>trail</name>
- <class>org.jboss.wiki.plugins.TrailPlugin</class>
- </plugin>-->
-
- </wikiType>
-</wikiTypes>
\ No newline at end of file
Deleted: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties 2005-08-17 13:45:27 UTC (rev 881)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties 2005-08-17 15:22:57 UTC (rev 882)
@@ -1,4 +0,0 @@
-# FileDataSource configuration file
-
-# pathToMedia - points, where JSPWiki file structure is situated
-pathToMedia = /usr/local/forge/wiki
Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java 2005-08-17 13:45:27 UTC (rev 881)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java 2005-08-17 15:22:57 UTC (rev 882)
@@ -33,7 +33,7 @@
private Matcher myMatcher;
/* URL components, later to be configurable */
- private String portalHome = "http://forge.sicore.org:8080/portal/";
+ private String portalHome = "http://localhost:8080/portal/";
private String wikiHome = "index.html?ctrl:id=window.default.WikiPortletWindow";
@@ -766,6 +766,7 @@
{}
public WikiPage process(final WikiPage wikiPage) {
+ System.out.println("propertu: "+getProperty("htmlTranslatorURL"));
WikiPage newPage = null;
try {
|
