Author: szimano
Date: 2005-08-26 06:52:10 -0400 (Fri, 26 Aug 2005)
New Revision: 968
Modified:
trunk/forge/portal-extensions/forge-jspwiki/maven.xml
trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml
trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java
trunk/forge/portal-extensions/jspwiki/maven.xml
trunk/forge/portal-extensions/maven.xml
Log:
bugs, trail n find results etc.
Modified: trunk/forge/portal-extensions/forge-jspwiki/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-jspwiki/maven.xml 2005-08-26 10:22:06 UTC (rev 967)
+++ trunk/forge/portal-extensions/forge-jspwiki/maven.xml 2005-08-26 10:52:10 UTC (rev 968)
@@ -9,15 +9,15 @@
</goal>
<goal name="build">
- <attainGoal name="copy-tld" />
- <attainGoal name="war" />
+ <!--<attainGoal name="copy-tld" />
+ <attainGoal name="war" />-->
</goal>
<goal name="deploy">
- <ant:copy todir="${local.deploy.dir}" flatten="true">
+ <!--<ant:copy todir="${local.deploy.dir}" flatten="true">
<ant:fileset dir=".">
<ant:filename name="target/*.war" />
</ant:fileset>
- </ant:copy>
+ </ant:copy>-->
</goal>
</project>
Modified: 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-26 10:22:06 UTC (rev 967)
+++ trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml 2005-08-26 10:52:10 UTC (rev 968)
@@ -41,6 +41,10 @@
<class>org.jboss.wiki.plugins.FindResultPlugin</class>
</plugin>
<plugin>
+ <name>trail</name>
+ <class>org.jboss.wiki.plugins.TrailPlugin</class>
+ </plugin>
+ <plugin>
<name>wikiToHtmlTranslator</name>
<class>org.jboss.wiki.plugins.HTMLTranslator</class>
</plugin>
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-26 10:22:06 UTC (rev 967)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java 2005-08-26 10:52:10 UTC (rev 968)
@@ -931,6 +931,7 @@
portalHome = (String)wikiSession.getAttribute("hostURL")+(String)wikiSession.getAttribute("actionURL");
wikiHome = "";
+ imagePath = (String)wikiSession.getAttribute("hostURL") + "/wiki";
try {
newPage = (WikiPage) wikiPage.clone();
Modified: trunk/forge/portal-extensions/jspwiki/maven.xml
===================================================================
--- trunk/forge/portal-extensions/jspwiki/maven.xml 2005-08-26 10:22:06 UTC (rev 967)
+++ trunk/forge/portal-extensions/jspwiki/maven.xml 2005-08-26 10:52:10 UTC (rev 968)
@@ -5,20 +5,20 @@
-->
<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
<goal name="build">
- <ant:ant dir="${basedir}" antfile="build.xml" target="war" />
+ <!--<ant:ant dir="${basedir}" antfile="build.xml" target="war" />-->
</goal>
<goal name="deploy">
- <ant:copy todir="${local.deploy.dir}" flatten="true">
+ <!--<ant:copy todir="${local.deploy.dir}" flatten="true">
<ant:fileset dir=".">
<ant:filename name="releases/*.war" />
</ant:fileset>
- </ant:copy>
+ </ant:copy>-->
</goal>
<goal name="prj-install">
- <ant:copy todir="${local.deploy.dir}/../.." overwrite="no">
+ <!--<ant:copy todir="${local.deploy.dir}/../.." overwrite="no">
<ant:fileset dir="to-copy" />
- </ant:copy>
+ </ant:copy>-->
</goal>
</project>
Modified: trunk/forge/portal-extensions/maven.xml
===================================================================
--- trunk/forge/portal-extensions/maven.xml 2005-08-26 10:22:06 UTC (rev 967)
+++ trunk/forge/portal-extensions/maven.xml 2005-08-26 10:52:10 UTC (rev 968)
@@ -116,7 +116,6 @@
3. blojsom/to-copy/blojsom.war/WEB-INF/blojsom.properties
4. forge-login/to-copy/portal-login-ds.xml
5. federation-register/src/web/WEB-INF/faces-config (only for the JOSF portal).
-6. forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample (change htmlTranslatorURL to your url)
Available goals:
- help - prints this info
|