You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/09/14 06:27:21 UTC
svn commit: r280765 - in
/incubator/roller/branches/roller_2.0/sandbox/standalone: build.xml
jspwiki/WEB-INF/jspwiki.properties jspwiki/templates/roller2/ViewTemplate.jsp
tomcat/common/classes/roller-custom.properties
Author: snoopdave
Date: Tue Sep 13 21:27:17 2005
New Revision: 280765
URL: http://svn.apache.org/viewcvs?rev=280765&view=rev
Log:
demo properties, wiki template fix
Modified:
incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml
incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/WEB-INF/jspwiki.properties
incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ViewTemplate.jsp
incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/common/classes/roller-custom.properties
Modified: incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml?rev=280765&r1=280764&r2=280765&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml (original)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml Tue Sep 13 21:27:17 2005
@@ -10,16 +10,22 @@
-->
<project name="roller_demo" default="roller_demo">
+<!--
+You must download Tomcat and JSPWiki yourself and ensure that the three
+properties below point to the downloaded files.
+-->
<property name="tomcat.filename" value="./components/jakarta-tomcat-5.0.28.tar.gz" />
<property name="tomcat.basename" value="jakarta-tomcat-5.0.28" />
<property name="jspwiki.filename" value="./components/jspwiki-2.2.33-bin.zip" />
+
<property name="roller.srcdir" value="../.." />
-<target name="roller_demo" depends="init_database" >
+<target name="roller_demo" depends="create_bundle" >
</target>
-<target name="tomcat_plugins"
- description="Build HSQLDB startup listener and JSPWiki page provider">
+<target name="plugins"
+ description="Build HSQLDB startup listener and JSPWiki page provider">
+
<mkdir dir="./build/classes" />
<javac debug="${build.debug}" srcdir="./src" destdir="./build/classes" >
<classpath>
@@ -42,7 +48,7 @@
includes="org/roller/jspwiki/**" />
</target>
-<target name="copy_components" depends="tomcat_plugins"
+<target name="create_bundle" depends="plugins"
description="Copy in Tomcat, JSPWiki, Roller, and plugin jars">
<!-- untar Tomcat, put it in ./build/roller-demo -->
@@ -96,9 +102,11 @@
</target>
-<target name="init_database" depends="copy_components"
- description="" >
+<target name="init_database" depends="create_bundle"
+ description="Create fresh new Roller database in the bundle" >
+ <!-- assumes that build/roller-demo/blogdata/ directory is empty -->
+
<!-- Start HSQLDB with Roller's custom startdb task -->
<taskdef name="startdb" classname="org.roller.ant.StartHsqldbTask"
classpath="./build/roller-demo/common/lib/hsqldb.jar;${roller.srcdir}/build/tests/WEB-INF/classes" />
@@ -113,7 +121,7 @@
src="./build/roller-demo/webapps/roller/WEB-INF/dbscripts/hsql/createdb.sql"
classpath="./build/roller-demo/common/lib/hsqldb.jar" />
- <!-- Shutdown HSQLDB -->
+ <!-- Shutdown HSQLDB -->
<stopdb port="3219"/>
</target>
Modified: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/WEB-INF/jspwiki.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/WEB-INF/jspwiki.properties?rev=280765&r1=280764&r2=280765&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/WEB-INF/jspwiki.properties (original)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/WEB-INF/jspwiki.properties Tue Sep 13 21:27:17 2005
@@ -226,7 +226,7 @@
# "Main", but now you can easily change the default front page here. If not
# defined, uses "Main".
#
-#jspwiki.frontPage = Main
+jspwiki.frontPage = JSPWiki Demo
#
# If set to true, all outward links have a small icon attached. The icon
Modified: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ViewTemplate.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ViewTemplate.jsp?rev=280765&r1=280764&r2=280765&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ViewTemplate.jsp (original)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ViewTemplate.jsp Tue Sep 13 21:27:17 2005
@@ -20,16 +20,15 @@
<div id="banner">
<div class="bannerBox">
- <img class="bannerlogo" src='<wiki:BaseURL/>/templates/roller/tan/logo.gif' />
+ <img class="bannerlogo" src='<wiki:BaseURL/>/templates/roller2/tan/logo.gif' />
</div>
<div class="bannerStatusBox">
<div class="bannerLeft">
Your trail: <wiki:Breadcrumbs maxpages="5" />
</div>
<div class="bannerRight">
- <a href="/main.do">Roller</a>
- ||<a href="/planet.do">Planet</a>
- | <a href="/wiki">Wiki</a>
+ <a href="/roller/main.do">Roller</a>
+ | <a href="/wiki">JSPWiki</a>
</div>
</div>
</div>
Modified: incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/common/classes/roller-custom.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/common/classes/roller-custom.properties?rev=280765&r1=280764&r2=280765&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/common/classes/roller-custom.properties (original)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/common/classes/roller-custom.properties Tue Sep 13 21:27:17 2005
@@ -1,5 +1,18 @@
+
uploads.dir=${user.home}/roller_uploads
search.index.dir=${user.home}/roller_index
+
planet.aggregator.enabled=true
+
editor.theme=tan
+plugins.page=\
+org.roller.presentation.velocity.plugins.convertbreaks.ConvertLineBreaksPlugin \
+,org.roller.presentation.velocity.plugins.topictag.TopicTagPlugin \
+,org.roller.presentation.velocity.plugins.textile.TextilePlugin \
+,org.roller.presentation.velocity.plugins.acronyms.AcronymsPlugin \
+,org.roller.presentation.velocity.plugins.bookmarks.BookmarkPlugin \
+,org.roller.presentation.velocity.plugins.email.ObfuscateEmailPlugin \
+,org.roller.presentation.velocity.plugins.smileys.SmileysPlugin \
+,org.roller.presentation.velocity.plugins.readmore.ReadMorePlugin \
+,org.roller.presentation.velocity.plugins.jspwiki.WikiPlugin