roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r280732 - in /incubator/roller/branches/roller_2.0: ./ contrib/lib/ sandbox/standalone/ sandbox/standalone/components/ sandbox/standalone/jspwiki/ sandbox/standalone/jspwiki/WEB-INF/ sandbox/standalone/jspwiki/default/ sandbox/standalone/js...
Date Wed, 14 Sep 2005 01:26:11 GMT
Author: snoopdave
Date: Tue Sep 13 18:25:44 2005
New Revision: 280732

URL: http://svn.apache.org/viewcvs?rev=280732&view=rev
Log:
Updating demo build files in sandbox

Added:
    incubator/roller/branches/roller_2.0/sandbox/standalone/components/
    incubator/roller/branches/roller_2.0/sandbox/standalone/components/JSPWiki.zip
      - copied unchanged from r280581, incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/JSPWiki.zip
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/WEB-INF/
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/WEB-INF/jspwiki.properties
      - copied, changed from r280581, incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/jspwiki.properties
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/CommentContent.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ConflictContent.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DiffContent.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DisplayMessage.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditContent.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditTemplate.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/FindContent.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/calendar.css
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/commonheader.jsp
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/cssinclude.js
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/bin/
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/bin/setenv.bat
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/bin/setenv.sh
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/common/
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/conf/
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/conf/Catalina/
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/conf/Catalina/localhost/
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/conf/Catalina/localhost/roller.xml
      - copied unchanged from r280581, incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/roller.xml
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/conf/server.xml
      - copied unchanged from r280581, incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/server.xml
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/webapps/
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/webapps/roller/
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/webapps/roller/WEB-INF/
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/webapps/roller/WEB-INF/classes/
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/webapps/roller/WEB-INF/classes/hibernate.cfg.xml
      - copied, changed from r280581, incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/hibernate.cfg.xml
Removed:
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/JSPWiki.zip
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/default/
    incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/jspwiki.properties
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/catalina.bat
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/catalina.sh
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/hibernate.cfg.xml
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/roller.xml
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/server.xml
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/setenv.bat
    incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/setenv.sh
    incubator/roller/branches/roller_2.0/tools/lib/xmlrpc-2.0.jar
Modified:
    incubator/roller/branches/roller_2.0/.classpath
    incubator/roller/branches/roller_2.0/build.xml
    incubator/roller/branches/roller_2.0/contrib/lib/JSPWiki.jar
    incubator/roller/branches/roller_2.0/properties.xmlf
    incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml
    incubator/roller/branches/roller_2.0/sandbox/standalone/src/org/roller/jspwiki/AttachmentProvider.java
    incubator/roller/branches/roller_2.0/sandbox/standalone/src/org/roller/jspwiki/PageProvider.java

Modified: incubator/roller/branches/roller_2.0/.classpath
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/.classpath?rev=280732&r1=280731&r2=280732&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/.classpath (original)
+++ incubator/roller/branches/roller_2.0/.classpath Tue Sep 13 18:25:44 2005
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="sandbox/standalone/src"/>
 	<classpathentry kind="src" path="contrib/plugins/src"/>
 	<classpathentry kind="src" path="tests"/>
 	<classpathentry kind="src" path="build/generated/src.business"/>

Modified: incubator/roller/branches/roller_2.0/build.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/build.xml?rev=280732&r1=280731&r2=280732&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/build.xml (original)
+++ incubator/roller/branches/roller_2.0/build.xml Tue Sep 13 18:25:44 2005
@@ -412,7 +412,7 @@
     <copy todir="${build.stage_web}/WEB-INF/classes">
         <fileset dir="./metadata/database/hibernate" includes="hibernate.cfg.xml"/>
         <fileset dir="${ro.tools}/lib" includes="oscache.properties"/>
-        <fileset dir="${build.compile_web}" excludes="**/tomcat/**"/>
+        <!-- <fileset dir="${build.compile_web}" excludes="**/tomcat/**"/> -->
     </copy>
 
     <!-- Copy WEB-INF contents to staging -->

