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/10/21 23:46:28 UTC

svn commit: r327589 [16/72] - in /incubator/roller/branches/roller_1.x: ./ contrib/ contrib/lib/ contrib/plugins/ contrib/plugins/src/ contrib/plugins/src/org/ contrib/plugins/src/org/roller/ contrib/plugins/src/org/roller/presentation/ contrib/plugins...

Added: incubator/roller/branches/roller_1.x/sandbox/planetroller/testdata/planet-test.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/planetroller/testdata/planet-test.xml?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/planetroller/testdata/planet-test.xml (added)
+++ incubator/roller/branches/roller_1.x/sandbox/planetroller/testdata/planet-test.xml Fri Oct 21 14:27:36 2005
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<planet-config>
+   <admin-name>Dave Johnson</admin-name>   
+   <admin-email>dave.johnson@rollerweblogger.org</admin-email>  
+   <title>Planet Roller</title>
+   <description>Folks Who Blog About Roller</description>
+   <site-url>http://rollerweblogger.org/planet</site-url> 
+   <main-page>control.vm</main-page> 
+   <output-dir>./testdata/output</output-dir> 
+   <template-dir>./templates</template-dir> 
+   <cache-dir>./testdata/cache</cache-dir> 
+   <subscription id="dave">
+      <title>Blogging Roller</title>
+      <author>Dave Johnson</author>
+      <feed-url>file://./testdata/broller.rss2</feed-url>
+      <site-url>http://rollerweblogger.org/page/roller</site-url>
+   </subscription>
+   <subscription id="lance">  
+      <title>Vanity Foul</title>  
+      <author>Lance Lavandowska</author> 
+      <feed-url>file://./testdata/vfoul.rss2</feed-url>
+      <site-url>http://www.brainopolis.com/roller/page/lance</site-url>
+   </subscription>
+   <group handle="all"> 
+      <title>Planet Roller via all</title> 
+      <description>All folks who blog about Roller</description> 
+      <max-page-entries>30</max-page-entries> 
+      <max-feed-entries>30</max-feed-entries> 
+      <subscription-ref include-all="true" />  
+   </group>
+   <group handle="roller"> 
+      <title>Planet Roller via refid</title> 
+      <description>Couple of folks who blog about Roller</description> 
+      <max-page-entries>30</max-page-entries> 
+      <max-feed-entries>30</max-feed-entries> 
+      <subscription-ref refid="dave" />  
+      <subscription-ref refid="lance" />
+   </group>
+   <group handle="davejava"> 
+      <title>Dave's Java</title> 
+      <description>Dave's Java category</description> 
+      <max-page-entries>30</max-page-entries> 
+      <max-feed-entries>30</max-feed-entries> 
+      <subscription-ref refid="dave" />  
+	  <category-restriction>java</category-restriction>
+   </group>
+</planet-config>

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/build.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/build.xml?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/build.xml (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/build.xml Fri Oct 21 14:27:36 2005
@@ -0,0 +1,150 @@
+<!--
+Builds standalone Roller demo with Tomcat, HSQLDB, and integrated JSPWiki.
+Makes the following assumptions:
+   * Roller has been built to ${roller.srcdir}/build/roller
+   * Roller tests have been built into ${roller.srcdir}/build/tests
+   * Tomcat and JSPWiki have been downloaded:
+     - Tomcat tar.gz file in in ./tomcat directory
+     - JSPWiki zip file in ./jspwiki directory
+   * The Hibernate configuration file in ./tomcat is up-to-date
+-->
+<project name="roller_demo" default="roller_demo">
+
+<property name="roller.srcdir" value="../.." />
+<property name="tomcat.filename" value="jakarta-tomcat-5.0.28" />
+<property name="jspwiki.filename" value="JSPWiki.zip" />
+<!--
+<property name="jspwiki.filename" value="jspwiki-2.2.1-beta-bin.zip" />
+-->
+
+<target name="roller_demo" depends="init_database" >
+</target>
+
+<target name="tomcat_plugins"
+    description="Build HSQLDB startup listener and JSPWiki page provider">  	
+    <mkdir dir="./build/classes" />
+    <javac debug="${build.debug}" srcdir="./src" destdir="./build/classes" >
+        <classpath>
+            <fileset dir="./lib">
+                <include name="*.jar" />
+            </fileset>
+            <fileset dir="${roller.srcdir}/contrib/lib">
+                <include name="JSPWiki.jar" />
+            </fileset>
+            <fileset dir="${roller.srcdir}/tools/buildtime">
+                <include name="hsqldb.jar" />
+            </fileset>
+        </classpath>
+    </javac>   	
+    <jar destfile="./build/roller-hsqldb.jar" 
+        basedir="./build/classes" 
+        excludes="org/roller/jspwiki/**" />
+    <jar destfile="./build/roller-jspwiki.jar"
+        basedir="./build/classes" 
+        includes="org/roller/jspwiki/**" />
+</target>
+
+<target name="copy_components" depends="tomcat_plugins"
+   description="Copy in Tomcat, JSPWiki, Roller, and plugin jars">
+
+   <!-- untar Tomcat, put it in ./build/roller-demo -->
+   <gunzip src="./tomcat/${tomcat.filename}.tar.gz" dest="./build" />
+   <untar  src="./build/${tomcat.filename}.tar"   dest="./build" />
+   <rename src="./build/${tomcat.filename}"       dest="./build/roller-demo" />
+   <delete dir="./build/roller-demo/webapps/tomcat-docs" />
+   <delete dir="./build/roller-demo/webapps/servlets-examples" />
+   <delete dir="./build/roller-demo/webapps/jsp-examples" />
+   <delete dir="./build/roller-demo/webapps/webdav" />
+
+   <!-- unzip JSPWiki, unjar its WAR into ./build/roller-demo/webapps -->
+   <mkdir  dir="./build/roller-demo/webapps/wiki" />
+   <unzip  src="./jspwiki/${jspwiki.filename}" dest="./build" />
+   <unjar  src="./build/JSPWiki/JSPWiki.war" 
+          dest="./build/roller-demo/webapps/wiki" />
+   <copy todir="./build/roller-demo/webapps/wiki/templates/default" 
+       overwrite="true" >
+       <fileset dir="./jspwiki/default" includes="**/**" />
+   </copy>
+   <copy file="./jspwiki/jspwiki.properties" overwrite="true"
+        todir="./build/roller-demo/webapps/wiki/WEB-INF" />
+   
+   <!-- Roller wiki plugin goes in JSPWiki webapp -->
+   <copy file="./build/roller-jspwiki.jar" 
+        todir="./build/roller-demo/webapps/wiki/WEB-INF/lib" />
+
+   <!-- Copy Roller from its build directory -->       
+   <mkdir dir="./build/roller-demo/webapps/roller" />
+   <copy todir="./build/roller-demo/webapps/roller" >
+       <fileset dir="${roller.srcdir}/build/roller" includes="**/**" />
+   </copy>
+   
+   <!-- And roller.xml configured for HSQLDB -->
+   <copy file="./tomcat/roller.xml"
+        todir="./build/roller-demo/conf/Catalina/localhost" />
+        
+   <!-- And hibernate.cfg.xml configured for HSQLDB -->
+   <mkdir dir="./build/roller-demo/common/classes" />
+   <copy file="./tomcat/roller-custom.properties" overwrite="true"
+        todir="./build/roller-demo/common/classes" />
+   
+   <!-- And hibernate.cfg.xml configured for HSQLDB -->
+   <copy file="./tomcat/hibernate.cfg.xml" overwrite="true"
+        todir="./build/roller-demo/webapps/roller/WEB-INF/classes" />
+	   
+   <!-- Roller HSQLDB starter goes into Tomcat -->
+   <copy file="./build/roller-hsqldb.jar" 
+        todir="./build/roller-demo/server/lib" />
+   <copy file="${roller.srcdir}/tools/buildtime/hsqldb.jar" 
+        todir="./build/roller-demo/common/lib" />
+	
+   <!-- Custom local-banner -->
+   <copy file="./tomcat/localbanner.jspf" 
+        todir="./build/roller-demo/webapps/roller" />
+
+   <!-- Our own server.xml: adds HSQLDB startup -->         
+   <copy file="./tomcat/server.xml"
+        todir="./build/roller-demo/conf" />
+        
+   <!-- Define VM properties needed by HSQLDB and JSPWiki plugins -->
+	   <copy file="./tomcat/setenv.sh"
+	        todir="./build/roller-demo/bin" />
+	   <copy file="./tomcat/setenv.bat"
+	        todir="./build/roller-demo/bin" />
+        
+   <chmod perm="+x">
+       <fileset dir="./build/roller-demo/bin" includes="*.sh" />
+   </chmod>
+    
+</target>
+	
+<target name="init_database" depends="copy_components"
+    description="" >
+
+    <!-- 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" />
+    <taskdef name="stopdb" classname="org.roller.ant.StopHsqldbTask" 
+        classpath="./build/roller-demo/common/lib/hsqldb.jar;${roller.srcdir}/build/tests/WEB-INF/classes" />
+    <startdb database="./build/roller-demo/blogdata/rollerdb" port="3219" />
+        
+    <!-- Create standard Roller database tables -->
+    <sql driver="org.hsqldb.jdbcDriver"
+        url="jdbc:hsqldb:hsql://localhost:3219"
+        userid="sa" password=""
+        src="./build/roller-demo/webapps/roller/WEB-INF/dbscripts/hsql/createdb.sql"
+        classpath="./build/roller-demo/common/lib/hsqldb.jar" />
+        
+    <!-- Shutdown HSQLDB -->
+    <stopdb port="3219"/>
+    
+</target>
+
+<target name="clean">
+    <delete dir="build" />
+</target>
+
+</project>
+
+
+
+

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/CommentContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/CommentContent.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/CommentContent.jsp (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/CommentContent.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,61 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+         <tr>
+            <td align="left">
+                <h1 class="pagename">Adding comment to <wiki:PageName/></h1></td>
+            <td align="right">
+                <%@ include file="SearchBox.jsp" %>
+            </td>
+         </tr>
+      </table>
+
+      <p><hr></p>
+
+      <wiki:InsertPage/>
+
+      <p>
+      <h3>Please enter your comments below:</h3>
+      </p>
+
+      <form action="<wiki:CommentLink format="url" />" method="POST" 
+            accept-charset="<wiki:ContentEncoding />">
+
+      <p>
+      <%-- These are required parts of this form.  If you do not include these,
+           horrible things will happen.  Do not modify them either. --%>
+
+      <%-- FIXME: This is not required, is it? --%>
+      <input type="hidden" name="page"     value="<wiki:PageName/>" />
+      <input type="hidden" name="action"   value="save" />
+      <input type="hidden" name="edittime" value="<%=pageContext.getAttribute("lastchange", PageContext.REQUEST_SCOPE )%>" />
+
+      <%-- End of required area --%>
+
+      <textarea class="editor" wrap="virtual" name="text" rows="15" cols="60"></textarea>
+
+      <p>
+      <label for="authorname">Your name</label>
+      <input type="text" name="author" id="authorname" value="<wiki:UserName/>" />
+      <label for="rememberme">Remember me?</label>
+      <input type="checkbox" name="remember" id="rememberme" />
+      </p>
+
+      <p>      
+      <input type="submit" name="ok" value="Save" />
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <input type="submit" name="preview" value="Preview" />
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <input type="submit" name="cancel" value="Cancel" />
+      </p>
+      </form>
+
+      <p>
+      <wiki:NoSuchPage page="EditPageHelp">
+         Ho hum, it seems that the EditPageHelp<wiki:EditLink page="EditPageHelp">?</wiki:EditLink>
+         page is missing.  Someone must've done something to the installation...
+      </wiki:NoSuchPage>
+      </p>
+
+      <wiki:InsertPage page="EditPageHelp" />
+

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/ConflictContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/ConflictContent.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/ConflictContent.jsp (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/ConflictContent.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,38 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+   <div class="conflictnote">
+      <p><b>Oops!  Someone modified the page while you were editing it!</b></p>
+
+      <p>Since I am stupid and can't figure out what the difference
+      between those pages is, you will need to do that for me.  I've
+      printed here the text (in Wiki) of the new page, and the
+      modifications you made.  You'll now need to copy the text onto a
+      scratch pad (Notepad or emacs will do just fine), and then edit
+      the page again.</p>
+
+      <p>Note that when you go back into the editing mode, someone might have
+      changed the page again.  So be quick.</p>
+
+   </div>
+
+      <p><font color="#0000FF">Here is the modified text (by someone else):</font></p>
+
+      <p><hr /></p>
+
+      <tt>
+        <%=pageContext.getAttribute("conflicttext",PageContext.REQUEST_SCOPE)%>
+      </tt>      
+
+      <p><hr /></p>
+
+      <p><font color="#0000FF">And here's your text:</font></p>
+
+      <tt>
+        <%=pageContext.getAttribute("usertext",PageContext.REQUEST_SCOPE)%>
+      </tt>
+
+      <p><hr /></p>
+
+      <p>
+       <i>Go edit <wiki:EditLink><wiki:PageName /></wiki:EditLink>.</i>
+      </p>

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/DiffContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/DiffContent.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/DiffContent.jsp (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/DiffContent.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,31 @@
+<%@ page import="com.ecyrd.jspwiki.tags.InsertDiffTag" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%!
+    String getVersionText( Integer ver )
+    {
+        return ver.intValue() > 0 ? ("version "+ver) : "current version";
+    }
+%>
+
+      <wiki:PageExists>
+          Difference between 
+          <%=getVersionText((Integer)pageContext.getAttribute(InsertDiffTag.ATTR_OLDVERSION, PageContext.REQUEST_SCOPE))%> 
+          and 
+          <%=getVersionText((Integer)pageContext.getAttribute(InsertDiffTag.ATTR_NEWVERSION, PageContext.REQUEST_SCOPE))%>:
+          <div>
+          <wiki:InsertDiff>
+              <i>No difference detected.</i>
+          </wiki:InsertDiff>
+          </div>
+
+      </wiki:PageExists>
+
+      <wiki:NoSuchPage>
+             This page does not exist.  Why don't you go and
+             <wiki:EditLink>create it</wiki:EditLink>?
+      </wiki:NoSuchPage>
+
+      <p>
+      Back to <wiki:LinkTo><wiki:PageName/></wiki:LinkTo>,
+       or to the <wiki:PageInfoLink>Page History</wiki:PageInfoLink>.
+       </p>

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/DisplayMessage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/DisplayMessage.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/DisplayMessage.jsp (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/DisplayMessage.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,9 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+<%-- Inserts a string message. --%>
+
+   <div class="messagecontent">
+      <%=pageContext.getAttribute("message",PageContext.REQUEST_SCOPE)%>
+   </div>
+
+   <br clear="all" />

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/EditContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/EditContent.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/EditContent.jsp (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/EditContent.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,65 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+         <tr>
+            <td align="left">
+                <h1 class="pagename">Edit <wiki:PageName/></h1></td>
+            <td align="right">
+                <%@ include file="SearchBox.jsp" %>
+            </td>
+         </tr>
+      </table>
+
+      <p><hr></p>
+
+      <wiki:CheckVersion mode="notlatest">
+         <p class="versionnote">You are about to restore version <wiki:PageVersion/>.
+         Click on "Save" to restore.  You may also edit the page before restoring it.
+         </p>
+      </wiki:CheckVersion>
+
+      <wiki:CheckLock mode="locked" id="lock">
+         <p class="locknote">User '<%=lock.getLocker()%>' has started to edit this page, but has not yet
+         saved.  I won't stop you from editing this page anyway, BUT be aware that
+         the other person might be quite annoyed.  It would be courteous to wait for his lock
+         to expire or until he stops editing the page.  The lock expires in 
+         <%=lock.getTimeLeft()%> minutes.
+         </p>
+      </wiki:CheckLock>
+
+      <form action="<wiki:EditLink format="url" />" method="POST" 
+            accept-charset="<wiki:ContentEncoding />">
+
+      <p>
+      <%-- These are required parts of this form.  If you do not include these,
+           horrible things will happen.  Do not modify them either. --%>
+
+      <%-- FIXME: This is not required, is it? --%>
+      <input type="hidden" name="page"     value="<wiki:PageName/>" />
+      <input type="hidden" name="action"   value="save" />
+      <input type="hidden" name="edittime" value="<%=pageContext.getAttribute("lastchange", PageContext.REQUEST_SCOPE )%>" />
+      <wiki:CheckRequestContext context="comment">
+         <input type="hidden" name="comment" value="true" />
+      </wiki:CheckRequestContext>
+
+      <%-- End of required area --%>
+
+      <textarea class="editor" wrap="virtual" name="text" rows="25" cols="80" style="width:100%;"><wiki:CheckRequestContext context="edit"><wiki:InsertPage mode="plain" /></wiki:CheckRequestContext></textarea>
+
+      <p>      
+      <input type="submit" name="ok" value="Save" />
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <input type="submit" name="preview" value="Preview" />
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <input type="submit" name="cancel" value="Cancel" />
+      </p>
+      </form>
+
+      <p>
+      <wiki:NoSuchPage page="EditPageHelp">
+         Ho hum, it seems that the EditPageHelp<wiki:EditLink page="EditPageHelp">?</wiki:EditLink>
+         page is missing.  Someone must've done something to the installation...
+      </wiki:NoSuchPage>
+      </p>
+
+      <wiki:InsertPage page="EditPageHelp" />

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/EditTemplate.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/EditTemplate.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/EditTemplate.jsp (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/EditTemplate.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,44 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+
+<head>
+  <title><wiki:Variable var="ApplicationName" /> Edit: <wiki:PageName /></title>
+  <meta name="ROBOTS" content="NOINDEX">
+  <%@ include file="cssinclude.js" %>
+</head>
+
+<wiki:CheckRequestContext context="edit">
+  <body class="edit" bgcolor="#D9E8FF" onLoad="document.forms[1].text.focus()">
+</wiki:CheckRequestContext>
+
+<wiki:CheckRequestContext context="comment">
+  <body class="comment" bgcolor="#EEEEEE" onLoad="document.forms[1].text.focus()">
+</wiki:CheckRequestContext>
+
+<div id="header">
+</div>
+
+<div id="left">
+       <%@ include file="LeftMenu.jsp" %>
+       <p>
+       <wiki:LinkTo page="TextFormattingRules">Help on editing</wiki:LinkTo>
+       </p>
+       <%@ include file="LeftMenuFooter.jsp" %>
+</div>
+
+<div id="content">
+      <wiki:CheckRequestContext context="comment">
+         <wiki:Include page="CommentContent.jsp" />
+      </wiki:CheckRequestContext>
+
+      <wiki:CheckRequestContext context="edit">
+         <wiki:Include page="EditContent.jsp" />
+      </wiki:CheckRequestContext>
+</div>
+
+</body>
+
+</html>

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/FindContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/FindContent.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/FindContent.jsp (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/FindContent.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,78 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="java.util.Collection" %>
+
+<%-- FIXME: Get rid of the scriptlets. --%>
+<%
+    Collection list = (Collection)pageContext.getAttribute( "searchresults",
+                                                             PageContext.REQUEST_SCOPE );
+
+    String query = (String)pageContext.getAttribute( "query",
+                                                     PageContext.REQUEST_SCOPE );
+    if( query == null ) query = "";
+%>
+
+      <h2>Find pages</h2>
+
+      <% if( list != null ) 
+      {
+      %>
+          <h4>Search results for '<%=query%>'</h4>
+
+          <p>
+          <i>Found <%=list.size()%> hits, here are the top 20.</i>
+          </p>
+
+          <table border="0" cellpadding="4">
+
+          <tr>
+             <th width="30%" align="left">Page</th>
+             <th align="left">Score</th>
+          </tr>          
+          <% if( list.size() > 0 ) { %>
+              <wiki:SearchResultIterator list="<%=list%>" id="searchref" maxItems="20">
+                  <tr>
+                      <td width="30%"><wiki:LinkTo><wiki:PageName/></wiki:LinkTo></td>
+                      <td><%=searchref.getScore()%></td>
+                  </tr>
+              </wiki:SearchResultIterator>
+          <% } else { %>
+              <tr>
+                  <td width="30%"><b>No results</b></td>
+              </tr>
+          <% } %>
+
+          </table>
+          <p>
+          <a href="http://www.google.com/search?q=<%=query%>" target="_blank">Try this same search on Google!</a>
+          </p>
+          <p><hr /></p>
+      <%
+      }
+      %>
+
+      <form action="<wiki:Variable var="baseURL"/>Search.jsp"
+            accept-charset="ISO-8859-1,UTF-8">
+
+      <p>
+      Enter your query here:<br />
+      <input type="text" name="query" size="40" value="<%=query%>" /></p>
+
+      <p>
+      <input type="submit" name="ok" value="Find!" /></p>
+      </form>
+
+      <p>
+      Use '+' to require a word, '-' to forbid a word.  For example:
+
+      <pre>
+          +java -emacs jsp
+      </pre>
+
+      finds pages that MUST include the word "java", and MAY NOT include
+      the word "emacs".  Also, pages that contain the word "jsp" are
+      ranked before the pages that don't.</p>
+      <p>
+      All searches are case insensitive.  If a page contains both
+      forbidden and required keywords, it is not shown.</p>
+

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/InfoContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/InfoContent.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/InfoContent.jsp (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/InfoContent.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,134 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+<wiki:PageExists>
+
+   <form action="<wiki:Variable var="baseurl"/>Delete.jsp" method="POST" 
+                 accept-charset="<wiki:ContentEncoding />">
+
+   <table cellspacing="4">
+       <tr>
+           <td><b>Page name</b></td>
+           <td><wiki:LinkTo><wiki:PageName /></wiki:LinkTo></td>
+       </tr>
+
+       <wiki:PageType type="attachment">
+           <tr>
+              <td><b>Parent page</b></td>
+              <td><wiki:LinkToParent><wiki:ParentPageName /></wiki:LinkToParent></td>
+           </tr>
+       </wiki:PageType>
+
+       <tr>
+           <td><b>Page last modified</b></td>
+           <td><wiki:PageDate /></td>
+       </tr>
+
+       <tr>
+           <td><b>Current page version</b></td>
+           <td><wiki:PageVersion>No versions.</wiki:PageVersion></td>
+       </tr>
+
+       <tr>
+           <td valign="top"><b>Page revision history</b></td>
+           <td>
+               <table border="1" cellpadding="4">
+                   <tr>
+                        <th>Version</th>                        
+                        <th>Date <wiki:PageType type="page">(and differences to current)</wiki:PageType></th>
+                        <th>Author</th>
+                        <th>Size</th>
+                        <wiki:PageType type="page">                        
+                            <th>Changes from previous</th>
+                        </wiki:PageType>
+                        <wiki:Permission permission="delete">
+                            <th>Delete</th>
+                        </wiki:Permission>
+                   </tr>
+                   <wiki:HistoryIterator id="currentPage">
+                     <tr>
+                         <td>
+                             <wiki:LinkTo version="<%=Integer.toString(currentPage.getVersion())%>">
+                                  <wiki:PageVersion/>
+                             </wiki:LinkTo>
+                         </td>
+
+                         <td>
+                             <wiki:PageType type="page">
+                             <wiki:DiffLink version="latest" 
+                                            newVersion="<%=Integer.toString(currentPage.getVersion())%>">
+                                 <wiki:PageDate/>
+                             </wiki:DiffLink>
+                             </wiki:PageType>
+
+                             <wiki:PageType type="attachment">
+                                 <wiki:PageDate/>
+                             </wiki:PageType>
+                         </td>
+
+                         <td><wiki:Author /></td>
+                         <td><wiki:PageSize /></td>
+
+                         <wiki:PageType type="page">
+                           <td>
+                              <% if( currentPage.getVersion() > 1 ) { %>
+                                   <wiki:DiffLink version="<%=Integer.toString(currentPage.getVersion())%>" 
+                                                  newVersion="<%=Integer.toString(currentPage.getVersion()-1)%>">
+                                       from version <%=currentPage.getVersion()-1%> to <%=currentPage.getVersion()%>
+                                   </wiki:DiffLink>
+                               <% } %>
+                           </td>
+                         </wiki:PageType>
+
+                         <wiki:Permission permission="delete">
+                             <td>
+                                 <input type="checkbox" name="delete-<%=currentPage.getVersion()%>" />
+                             </td>
+                         </wiki:Permission>
+                     </tr>
+                   </wiki:HistoryIterator>
+               </table>
+           </td>
+      </tr>
+</table>
+
+    <wiki:Permission permission="delete">
+       <input type="submit" name="delete" value="Delete marked versions"/>
+    </wiki:Permission>
+
+    </form>
+             
+    <br />
+    <wiki:PageType type="page">
+       <wiki:LinkTo>Back to <wiki:PageName/></wiki:LinkTo>
+    </wiki:PageType>
+    <wiki:PageType type="attachment">
+
+       <form action="<wiki:Variable var="baseurl"/>attach" method="POST" enctype="multipart/form-data">
+
+           <%-- Do NOT change the order of wikiname and content, otherwise the 
+                servlet won't find its parts. --%>
+
+           <input type="hidden" name="page" value="<wiki:Variable var="pagename"/>" />
+
+           In order to update this attachment with a newer version, find the
+           file using "Browse", then click on "Update".
+
+           <p>
+           <input type="file" name="content" />
+           <input type="submit" name="upload" value="Update" />
+           <input type="hidden" name="action" value="upload" />
+           <input type="hidden" name="nextpage" value="<wiki:PageInfoLink format="url"/>" />
+           </p>
+           </form>
+
+
+    </wiki:PageType>
+
+</wiki:PageExists>
+
+
+<wiki:NoSuchPage>
+    This page does not exist.  Why don't you go and
+    <wiki:EditLink>create it</wiki:EditLink>?
+</wiki:NoSuchPage>
+

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/LeftMenu.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/LeftMenu.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/LeftMenu.jsp (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/LeftMenu.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,32 @@
+<h3 class="leftmenuheading"><a href="<wiki:LinkTo page="SystemInfo" format="url"/>"><wiki:Variable var="ApplicationName" /></a></h3>
+
+<!-- LeftMenu is automatically generated from a Wiki page called "LeftMenu" -->
+
+<div class="rollerwiki">
+
+<p>
+    <wiki:InsertPage page="LeftMenu" />
+</p>
+
+<p>
+<div align="center" class="username">
+
+    <wiki:UserCheck status="known">
+        <b>Hello </b><br />
+        <wiki:Translate>[<wiki:UserName />]</wiki:Translate>
+    </wiki:UserCheck>
+
+    <wiki:UserCheck status="unknown">
+        <tt>
+        Set your name in<br />
+        <wiki:LinkTo page="UserPreferences">UserPreferences</wiki:LinkTo>
+        </tt>    
+    </wiki:UserCheck>
+</div>
+<wiki:Include page="LoginBox.jsp" />
+</p>
+
+</div>
+
+<!-- End of automatically generated page -->
+

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/LeftMenuFooter.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/LeftMenuFooter.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/LeftMenuFooter.jsp (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/LeftMenuFooter.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,24 @@
+<%@ page import="com.ecyrd.jspwiki.Release" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<!-- LeftMenuFooter is automatically generated from a Wiki page called "LeftMenuFooter" -->
+
+<p>
+    <wiki:InsertPage page="LeftMenuFooter" />
+    <wiki:NoSuchPage page="LeftMenuFooter">
+        <p><hr /></p>
+        <p align="center">
+        <i>No LeftMenuFooter!</i><br />
+        <wiki:EditLink page="LeftMenuFooter">Please make one.</wiki:EditLink><br />
+        </p>
+        <p><hr /></p>
+    </wiki:NoSuchPage>
+</p>
+
+<!-- End of automatically generated page -->
+
+   <br /><br /><br />
+   <div align="center" class="small">
+   <%=Release.APPNAME%> v<%=Release.getVersionString()%>
+   </div>
+
+

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/LoginBox.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/LoginBox.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/LoginBox.jsp (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/LoginBox.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,31 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+<%-- Provides a small login/logout form to include in a side bar. --%>
+
+<div class="loginbox" align="center">
+  <p>
+  <hr />
+  <wiki:UserCheck status="unvalidated">
+    <form action="<wiki:Variable var="baseURL"/>Login.jsp" accept-charset="UTF-8" method="POST" >
+    <p>
+      <input type="hidden" name="page" value="<wiki:Variable var="pagename"/>" />
+      <input type="text" name="uid" size="8" />
+      <br />
+      <input type="password" name="passwd" size="8" />
+      <br />
+      <input type="submit" name="action" value="login" />
+    </p>
+    </form>
+  </wiki:UserCheck>
+  <wiki:UserCheck status="validated">
+    <form action="<wiki:Variable var="baseURL"/>Login.jsp" accept-charset="UTF-8">
+    <p>
+      <input type="hidden" name="page" value="<wiki:Variable var="pagename"/>" />
+      <input type="submit" name="action" value="logout" />
+    </p>
+    </form>
+  </wiki:UserCheck>
+  </p>
+
+</div>
+

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/PageContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/PageContent.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/PageContent.jsp (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/PageContent.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,79 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+<%-- Inserts page content. --%>
+
+      <%-- If the page is an older version, then offer a note and a possibility
+           to restore this version as the latest one. --%>
+
+      <wiki:CheckVersion mode="notlatest">
+         <font color="red">
+            <p class="versionnote">This is version <wiki:PageVersion/>.  
+            It is not the current version, and thus it cannot be edited.<br />
+            <wiki:LinkTo>[Back to current version]</wiki:LinkTo>&nbsp;&nbsp;
+            <wiki:EditLink version="this">[Restore this version]</wiki:EditLink></p>
+         </font>
+         <hr />
+      </wiki:CheckVersion>
+
+      <%-- Inserts no text if there is no page. --%>
+
+      <wiki:InsertPage />
+
+      <wiki:NoSuchPage>
+           <!-- FIXME: Should also note when a wrong version has been fetched. -->
+           This page does not exist.  Why don't you go and
+           <wiki:EditLink>create it</wiki:EditLink>?
+      </wiki:NoSuchPage>
+
+      <br clear="all" />
+
+      <wiki:HasAttachments>
+         <b>Attachments:</b>
+
+         <div class="attachments" align="center">
+         <table width="90%">
+         <wiki:AttachmentsIterator id="att">
+             <tr>
+             <td><wiki:LinkTo><%=att.getFileName()%></wiki:LinkTo></td>
+             <td><wiki:PageInfoLink><img src="images/attachment_big.png" border="0" alt="Info on <%=att.getFileName()%>" /></wiki:PageInfoLink></td>
+             <td><%=att.getSize()%> bytes</td>
+             </tr>
+         </wiki:AttachmentsIterator>
+         </table>
+         </div>
+      </wiki:HasAttachments>
+
+      <p><hr />
+      <table border="0" width="100%" class="pageactions">
+        <tr>
+          <td align="left">
+             <a href="#Top">Go to top</a>&nbsp;&nbsp;
+             <wiki:Permission permission="edit">
+                 <wiki:EditLink>Edit this page</wiki:EditLink>&nbsp;&nbsp;
+             </wiki:Permission>
+             <wiki:PageInfoLink>More info...</wiki:PageInfoLink>&nbsp;&nbsp;
+             <a href="javascript:window.open('<wiki:UploadLink format="url" />','Upload','width=640,height=480,toolbar=1,menubar=1,scrollbars=1,resizable=1,').focus()">Attach file...</a>
+             <br />
+          </td>
+        </tr>
+        <tr>
+          <td align="left">
+             <font size="-1">
+             
+             <wiki:CheckVersion mode="latest">
+                 <i>This page last changed on <wiki:DiffLink version="latest" newVersion="previous"><wiki:PageDate/></wiki:DiffLink> by <wiki:Author />.</i>
+             </wiki:CheckVersion>
+
+             <wiki:CheckVersion mode="notlatest">
+                 <i>This particular version was published on <wiki:PageDate/> by <wiki:Author /></i>.
+             </wiki:CheckVersion>
+ 
+             <wiki:NoSuchPage>
+                 <i>Page not created yet.</i>
+             </wiki:NoSuchPage>
+
+             </font>
+          </td>
+        </tr>
+      </table>
+      </p>

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/PreferencesContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/PreferencesContent.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/PreferencesContent.jsp (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/PreferencesContent.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,33 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+      <p>
+      This is a page which allows you to set up all sorts of interesting things.
+      You need to have cookies enabled for this to work, though.
+      </p>
+
+      <form action="<wiki:Variable var="baseURL"/>UserPreferences.jsp" 
+            method="POST"
+            accept-charset="UTF-8">
+
+         <b>User name:</b> <input type="text" name="username" size="30" value="<wiki:UserName/>" />
+         <i>This must be a proper WikiName, no punctuation.</i>
+         <br /><br />
+         <input type="submit" name="ok" value="Set my preferences!" />
+         <input type="hidden" name="action" value="save" />
+      </form>
+
+      <hr />
+
+      <h3>Removing your preferences</h3>
+
+      <p>In some cases, you may need to remove the above preferences from the computer.
+      Click the button below to do that.  Note that it will remove all preferences
+      you've set up, permanently.  You will need to enter them again.</p>
+
+      <div align="center">
+      <form action="<wiki:Variable var="baseURL"/>UserPreferences.jsp"
+            method="POST"
+            accept-charset="UTF-8">
+      <input type="submit" name="clear" value="Remove preferences from this computer" />
+      </form>
+      </div>

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/PreviewContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/PreviewContent.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/PreviewContent.jsp (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/PreviewContent.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,48 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+<%-- Inserts page content for preview. --%>
+
+   <div class="previewnote">
+      <b>This is a PREVIEW!  Hit "back" on your browser to go back to the editor,
+      or hit "Save" if you're happy with what you see.</b>
+   </div>
+
+   <p><hr /></p>
+
+   <div class="previewcontent">
+      <wiki:Translate><%=pageContext.getAttribute("usertext",PageContext.REQUEST_SCOPE)%></wiki:Translate>
+   </div>
+
+   <br clear="all" />
+
+   <p><hr /></p>
+
+   <div class="previewnote">
+      <b>This is a PREVIEW!  Hit "back" on your browser to go back to the editor,
+      or hit "Save" if you're happy with what you see.</b>
+   </div>
+
+   <p><hr /></p>
+
+   <form action="<wiki:EditLink format="url" />" method="POST" 
+         ACCEPT-CHARSET="<wiki:ContentEncoding />">
+   <p>
+
+   <%-- These are required parts of this form.  If you do not include these,
+        horrible things will happen.  Do not modify them either. --%>
+
+   <input type="hidden" name="page"     value="<wiki:PageName/>" />
+   <input type="hidden" name="action"   value="save" />
+   <input type="hidden" name="edittime" value="<%=pageContext.getAttribute("lastchange", PageContext.REQUEST_SCOPE )%>" />
+   <textarea rows="4" cols="20" readonly="true" style="display:none" name="text"><%=pageContext.getAttribute("usertext", PageContext.REQUEST_SCOPE) %></textarea>
+
+   <div id="previewsavebutton" align="center">
+      <input type="button" name="edit" value="Keep editing" onClick="javascript:back(-1);"/>
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <input type="submit" name="ok" value="Save" />
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <input type="submit" name="cancel" value="Cancel" />
+   </div>
+
+   </p>
+   </form>

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/SearchBox.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/SearchBox.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/SearchBox.jsp (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/SearchBox.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,13 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%-- Provides a simple searchbox that can be easily included anywhere
+     on the page --%>
+
+<div class="searchbox">
+  <form action="<wiki:Variable var="baseURL"/>Search.jsp"
+      accept-charset="<wiki:ContentEncoding />">
+    <wiki:LinkTo page="FindPage">Search Wiki:</wiki:LinkTo>
+    <input type="text" name="query" size="15" />
+    <input type="submit" name="ok" value="Find!" />
+  </form>
+</div>
+

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/UploadTemplate.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/UploadTemplate.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/UploadTemplate.jsp (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/UploadTemplate.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,65 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+
+<head>
+  <title><wiki:Variable var="applicationname"/>: Add Attachment</title>
+  <%@ include file="cssinclude.js" %>
+  <META NAME="ROBOTS" CONTENT="NOINDEX">
+</head>
+
+<body class="upload" bgcolor="#FFFFFF">
+
+      <h1 class="pagename">Upload new attachment to <wiki:PageName /></h1>
+      <hr /><p>
+
+      <wiki:HasAttachments>
+         <B>Currently existing attachments:</B>
+
+         <div class="attachments" align="center">
+         <table width="90%">
+         <wiki:AttachmentsIterator id="att">
+             <tr>
+             <td><wiki:LinkTo><%=att.getFileName()%></wiki:LinkTo></td>
+             <td><wiki:PageInfoLink><img src="images/attachment_big.png" border="0" alt="Info on <%=att.getFileName()%>"></wiki:PageInfoLink></td>
+             <td><%=att.getSize()%> bytes</td>
+             </tr>
+         </wiki:AttachmentsIterator>
+         </table>
+         </div>
+         <hr />
+
+      </wiki:HasAttachments>
+
+      <table border="0" width="100%">
+      <tr>
+        <td>
+           <form action="attach" method="POST" enctype="multipart/form-data" accept-charset="UTF-8">
+
+           <%-- Do NOT change the order of wikiname and content, otherwise the 
+                servlet won't find its parts. --%>
+
+           <input type="hidden" name="page" value="<wiki:Variable var="pagename"/>">
+
+           In order to upload a new attachment to this page, please use the following
+           box to find the file, then click on "Upload".
+
+           <P>
+           <input type="file" name="content">
+           <input type="submit" name="upload" value="Upload">
+           <input type="hidden" name="action" value="upload">
+           <input type="hidden" name="nextpage" value="<wiki:UploadLink format="url"/>">
+           </form>
+
+        </td>
+
+      </table>
+
+
+</body>
+
+</html>

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/ViewTemplate.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/ViewTemplate.jsp?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/ViewTemplate.jsp (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/ViewTemplate.jsp Fri Oct 21 14:27:36 2005
@@ -0,0 +1,82 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+
+<head>
+  <title><wiki:Variable var="applicationname" />: <wiki:PageName /></title>
+  <%@ include file="cssinclude.js" %>
+  <script src="templates/<wiki:TemplateDir />/search_highlight.js" type="text/javascript"></script>
+  <link rel="stylesheet" type="text/css" media="print" href="templates/<wiki:TemplateDir/>/jspwiki_print.css">
+  <link rel="alternate stylesheet" type="text/css" href="templates/<wiki:TemplateDir/>/jspwiki_print.css" title="Print friendly">
+  <wiki:RSSLink />
+</head>
+
+<body bgcolor="#FFFFFF">
+
+<div id="header">
+            <div style="float:right"><%@ include file="SearchBox.jsp" %></div>
+            <h1 class="pagename"><a name="Top"><wiki:PageName/></a></h1>
+            Your trail: <wiki:Breadcrumbs />
+</div>
+
+<div id="left">
+       <%@ include file="LeftMenu.jsp" %>
+       <p>
+       <wiki:CheckRequestContext context="view">
+          <wiki:Permission permission="edit">
+             <wiki:EditLink>Edit this page</wiki:EditLink>
+          </wiki:Permission>
+       </wiki:CheckRequestContext>
+       </p>
+       <%@ include file="LeftMenuFooter.jsp" %>
+       <p>
+           <div align="center">
+           <wiki:RSSImageLink title="Aggregate the RSS feed" /><br />
+           <wiki:RSSUserlandLink title="Aggregate the RSS feed in Radio Userland!" />
+           </div>
+       </p>
+</div>
+
+<div id="content">
+
+      <wiki:CheckRequestContext context="view">
+         <wiki:Include page="PageContent.jsp" />
+      </wiki:CheckRequestContext>
+
+      <wiki:CheckRequestContext context="diff">
+         <wiki:Include page="DiffContent.jsp" />
+      </wiki:CheckRequestContext>
+
+      <wiki:CheckRequestContext context="info">
+         <wiki:Include page="InfoContent.jsp" />
+      </wiki:CheckRequestContext>
+
+      <wiki:CheckRequestContext context="preview">
+         <wiki:Include page="PreviewContent.jsp" />
+      </wiki:CheckRequestContext>
+
+      <wiki:CheckRequestContext context="conflict">
+         <wiki:Include page="ConflictContent.jsp" />
+      </wiki:CheckRequestContext>
+
+      <wiki:CheckRequestContext context="find">
+         <wiki:Include page="FindContent.jsp" />
+      </wiki:CheckRequestContext>
+
+      <wiki:CheckRequestContext context="prefs">
+         <wiki:Include page="PreferencesContent.jsp" />
+      </wiki:CheckRequestContext>
+
+      <wiki:CheckRequestContext context="error">
+         <wiki:Include page="DisplayMessage.jsp" />
+      </wiki:CheckRequestContext>
+
+</div>
+
+</body>
+
+</html>
+

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/cssinclude.js
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/cssinclude.js?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/cssinclude.js (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/cssinclude.js Fri Oct 21 14:27:36 2005
@@ -0,0 +1,40 @@
+<link rel="stylesheet" href="templates/<wiki:TemplateDir/>/jspwiki.css" />
+
+<script type="text/javascript">
+<!-- Hide script contents from old browsers
+
+    var IE4 = (document.all && !document.getElementById) ? true : false;
+    var NS4 = (document.layers) ? true : false;
+    var IE5 = (document.all && document.getElementById) ? true : false;
+    var NS6 = (document.getElementById && !document.all) ? true : false;
+    var IE  = IE4 || IE5;
+    var NS  = NS4 || NS6;
+    var Mac = (navigator.platform.indexOf("Mac") == -1) ? false : true;
+
+    var sheet;
+
+    if( NS4 )
+    {
+        sheet = "jspwiki_ns.css";
+    }
+    else if( Mac )
+    {
+        sheet = "jspwiki_mac.css";
+    }
+    else
+    {
+        // Let's assume all the rest of the browsers are sane
+        // and standard's compliant.
+        sheet = "jspwiki_ie.css";
+    }
+
+    document.write("<link rel=\"stylesheet\" href=\"templates/<wiki:TemplateDir />/"+sheet+"\" />");
+
+// end hiding contents from old browsers -->
+</script>
+
+<meta http-equiv="Content-Type" content="text/html; charset=<wiki:ContentEncoding />" />
+<link rel="search" href="<wiki:LinkTo format="url" page="FindPage"/>"            title="Search <wiki:Variable var="ApplicationName" />" />
+<link rel="help"   href="<wiki:LinkTo format="url" page="TextFormattingRules"/>" title="Help" />
+<link rel="start"  href="<wiki:LinkTo format="url" page="Main"/>"                title="Front page" />
+

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/images/header-grey.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/images/header-grey.png?rev=327589&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/images/header-grey.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/images/leftbar-blue.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/images/leftbar-blue.png?rev=327589&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/images/leftbar-blue.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki.css?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki.css (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki.css Fri Oct 21 14:27:36 2005
@@ -0,0 +1,254 @@
+/* Put all generic definitions here. */
+H1,H2,H3,H4 { font-family: Arial, Helvetica, sans-serif }
+DIV.small   { font-size: 70%; }
+H1.pagename { margin-top: 0; }
+IMG.inline  {}
+
+A.footnoteref { vertical-align: super; 
+                font-size: 70%; }
+A.footnote    { color: #0044AA; }
+P.versionnote { color: red;
+                font-size: 130%;
+                text-align: center; 
+                background: #EAEAEA;
+                padding: 12px 12px 12px 12px;
+                }
+
+/* Added in v1.5.1 */
+
+H3.leftmenuheading { margin-top: 0; }
+BODY.edit   { background-color: #D9E8FF } /* Edit.jsp BODY element */
+TD.leftmenu { }                            /* Left menu */
+TD.page     { }                            /* Page data area */
+A.wikipage  { }                            /* Normal, internal wiki reference */
+A.external  { }                            /* External reference */
+A.interwiki { }                            /* Interwiki reference */
+
+/* Added in 1.6.3 */
+TD.diffadd  { background: #99FF99; 
+              font-family: monospace; }
+TD.diffrem  { background: #FF9933; 
+              font-family: monospace; }
+TD.diff     { background: #FFFFFF; 
+              font-family: monospace; }
+
+/* Added in 1.6.9 */
+
+TABLE.wikitable { }
+TABLE.wikitable * TD { text-align: left; }
+TABLE.wikitable * TH { }
+
+/* Added in 1.6.13 */
+
+/* This is the Edit.jsp editor style */
+TEXTAREA.editor {}
+
+/* Added in 1.9.20 */
+
+/* The text how the "This is a preview" comment should be shown. */
+.previewnote { text-align: center; 
+                font-size: 150%; 
+                    color: red; }
+
+/* How the preview content should be shown */
+.previewcontent { background: #E0E0E0; }
+
+/* How the system messages should be shown (DisplayMessage.jsp) */
+.messagecontent { background: #E0E0E0; }
+
+/* How the "This page has been modified..." -comment should be shown. */
+
+.conflictnote { }
+
+/* For the weblog plugin */
+
+.weblog { margin-left: 20px; }
+
+.weblogentry { }
+
+.weblogentryheading { background: #E0E0E0;
+                      font-size: 120%;
+                      font-family: sans-serif; 
+                      margin-top: 2ex; }
+
+.weblogentrybody { font-family: sans-serif; 
+                   font-size: 85%; 
+                   margin-left: 10px; }
+
+.weblogentryfooter { font-size: 9px; 
+                     margin-left: 10px;
+                     clear: both; }
+
+P.locknote { color: red;
+             font-size: 130%;
+             text-align: center; 
+             background: #EAEAEA;
+             padding: 12px 12px 12px 12px;
+             }
+
+/* For the CalendarTag */
+TABLE.calendar  { font-size: 80%; }
+TABLE.calendar TD { text-align: center; }
+
+TABLE.calendar TD.othermonth { color: #707070; }
+
+TABLE.calendar TD.link { background: #E0E0E0; }
+
+TABLE.calendar TR.month { font-size: 120%;
+                          font-family: sans-serif; }
+TABLE.calendar TR.weekdays { font-color: #FF0000; }
+
+/* For the BreadcrumbsTag */
+.breadcrumbs { font-size: 60%; }
+
+/* For the image plugin tag. */
+.imageplugin { margin: 5px 5px 5px 5px; }
+.imageplugin img { border: 0; }
+.imageplugin caption { font-size: 80%; }
+
+/* For the search_highlight.js.  This style defines the how the words that have
+   been found look like.  If you look for "thingy", you will get these following
+   in the results.
+
+   <span class="searchword">thingy</span>
+ */
+.searchword { background-color: #FFFF00; }
+
+/* For the weblogarchive plugin. */
+
+.weblogarchive { }
+
+.weblogarchive ul { margin-top: 0px;
+                    padding: 0px; }
+
+.weblogarchive li { display: block;
+                    list-style-type: none;
+                    margin-left: 1em; }
+
+.archiveyear { font-weight: bold;
+               text-decoration: none;
+               margin-left: 0px !important; }
+.archiveyear:after { content: " AD" }
+
+/*  Here's a nice style you can use to put comment boxes on pages.  It's used
+    on some pages. */
+
+div.commentbox {
+   float:right;
+   width: 20%;
+   border-style: inset;
+   background: #f0f0f0;
+   font-size: 80%;
+   padding: 4px;
+   margin-left: 4px;
+}
+
+.commentbox ul, ol {
+   padding-left: 1em;
+   margin-left: 4px;
+}
+
+
+
+
+
+/* rollerwiki layout.css */
+
+body {
+    background: white repeat-y url(images/leftbar-blue.png);
+    margin: 0;
+    padding: 0;
+    font:small Verdana,Arial,Sans-serif;
+    color:#333;
+}
+
+div#header {
+    border-top: 1px solid white; /* for some reason, this fixes safari */
+    background: white repeat-x url(images/header-grey.png);
+    height:74px;
+    padding: 5px;
+}
+
+div#content {
+    margin: 0 0 0 136px;
+    padding: 10px;
+}
+
+div#left { 
+    position: absolute;
+    left: 0px;
+    width: 125px;
+    padding: 5px;
+}
+
+div#footer {
+    margin-top:40px;
+    border-top: 1px gray dotted;
+    width: 100%;
+    text-align: left;
+}
+
+div#separator {
+    background: transparent;
+    border-top: 1px solid #C0C0C0;
+    color: #666666;
+    font-size: 0.9em;
+    margin-top: 30px;
+    padding: 5px 0px 10px 5px;
+    text-align: left;
+}
+
+div#loginTable {
+    margin: 20px;
+    border: 1px solid #C0C0C0;
+    color: inherit;
+    padding: 10px 5px 0px 5px;
+    width: 350px;
+}
+
+/* rollerwiki roller.css */
+
+body {
+    background: white repeat-y url(images/leftbar-blue.png);
+    margin: 0;
+    padding: 0;
+    font:small Verdana,Arial,Sans-serif;
+    color:#333;
+}
+
+h1 {
+    background: transparent;
+    color: #5454d1;
+    letter-spacing: 0.2em;
+    font-size: x-large;
+    font-weight: bold;
+}
+
+h2 {
+    background: #e0e0ff;
+    border-top: 1px solid grey;
+    padding:2px;
+    color: #5454d1;
+    letter-spacing: 0.2em;
+    font-size: x-large;
+    font-weight: bold;
+}
+
+h3 {
+    background: #e0e0ff;
+    border-top: 1px solid grey;
+    padding:2px;
+    color: #5454d1;
+    letter-spacing: 0.2em;
+    font-size: large;
+    font-weight: bold;
+}
+
+h4 {
+    background: transparent;
+    color: #5454d1;
+    letter-spacing: 0.2em;
+    font-size: large;
+    font-weight: bold;
+}
+

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki_ie.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki_ie.css?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki_ie.css (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki_ie.css Fri Oct 21 14:27:36 2005
@@ -0,0 +1 @@
+/* Put any IE (or other relatively standards-compliant browser definitions here */

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki_mac.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki_mac.css?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki_mac.css (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki_mac.css Fri Oct 21 14:27:36 2005
@@ -0,0 +1 @@
+/* Put any MacOS -specific definitions here. */

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki_ns.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki_ns.css?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki_ns.css (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki_ns.css Fri Oct 21 14:27:36 2005
@@ -0,0 +1,36 @@
+/* Put any Netscape 4 -specific definitions here. */
+H1,H2,H3,H4 { font-family: Arial, Helvetica, sans-serif }
+H1 { font-size: 36px }
+H2 { font-size: 24px }
+H3 { font-size: 20px }
+H4 { font-size: 16px }
+P,UL,OL,BODY,TD { font-size: 16px }
+FORM { font-size: 14px }
+PRE { font-size: 14px }
+H1.pagename {}
+
+
+/* For the CalendarTag */
+
+ TABLE.calendar  { font-size: 60%;
+                   text-align: center; }
+
+ TD.month        { font-size: 70%;
+                   text-align: center;
+                   font-weight: bold;
+                   font-family: sans-serif; }
+
+ TD.weekdays     { color: #FF0000;        /* days heading */
+                   font-size: 60%; }
+
+ TD.days         { font-size: 60%; 
+                   text-align: center;}
+										 
+ TD.link         { color: #FF2222; background: #E0E0E0;
+                   font-size: 60%;
+                   text-align: center; }
+
+ TD.othermonth   { color: #707070; 
+                   font-size: 60%; 
+                   text-align: center}
+

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki_print.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki_print.css?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki_print.css (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/jspwiki_print.css Fri Oct 21 14:27:36 2005
@@ -0,0 +1,29 @@
+/*
+ * CSS intended specificly for print media
+ * e.g: <link rel=stylesheet type="text/css" media="print" href="templates/default/jspwiki_print.css">
+ * This stylesheet mainly hides all the webspecific stuff.
+ * Shows content in a print friendly way.
+ * Author PhilipVanBogaert
+ */
+
+/* Webpage stuff */
+.leftmenu,.searchbox,.breadcrumbs,.pageactions {
+    display:none;
+}
+
+/* Wild guess */
+body {
+    font-size:10pt;
+}
+
+/* Show links as normal text (maybe show urls at the bottom of the page) */
+
+a {
+    text-decoration:none;
+}
+
+/* Give the content what it deserves. */
+.page {
+    width:100%;
+}
+/* More to come. */

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/search_highlight.js
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/search_highlight.js?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/search_highlight.js (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/default/search_highlight.js Fri Oct 21 14:27:36 2005
@@ -0,0 +1,75 @@
+/* http://www.kryogenix.org/code/browser/searchhi/ */
+/* Modified 20021006 to fix query string parsing and add case insensitivity */
+/* Modified 20030227 by sgala@hisitech.com to skip words with "-" and cut %2B (+) preceding pages */
+
+function highlightWord(node,word) 
+{
+    // Iterate into this nodes childNodes
+    if (node.hasChildNodes) 
+    {
+        var hi_cn;
+        for (hi_cn=0;hi_cn<node.childNodes.length;hi_cn++) 
+        {
+            highlightWord(node.childNodes[hi_cn],word);
+        }
+    }
+	
+    // And do this node itself
+    if (node.nodeType == 3) 
+    { // text node
+        tempNodeVal = node.nodeValue.toLowerCase();
+        tempWordVal = word.toLowerCase();
+        if (tempNodeVal.indexOf(tempWordVal) != -1) 
+        {
+            pn = node.parentNode;
+            if (pn.className != "searchword") 
+            {
+                // word has not already been highlighted!
+                nv = node.nodeValue;
+                ni = tempNodeVal.indexOf(tempWordVal);
+                // Create a load of replacement nodes
+                before = document.createTextNode(nv.substr(0,ni));
+                docWordVal = nv.substr(ni,word.length);
+                // alert( "Found: " + docWordVal );
+                after = document.createTextNode(nv.substr(ni+word.length));
+                hiwordtext = document.createTextNode(docWordVal);
+                hiword = document.createElement("span");
+                hiword.className = "searchword";
+                hiword.appendChild(hiwordtext);
+                pn.insertBefore(before,node);
+                pn.insertBefore(hiword,node);
+                pn.insertBefore(after,node);
+                pn.removeChild(node);
+            }
+        }
+    }
+}
+
+function googleSearchHighlight() 
+{
+    if (!document.createElement) return;
+    ref = document.referrer; //or URL for highlighting in place
+    if (ref.indexOf('?') == -1) return;
+    qs = ref.substr(ref.indexOf('?')+1);
+    qsa = qs.split('&');
+    for (i=0;i<qsa.length;i++) 
+    {
+        qsip = qsa[i].split('=');
+        if (qsip.length == 1) continue;
+
+        // q= for Google, p= for Yahoo
+        // query= for JSPWiki
+
+        if (qsip[0] == 'query' || qsip[0] == 'q') 
+        {
+            words = qsip[1].replace(/%2B/g,'');
+            words = words.replace(/-\S+\s/g,'');
+            words = unescape(words.replace(/\+/g,' ')).split(/\s+/);
+            for (w=0;w<words.length;w++) {
+                highlightWord(document.getElementsByTagName("body")[0],words[w]);
+            }
+        }
+    }
+}
+
+window.onload = googleSearchHighlight;

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/jspwiki.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/jspwiki.properties?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/jspwiki.properties (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/jspwiki/jspwiki.properties Fri Oct 21 14:27:36 2005
@@ -0,0 +1,469 @@
+###########################################################################
+#
+#  This is the JSPWiki configuration file.  You'll need to edit this
+#  a bit.  The first few lines are the most important ones.
+#
+#  Wherever it is said that an option can be "true" or "false", you can
+#  also use "yes"/"no", or "on/off".  Just for some convenience.
+#
+#
+#  You can use this to override the default application name.  It affects
+#  the HTML titles and logging, for example.  It can be different from
+#  the actual web name (http://my.com/mywiki) of the application, but usually
+#  it is the same.
+#
+jspwiki.applicationName=wiki
+
+#
+#  Which page provider class to use.  Possibilities are:
+#
+#    RCSFileProvider        - for simple RCS-based file storage
+#    FileSystemProvider     - for simple pure file storage with no version information
+#    VersioningFileProvider - for simple, non-RCS based versioning storage.
+#
+#  Note that if you're upgrading from JSPWiki 1.x, then you need to remove the
+#  "com.ecyrd.jspwiki." part from the beginning of the path.
+#
+jspwiki.pageProvider=org.roller.jspwiki.PageProvider
+
+#
+#  Set to true, if you want to cache page data into memory.  This is
+#  in general a good idea.
+#
+#  Default is false (no cache).
+#
+#  NB: This replaces the JSPWiki 1.x "CachingProvider" setting, since it
+#      probably was too confusing.
+#
+jspwiki.usePageCache=true
+
+#
+#  Determines where wiki files are kept for FileSystemProvider
+#  and RCSFileProvider
+#
+#  If you're using Windows, then you must duplicate the backslashes.
+#  For example, use:
+#  
+#  jspwiki.fileSystemProvider.pageDir = C:\\Data\\jspwiki
+#
+jspwiki.fileSystemProvider.pageDir=pageDir
+
+#
+#  ATTACHMENTS:
+#
+#  Use the following property to define which attachment provider
+#  you want to use.  You have basically two choices:
+#    * Set the value to BasicAttachmentProvider  
+#      a simple, flat file versioning provider
+#    * Leave the value empty (or just comment the line out) 
+#      the attachment functionality is disabled
+#
+jspwiki.attachmentProvider=org.roller.jspwiki.AttachmentProvider
+
+#
+#  The BasicAttachmentProvider needs to know where to store the files
+#  the user has uploaded.  It's okay to put these in the same directory
+#  as you put your text files (i.e. the pageDir setting above).
+#
+#  If you're using Windows, then you must duplicate the backslashes.
+#  For example, use:
+#  
+#  jspwiki.basicAttachmentProvider.storageDir = C:\\Data\\jspwiki
+#
+jspwiki.basicAttachmentProvider.storageDir=storageDir
+
+#
+#  You can limit the maximum size of an attachment by setting this
+#  value.  The value is in bytes, and by default all attachments
+#  are accepted.
+#
+#  The following line would limit the attachment size to 100,000 bytes
+#jspwiki.attachment.maxsize=100000
+
+#
+#  page Diff Representation
+#
+#  To show differences between page versions, you can define a 
+# difference provider. 
+#  The following choices are available:
+#    * TraditionalDiffProvider - Uses internal (java) diff
+#        to create a list of changes and shows it line by
+#        line colored. This is the default
+#    * ContextualDiffProvider - Uses internal (java) diff
+#        to create changes inline and shows it on a word by
+#        word basis using CSS. This is much superior to the
+#        traditional diff provider, however, it is still quite
+#        new and not much tested. YMMV.
+#    * ExternalDiffProvider - uses a system diff program (which
+#        can be configured using "jspwiki.diffCommand") to 
+#        create an unified (!) diff.
+#
+#        Example for a diff command:
+#        jspwiki.diffCommand = /usr/bin/diff -u %s1 %s2
+#
+jspwiki.diffProvider = TraditionalDiffProvider
+
+#
+#  BaseURL can be used to rewrite all of JSPWiki's internal references.
+#  Sometimes, especially if you're behind a address-rewriting firewall,
+#  relative URLs don't work since the servlet container has no idea
+#  where it's actually located.
+#
+#  Leave undefined if you want to rely on what your servlet container
+#  thinks of where your application lives. 
+#
+#  You MUST, however, define this one if you want to enable RSS (see below).  In
+#  general, this is a good idea to define it anyway.  Do not forget the
+#  trailing slash.
+#
+#  Example:
+#  jspwiki.baseURL = http://www.jspwiki.org/
+#
+jspwiki.baseURL=
+
+#  Determines if you need to have relative urls or not.  If the baseURL
+#  is not set, then this has no effect, but if you set the baseURL (which
+#  is highly recommended), you can use this to set relative urls.
+#
+#  Possible values are "absolute" and "relative".
+#
+#jspwiki.referenceStyle=relative
+
+#
+#  Determines which character encoding JSPWiki should use.  If you want
+#  to support all languages in your Wiki, you probably want to enable
+#  this.  From JSPWiki 2.2, it is strongly suggested that you use UTF-8.
+#  
+#  Note that you can't switch these in the mean time, since the way the
+#  files are encoded on disk is incompatible between ISO-Latin1 and UTF-8.
+#  Don't try.  You'll get all sorts of interesting problems, if you do.
+#
+#  Possible values are 'ISO-8859-1' (default, if none has been specified) 
+#  and 'UTF-8'.
+
+jspwiki.encoding = UTF-8
+
+#
+#  Determines whether raw HTML is allowed as Wiki input.
+#
+#  THIS IS A DANGEROUS OPTION!
+#
+#  If you decide to allow raw HTML, understand that ANY person who has
+#  access to your Wiki site can embed ANY sort of malicious JavaScript,
+#  or plugin, or ActiveX, or whatever on your site.  They can even mess it
+#  up so royally it is impossible for you to replace the situation without
+#  the need of direct access to the repository.  So think twice before
+#  allowing raw HTML on your own site.
+#
+#  Most probably you want to use this on Intranets, or personal servers,
+#  where only a handful of people can access the wiki.
+#
+#  Text between {{{ and }}} -options is not affected by this setting, so
+#  it's always safe to quote HTML code with those.
+#
+#  The default for this option is "false".
+#
+jspwiki.translatorReader.allowHTML = false
+
+#
+#  The JSPWiki working directory.  If not set, a temporary path will
+#  be used.  You can see the location of the workdir in the logs.
+#
+#  The working directory is used to cache things like Lucene search
+#  results.
+#
+jspwiki.workDir =
+
+############################################################################
+#
+#  Usability niceties.
+#
+#
+#  If this property is set to "true", then page titles are rendered
+#  using an extra space between every capital letter.  It may make
+#  page titles readable on some occasions, but it does have the
+#  drawback of making the titles look a bit funny at times.
+#
+jspwiki.breakTitleWithSpaces = false
+
+#
+#  If set to true, this property means that "WikiName" and "WikiNames"
+#  are considered equal when linking between them.  Setting this to
+#  true does not prevent you from having both kinds of pages - we just
+#  fall back to the other one if the primary name does not exist.
+#
+#  For any other language, you'll probably want to turn this off.
+#
+jspwiki.translatorReader.matchEnglishPlurals = true
+
+#
+#  If you set this to true, the Wiki translator will then also consider
+#  "traditional" WikiNames (that is, names of pages JustSmashedTogether
+#  without square brackets) as hyperlinks.  This technique is also
+#  known as "CamelCase", or "BumpyCase", or "InterCapping".  I personally
+#  like CamelCase as a word, which is why this property is named as it is :-).
+#
+#  By default this is false, since traditional WikiLinks may confuse newbies.
+#
+#  This option can be overridden on a per-page basis using the SET directive.
+#
+jspwiki.translatorReader.camelCaseLinks = false
+
+#
+#  This sets the default template used by the Wiki engine.  The templates
+#  live in templates/<template name>.  JSPWiki will attempt to find two
+#  basic templates from that directory: "ViewTemplate" and "EditTemplate".
+#
+#  By default this is called "default".
+#
+#  This option can be overridden on a per-page basis using the SET directive.
+#
+jspwiki.templateDir = default
+
+#
+#  The name of the front page.  This is the page that gets loaded if no
+#  other page is loaded.  Up until JSPWiki 1.9.28, it was always called
+#  "Main", but now you can easily change the default front page here.  If not
+#  defined, uses "Main".
+#
+#jspwiki.frontPage = Main
+
+#
+#  If set to true, all outward links have a small icon attached.  The icon
+#  can be found from images/out.png.  Default is true.
+#
+jspwiki.translatorReader.useOutlinkImage = true
+
+#
+#  Set this to the number of minutes a person can "lock" a page
+#  for while he is editing it.
+#
+jspwiki.lockExpiryTime = 60
+
+#
+#  Apache Lucene will be used to speed up search, unless you explicitly
+#  turn it off here.
+#
+#jspwiki.useLucene = true
+
+############################################################################
+#
+#  Special page references.
+#
+#  The URL is relative to Wiki.jsp.  However, if you use
+#  a full, absolute URL, you can also do that.
+#
+# Example to redirect all requests to a page called 'OriginalWiki'
+# to the original wikiwiki at http://c2.com/cgi/wiki
+#
+# jspwiki.specialPage.OriginalWiki = http://c2.com/cgi/wiki
+#
+#  Note that it is entirely possible to override any Wiki page, even
+#  an existing one by redefining it here.
+#
+jspwiki.specialPage.FindPage = Search.jsp
+jspwiki.specialPage.UserPreferences = UserPreferences.jsp
+
+#############################################################################
+#
+#  Plugin search paths.
+#
+#  Define here the packages you want to use for searching plugins, 
+#  separated with commas.
+#  For example, use the following command to add "org.myorganisation.jspwiki.myplugins"
+#  and "com.foobar.myplugins" to the search path.
+#
+#  The default path is "com.ecyrd.jspwiki.plugins", and it will be always
+#  the last item on the path.  This allows you to override JSPWiki default
+#  plugins.  Note that you are only adding to the path, not replacing it (ie.
+#  the default path is never removed.)
+#
+#  jspwiki.plugin.searchPath = org.myorganisation.jspwiki.myplugins,com.foobar.myplugins
+#
+jspwiki.plugin.searchPath = 
+
+#############################################################################
+#
+#  Page filters
+#
+#  Normally, the filter configuration is in your WEB-INF/ directory, so you
+#  do not need to go and specify this.  However, if your filters.xml live somewhere
+#  else, you'll have to specify it here.
+#
+#jspwiki.filterConfig = /some/path/to/your/filters.xml
+
+
+#############################################################################
+#
+# InterWiki links 
+#
+# The %s is replaced with the page reference (specify
+# multiple times to get multiple references).  Page references should
+# appear in format : [wiki:wikipage].  
+#
+# This is the JSPWiki home.  In future, JSPWiki will probably rely on this
+# for error messages, so I don't recommend that you change it.
+jspwiki.interWikiRef.JSPWiki = http://www.jspwiki.org/Wiki.jsp?page=%s
+
+# Here's how you can have directly links to the JSPWiki editor.
+# Now you can put a hyperlink for editing "MainPage" by making 
+# a link [Edit:MainPage].
+jspwiki.interWikiRef.Edit = Edit.jsp?page=%s
+
+#  This is the original WikiWikiWeb
+jspwiki.interWikiRef.WikiWikiWeb = http://c2.com/cgi/wiki?%s
+
+#  TWiki, a very nice WikiClone.
+jspwiki.interWikiRef.TWiki = http://twiki.org/cgi-bin/view/TWiki/%s
+
+#  MeatballWiki, which seems to be quite popular.
+jspwiki.interWikiRef.MeatballWiki = http://usemod.com/cgi-bin/mb.pl?%s
+
+#  Wikipedia, a Wiki encyclopedia!
+jspwiki.interWikiRef.Wikipedia = http://www.wikipedia.com/wiki/%s
+
+#  Google, the ubiquitous search engine.
+jspwiki.interWikiRef.Google = http://www.google.com/search?q=%s
+
+#  JSPWiki documentation (for this release)
+jspwiki.interWikiRef.Doc = http://doc.jspwiki.org/2.2/Wiki.jsp?page=%s
+
+############################################################################
+#
+# Define which image types are inlined.
+# These are your standard glob expressions (just like in your
+# Windows or UNIX shells).  Default pattern is to include all PNG
+# images.  If you specify something here, you will override the default.
+#
+# Don't forget to increase the number after the dot - duplicate entries 
+# cause problems!
+#
+# For example:
+#   Inline all JPG files, PNG files and all files from images.com:
+#
+#      jspwiki.translatorReader.inlinePattern.1 = *.jpg
+#      jspwiki.translatorReader.inlinePattern.2 = *.png
+#      jspwiki.translatorReader.inlinePattern.3 = http://images.com/*
+
+
+###########################################################################
+#
+#  Determine how the RSS (Rich Site Summary) file generation should work.
+#  RSS is a standard pioneered by Netscape, which allows you to join your
+#  Wiki with a huge number of different news services around the world.
+#  Try a Google search on RSS and see what you can do with it.
+#
+#  All of these settings were added in JSPWiki 1.7.6.
+#
+#  Note that jspwiki.baseURL MUST BE DEFINED if you want to enable RSS!
+#
+#  Determine if the RSS file should be generated at all.  Allowed values
+#  are "true" and "false".  Default is "false".
+#
+jspwiki.rss.generate = true
+
+#
+#  Determine the name of the RSS file. This path is relative to your
+#  Wiki root.  Default is "rss.rdf"
+#
+jspwiki.rss.fileName = rss.rdf
+
+#
+#  Determine the refresh interval (ie. how often the RSS file is regenerated.
+#  It is not recommended to make this too often, or you'll choke your server.
+#  Anything above five minutes is probably okay.  The default value is one hour.
+#  The value should be in seconds.
+#
+jspwiki.rss.interval = 3600
+
+#
+#  The text you want to be shown as your "channel description" when someone
+#  subscribes to it.  You can be quite verbose here, up to 500 characters or
+#  so.  You can continue to a new line by adding a backslash to the end of the
+#  line.  Default is to have no description.
+#
+jspwiki.rss.channelDescription = Oh poor me, my owner has not set \
+                                 a channel description at all. \
+                                 Pity me.
+
+#
+#  The language of your Wiki.  This is a standard, two-letter language
+#  code, or in case of some languages, two letters for the country,
+#  a dash, and two letters for the dialect.
+#
+jspwiki.rss.channelLanguage = en-us
+
+###########################################################################
+#
+#  Determine how certain file commands are run.  They have been
+#  commented out, since most likely you want to use the defaults.
+#  Be warned, making mistakes with these may well ruin your entire
+#  Wiki collection!
+#
+#  The command to run diff:
+#     NOTE! If you do not specify this, an internal "diff" routine is used.
+#           In most cases, you really should not touch this.
+#
+#jspwiki.diffCommand = diff -u %s1 %s2
+
+#  The command for RCS checkin
+#jspwiki.rcsFileProvider.checkinCommand = ci -q -mx -l -t-none %s
+
+#  The command for RCS checkout of the newest version
+#jspwiki.rcsFileProvider.checkoutCommand = co -l %s
+
+#  The command for checking out a specific version (%v = version number)
+#jspwiki.rcsFileProvider.checkoutVersionCommand = co -p -r1.%v %s
+
+#  The command for RCS log headers
+#  If you have a version of RCS that does not support the "-z" flag, then
+#  you can try this one out without it.  It should work.
+#jspwiki.rcsFileProvider.logCommand = rlog -zLT -h %s
+
+#  The command for getting the entire modification history
+#jspwiki.rcsFileProvider.fullLogCommand = rlog -zLT %s
+
+
+###########################################################################
+#
+#  Configure logs.  See log4j documentation for more information
+#  on how you can configure the logs.
+#
+#  Log4j is available at http://jakarta.apache.org/log4j
+#
+#  Send mail to root on all problems containing warnings.
+#
+#log4j.appender.mail = org.apache.log4j.net.SMTPAppender
+#log4j.appender.mail.Threshold = WARN
+#log4j.appender.mail.To = root@localhost
+#log4j.appender.mail.From = JSPWiki@localhost
+#log4j.appender.mail.Subject = Problem with JSPWiki!
+#log4j.appender.mail.SMTPHost = mail
+
+#log4j.appender.mail.layout = org.apache.log4j.PatternLayout
+#log4j.appender.mail.layout.ConversionPattern =%d [%t] %p %c %x - %m%n
+
+#
+#  Log everything into a file, roll it over every 10 MB, keep
+#  only 14 latest ones.
+#
+log4j.appender.FileLog = org.apache.log4j.RollingFileAppender
+log4j.appender.FileLog.MaxFileSize    = 10MB
+log4j.appender.FileLog.MaxBackupIndex = 14
+log4j.appender.FileLog.File = /tmp/jspwiki.log
+log4j.appender.FileLog.layout = org.apache.log4j.PatternLayout
+log4j.appender.FileLog.layout.ConversionPattern=%d [%t] %p %c %x - %m%n
+
+#
+# If you want to use some other logging system (such as JBoss, which uses
+# log4j already, comment this line out.  If you just don't want any logs
+# at all, you can set it to be empty.  However, I suggest that you do
+# at least to a level of WARN.
+#
+log4j.rootCategory=INFO,FileLog
+
+# Enable if you're using mailing, above.
+#log4j.rootCategory=INFO,FileLog,mail
+
+### End of configuration file.
+

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/lib/catalina.jar
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/lib/catalina.jar?rev=327589&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/roller/branches/roller_1.x/sandbox/standalone/lib/catalina.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/src/org/roller/jspwiki/AttachmentProvider.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/src/org/roller/jspwiki/AttachmentProvider.java?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/src/org/roller/jspwiki/AttachmentProvider.java (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/src/org/roller/jspwiki/AttachmentProvider.java Fri Oct 21 14:27:36 2005
@@ -0,0 +1,24 @@
+    
+package org.roller.jspwiki;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import com.ecyrd.jspwiki.NoRequiredPropertyException;
+import com.ecyrd.jspwiki.providers.BasicAttachmentProvider;
+
+public class AttachmentProvider extends BasicAttachmentProvider {
+	
+	public void initialize(Properties properties)
+			throws NoRequiredPropertyException, IOException {
+		
+		String rollerStorageDir = System.getProperty("rollerStorageDir");
+		if (rollerStorageDir != null) {
+            System.out.println(getClass().getName() 
+               + " Using storageDir=" + rollerStorageDir);
+			properties.put(PROP_STORAGEDIR, rollerStorageDir);
+		}
+		
+		super.initialize(properties);
+	}
+}

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/src/org/roller/jspwiki/PageProvider.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/src/org/roller/jspwiki/PageProvider.java?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/src/org/roller/jspwiki/PageProvider.java (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/src/org/roller/jspwiki/PageProvider.java Fri Oct 21 14:27:36 2005
@@ -0,0 +1,24 @@
+
+package org.roller.jspwiki;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import com.ecyrd.jspwiki.NoRequiredPropertyException;
+import com.ecyrd.jspwiki.providers.VersioningFileProvider;
+
+public class PageProvider extends VersioningFileProvider {
+	
+	public void initialize(Properties properties)
+			throws NoRequiredPropertyException, IOException {
+		
+		String rollerPageDir = System.getProperty("rollerPageDir");
+		if (rollerPageDir != null) {
+            System.out.println(getClass().getName() 
+               + " Using pageDir=" + rollerPageDir);
+			properties.put(PROP_PAGEDIR, rollerPageDir);
+		} 
+		
+		super.initialize(properties);
+	}
+}

Added: incubator/roller/branches/roller_1.x/sandbox/standalone/src/org/roller/tomcat/TomcatHSQLDBPlugin.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/sandbox/standalone/src/org/roller/tomcat/TomcatHSQLDBPlugin.java?rev=327589&view=auto
==============================================================================
--- incubator/roller/branches/roller_1.x/sandbox/standalone/src/org/roller/tomcat/TomcatHSQLDBPlugin.java (added)
+++ incubator/roller/branches/roller_1.x/sandbox/standalone/src/org/roller/tomcat/TomcatHSQLDBPlugin.java Fri Oct 21 14:27:36 2005
@@ -0,0 +1,24 @@
+
+package org.roller.tomcat;
+
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
+import org.roller.util.HSQLDBUtility;
+
+public class TomcatHSQLDBPlugin implements LifecycleListener {
+	
+	public void lifecycleEvent(LifecycleEvent event) {	
+		
+		if (event.getType().equals(Lifecycle.START_EVENT)) {
+			HSQLDBUtility.start();
+		}
+		else if (event.getType().equals(Lifecycle.STOP_EVENT)) {
+			HSQLDBUtility.stop();
+		}
+		else {
+			System.out.println(getClass().getName() 
+               + ": Not handling LifecycleEvent: " + event.getType());
+		}
+	}
+}