Modified: incubator/roller/branches/roller_2.0/contrib/lib/JSPWiki.jar
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/contrib/lib/JSPWiki.jar?rev=280732&r1=280731&r2=280732&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/roller/branches/roller_2.0/properties.xmlf
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/properties.xmlf?rev=280732&r1=280731&r2=280732&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/properties.xmlf (original)
+++ incubator/roller/branches/roller_2.0/properties.xmlf Tue Sep 13 18:25:44 2005
@@ -58,7 +58,7 @@
 </fileset>
 
 <fileset id="presentation.jars" dir="${ro.tools}/lib">
-    <include name="xmlrpc-2.0.jar"/>
+    <include name="xmlrpc-1.2-b1.jar"/>
     <include name="taglibs-string.jar"/>
 </fileset>
 

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=280732&r1=280731&r2=280732&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 18:25:44
2005
@@ -4,18 +4,16 @@
    * 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
+     - Tomcat gzipped tar file in in ./components directory
+     - JSPWiki zip file in ./components directory
    * The Hibernate configuration file in ./tomcat is up-to-date
 -->
 <project name="roller_demo" default="roller_demo">
 
+<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="../.." />
-<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>
@@ -48,49 +46,30 @@
    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" />
+   <untar src="${tomcat.filename}" dest="./build" compression="gzip" />
+   <rename src="./build/${tomcat.basename}" 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" />
+   <mkdir  dir="./build/roller-demo/webapps/wiki" />
+   <unzip  src="${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 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" />
@@ -101,20 +80,16 @@
    <copy file="${roller.srcdir}/tools/lib/activation.jar" 
         todir="./build/roller-demo/common/lib" />
 	
-   <!-- Custom local-banner -->
-   <copy file="./tomcat/local-banner.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" />
+   <!-- Copy copy-over files for Tomcat -->
+   <copy todir="./build/roller-demo" overwrite="true">
+       <fileset dir="./tomcat" includes="**/**" />
+   </copy>
         
+   <!-- Copy copy-over files for JSPWiki -->
+   <copy todir="./build/roller-demo/webapps/wiki" overwrite="true">
+       <fileset dir="./jspwiki" includes="**/**" />
+   </copy>
+	        
    <chmod perm="+x">
        <fileset dir="./build/roller-demo/bin" includes="*.sh" />
    </chmod>

Copied: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/WEB-INF/jspwiki.properties
(from r280581, incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/jspwiki.properties)
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/WEB-INF/jspwiki.properties?p2=incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/WEB-INF/jspwiki.properties&p1=incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/jspwiki.properties&r1=280581&r2=280732&rev=280732&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/jspwiki.properties (original)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/WEB-INF/jspwiki.properties
Tue Sep 13 18:25:44 2005
@@ -119,7 +119,7 @@
 #  Example:
 #  jspwiki.baseURL = http://www.jspwiki.org/
 #
-jspwiki.baseURL=
+jspwiki.baseURL=http://localhost:8080/wiki/
 
 #  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
@@ -172,7 +172,7 @@
 #  The working directory is used to cache things like Lucene search
 #  results.
 #
-jspwiki.workDir =
+#jspwiki.workDir =
 
 ############################################################################
 #
@@ -207,7 +207,7 @@
 #
 #  This option can be overridden on a per-page basis using the SET directive.
 #
-jspwiki.translatorReader.camelCaseLinks = false
+jspwiki.translatorReader.camelCaseLinks = true
 
 #
 #  This sets the default template used by the Wiki engine.  The templates
@@ -218,7 +218,7 @@
 #
 #  This option can be overridden on a per-page basis using the SET directive.
 #
-jspwiki.templateDir = default
+jspwiki.templateDir = roller2
 
 #
 #  The name of the front page.  This is the page that gets loaded if no

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/CommentContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/CommentContent.jsp?rev=280732&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/CommentContent.jsp
(added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/CommentContent.jsp
Tue Sep 13 18:25:44 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_2.0/sandbox/standalone/jspwiki/templates/roller2/ConflictContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ConflictContent.jsp?rev=280732&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ConflictContent.jsp
(added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/ConflictContent.jsp
Tue Sep 13 18:25:44 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_2.0/sandbox/standalone/jspwiki/templates/roller2/DiffContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DiffContent.jsp?rev=280732&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DiffContent.jsp
(added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DiffContent.jsp
Tue Sep 13 18:25:44 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_2.0/sandbox/standalone/jspwiki/templates/roller2/DisplayMessage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DisplayMessage.jsp?rev=280732&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DisplayMessage.jsp
(added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/DisplayMessage.jsp
Tue Sep 13 18:25:44 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_2.0/sandbox/standalone/jspwiki/templates/roller2/EditContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditContent.jsp?rev=280732&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditContent.jsp
(added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditContent.jsp
Tue Sep 13 18:25:44 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="50" 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_2.0/sandbox/standalone/jspwiki/templates/roller2/EditTemplate.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditTemplate.jsp?rev=280732&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditTemplate.jsp
(added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/EditTemplate.jsp
Tue Sep 13 18:25:44 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_2.0/sandbox/standalone/jspwiki/templates/roller2/FindContent.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/FindContent.jsp?rev=280732&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/FindContent.jsp
(added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/FindContent.jsp
Tue Sep 13 18:25:44 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_2.0/sandbox/standalone/jspwiki/templates/roller2/calendar.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/calendar.css?rev=280732&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/calendar.css
(added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/calendar.css
Tue Sep 13 18:25:44 2005
@@ -0,0 +1,40 @@
+/* This class is related to the popup javascript calendar for date selection */
+
+div.calDiv {
+    background-color: #ffffff;
+    color: #000000;
+    color: #000000;
+    padding: 0px;
+    position: absolute;
+    visibility: hidden;
+    z-index: 11000;
+}
+
+div.calDiv a {
+    background-color: transparent;
+    color: #000000;
+    font-weight: normal;
+    text-decoration: none;
+}
+
+div.calDiv a.cpOtherMonthDate {
+    background: transparent;
+    color: #808080;
+}
+
+div.calDiv a:visited {
+    background-color: transparent;
+    color: #000000;
+    text-decoration: none;
+}
+
+div.calDiv a:hover {
+    background: transparent;
+    color: #0000ff;
+    text-decoration: underline overline;
+}
+
+img.calIcon {
+    margin-top: 2px;
+    vertical-align: top !important;
+}

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/commonheader.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/commonheader.jsp?rev=280732&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/commonheader.jsp
(added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/commonheader.jsp
Tue Sep 13 18:25:44 2005
@@ -0,0 +1,20 @@
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+  <link rel="stylesheet" type="text/css" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/jspwiki.css"
/>
+  <%@ include file="/scripts/cssinclude.js" %>
+  <script src="<wiki:BaseURL/>scripts/search_highlight.js" type="text/javascript"></script>
+  <script src="<wiki:BaseURL/>scripts/jspwiki-common.js" type="text/javascript"></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" />
+  <link rel="stylesheet" type="text/css" media="print" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/jspwiki_print.css"
/>
+  <link rel="alternate stylesheet" type="text/css" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/jspwiki_print.css"
title="Print friendly" />
+  <link rel="alternate stylesheet" type="text/css" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/jspwiki.css"
title="Standard" />
+  <link rel="icon" type="image/png" href="<wiki:BaseURL/>images/favicon.png" />
+  <link rel="stylesheet" type="text/css" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/layout.css"
/>
+  <link rel="stylesheet" type="text/css" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/roller.css"
/>
+  <link rel="stylesheet" type="text/css" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/layout.css"
/>
+  <link rel="stylesheet" type="text/css" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/menu.css"
/>
+  <link rel="stylesheet" type="text/css" href="<wiki:BaseURL/>templates/<wiki:TemplateDir/>/tan/colors.css"
/>
+  <wiki:FeedDiscovery />
+

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/cssinclude.js
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/cssinclude.js?rev=280732&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/cssinclude.js
(added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/jspwiki/templates/roller2/cssinclude.js
Tue Sep 13 18:25:44 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" />
+

Modified: incubator/roller/branches/roller_2.0/sandbox/standalone/src/org/roller/jspwiki/AttachmentProvider.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/src/org/roller/jspwiki/AttachmentProvider.java?rev=280732&r1=280731&r2=280732&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/src/org/roller/jspwiki/AttachmentProvider.java
(original)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/src/org/roller/jspwiki/AttachmentProvider.java
Tue Sep 13 18:25:44 2005
@@ -5,11 +5,12 @@
 import java.util.Properties;
 
 import com.ecyrd.jspwiki.NoRequiredPropertyException;
+import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.providers.BasicAttachmentProvider;
 
 public class AttachmentProvider extends BasicAttachmentProvider {
 	
-	public void initialize(Properties properties)
+	public void initialize(WikiEngine engine, Properties properties)
 			throws NoRequiredPropertyException, IOException {
 		
 		String rollerStorageDir = System.getProperty("rollerStorageDir");
@@ -19,6 +20,6 @@
 			properties.put(PROP_STORAGEDIR, rollerStorageDir);
 		}
 		
-		super.initialize(properties);
+		super.initialize(engine, properties);
 	}
 }

Modified: incubator/roller/branches/roller_2.0/sandbox/standalone/src/org/roller/jspwiki/PageProvider.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/src/org/roller/jspwiki/PageProvider.java?rev=280732&r1=280731&r2=280732&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/src/org/roller/jspwiki/PageProvider.java
(original)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/src/org/roller/jspwiki/PageProvider.java
Tue Sep 13 18:25:44 2005
@@ -5,11 +5,12 @@
 import java.util.Properties;
 
 import com.ecyrd.jspwiki.NoRequiredPropertyException;
+import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.providers.VersioningFileProvider;
 
 public class PageProvider extends VersioningFileProvider {
 	
-	public void initialize(Properties properties)
+	public void initialize(WikiEngine engine, Properties properties)
 			throws NoRequiredPropertyException, IOException {
 		
 		String rollerPageDir = System.getProperty("rollerPageDir");
@@ -19,6 +20,6 @@
 			properties.put(PROP_PAGEDIR, rollerPageDir);
 		} 
 		
-		super.initialize(properties);
+		super.initialize(engine, properties);
 	}
 }

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/bin/setenv.bat
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/bin/setenv.bat?rev=280732&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/bin/setenv.bat (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/bin/setenv.bat Tue Sep
13 18:25:44 2005
@@ -0,0 +1,2 @@
+set JAVA_OPTS=-Dhsqldb_database=%CATALINA_HOME%\blogdata\rollerdb -Dhsqldb_port=7475 -DrollerPageDir=%CATALINA_HOME%\wikidata
-DrollerStorageDir=%CATALINA_HOME%\wikiattachments
+set CATALINA_TMPDIR=\temp
\ No newline at end of file

Added: incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/bin/setenv.sh
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/bin/setenv.sh?rev=280732&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/bin/setenv.sh (added)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/bin/setenv.sh Tue Sep 13
18:25:44 2005
@@ -0,0 +1,3 @@
+#
+JAVA_OPTS="-Dhsqldb_database=${CATALINA_HOME}/blogdata/rollerdb -Dhsqldb_port=7475 -DrollerPageDir=${CATALINA_HOME}/wikidata
-DrollerStorageDir=${CATALINA_HOME}/wikiattachments"
+export JAVA_OPTS
\ No newline at end of file

Copied: incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/webapps/roller/WEB-INF/classes/hibernate.cfg.xml
(from r280581, incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/hibernate.cfg.xml)
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/webapps/roller/WEB-INF/classes/hibernate.cfg.xml?p2=incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/webapps/roller/WEB-INF/classes/hibernate.cfg.xml&p1=incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/hibernate.cfg.xml&r1=280581&r2=280732&rev=280732&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/hibernate.cfg.xml (original)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/tomcat/webapps/roller/WEB-INF/classes/hibernate.cfg.xml
Tue Sep 13 18:25:44 2005
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE hibernate-configuration PUBLIC
-        "-//Hibernate/Hibernate Configuration DTD 2.0//EN"
-        "http://hibernate.sourceforge.net/hibernate-configuration-2.0.dtd">
+        "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
     <session-factory name="java:comp/env/hibernate/SessionFactory">
         <property name="show_sql">false</property>



Mime
View raw message