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 2006/05/08 20:37:15 UTC
svn commit: r405126 - in /incubator/roller/trunk: ./ docs/installguide/
docs/installguide/generated/
Author: snoopdave
Date: Mon May 8 11:37:14 2006
New Revision: 405126
URL: http://svn.apache.org/viewcvs?rev=405126&view=rev
Log:
Preparing for 2.3 RC2
Modified:
incubator/roller/trunk/CHANGES.txt
incubator/roller/trunk/build.xml
incubator/roller/trunk/docs/installguide/generated/roller-install-guide.html
incubator/roller/trunk/docs/installguide/generated/roller-install-guide.pdf
incubator/roller/trunk/docs/installguide/generated/roller-install-guide.txt
incubator/roller/trunk/docs/installguide/roller-install-guide.odt
Modified: incubator/roller/trunk/CHANGES.txt
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/CHANGES.txt?rev=405126&r1=405125&r2=405126&view=diff
==============================================================================
--- incubator/roller/trunk/CHANGES.txt (original)
+++ incubator/roller/trunk/CHANGES.txt Mon May 8 11:37:14 2006
@@ -4,6 +4,15 @@
Roller 2.3: improvements and bug fixes, no major new features
+Apache policy compliance
+ * Java package name changed from org.roller to org.apache.roller
+ * Apache license header applied to all files
+ * JSPWiki plugin removed from release
+ * Ekit editor applet removed from release
+ * Javascript enhanced editor removed from release
+ * Hibernate jars removed from release
+ * Jazzy spell checker removed from release
+
Improvement
* [ROL-872] - Support for both entry summary and content
* [ROL-1079] - Slight modification on the file upload confirmation message
Modified: incubator/roller/trunk/build.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/build.xml?rev=405126&r1=405125&r2=405126&view=diff
==============================================================================
--- incubator/roller/trunk/build.xml (original)
+++ incubator/roller/trunk/build.xml Mon May 8 11:37:14 2006
@@ -646,25 +646,6 @@
src="${ro.build}/roller-${ro.version}.tar.gz" />
<untar src="${ro.build}/apache-release/roller-${ro.version}.tar"
dest="${ro.build}/apache-release" />
- <move todir="${ro.build}/unshippable/roller/theme/scripts">
- <fileset dir="${ro.build}/apache-release/roller/theme/scripts">
- <include name="demo.html" />
- <include name="i18n.js" />
- <include name="xmlp.js" />
- <include name="classes/**" />
- </fileset>
- </move>
- <move todir="${ro.build}/unshippable/roller/weblog">
- <fileset dir="${ro.build}/apache-release/roller/weblog">
- <include name="editor-ekit.jsp" />
- <include name="editor-text-js.jsp" />
- </fileset>
- </move>
- <move todir="${ro.build}/unshippable/roller/editor" >
- <fileset dir="${ro.build}/apache-release/roller/editor">
- <include name="ekitappletspell.jar" />
- </fileset>
- </move>
<move todir="${ro.build}/unshippable/roller/WEB-INF/lib" >
<fileset dir="${ro.build}/apache-release/roller/WEB-INF/lib">
<include name="hibernate3.jar" />
@@ -674,9 +655,7 @@
<include name="dom4j-1.6.1.jar" />
<include name="ehcache-1.1.jar" />
<include name="jdbc2_0-stdext.jar" />
- <include name="jta.jar" />
- <include name="JSPWiki.jar" />
- <include name="radeox.jar" />
+ <include name="jta.jar" />
</fileset>
</move>
<tar tarfile="${ro.build}/apache-roller-${ro.version}.tar"
@@ -684,11 +663,10 @@
includes="roller/**"/>
<gzip zipfile="${ro.build}/apache-roller-${ro.version}.tar.gz"
src="${ro.build}/apache-roller-${ro.version}.tar" />
- <tar tarfile="${ro.build}/unshippable-${ro.version}.tar"
- basedir="${ro.build}/unshippable"
- includes="roller/**"/>
- <gzip zipfile="${ro.build}/unshippable-${ro.version}.tar.gz"
- src="${ro.build}/unshippable-${ro.version}.tar" />
+ <tar tarfile="${ro.build}/required-jars-roller-webapp-${ro.version}.tar"
+ basedir="${ro.build}/unshippable/roller" />
+ <gzip zipfile="${ro.build}/required-jars-roller-webapp-${ro.version}.tar.gz"
+ src="${ro.build}/required-jars-roller-webapp-${ro.version}.tar" />
<delete>
<fileset dir="${ro.build}" includes="*.tar"/>
<fileset dir="${ro.build}/unshippable" includes="**" />
@@ -708,19 +686,7 @@
dest="${ro.build}/apache-release" />
<move todir="${ro.build}/unshippable/roller-src">
<fileset dir="${ro.build}/apache-release/roller-src">
- <include name="contrib/lib/JSPWiki.jar" />
- <include name="contrib/lib/radeox.jar" />
<include name="**/hibernate-3.1/**" />
- <include name="**/lib/ekit*" />
- <include name="**/lib/ekit*" />
- <include name="**/buildtime/ejb-1.1.jar" />
- <include name="**/theme/scripts/demo.html" />
- <include name="**/theme//scripts/i18n.js" />
- <include name="**/theme//scripts/xmlp.js" />
- <include name="**/theme//scripts/classes/**" />
- <include name="**/weblog/editor-ekit.jsp" />
- <include name="**/weblog/editor-text-js.jsp" />
- <include name="**/ekitappletspell.jar" />
</fileset>
</move>
<tar tarfile="${ro.build}/apache-roller-src-${ro.version}.tar"
@@ -728,11 +694,10 @@
includes="roller-src/**"/>
<gzip zipfile="${ro.build}/apache-roller-src-${ro.version}.tar.gz"
src="${ro.build}/apache-roller-src-${ro.version}.tar" />
- <tar tarfile="${ro.build}/unshippable-src-${ro.version}.tar"
- basedir="${ro.build}/unshippable"
- includes="roller-src/**"/>
- <gzip zipfile="${ro.build}/unshippable-src-${ro.version}.tar.gz"
- src="${ro.build}/unshippable-src-${ro.version}.tar" />
+ <tar tarfile="${ro.build}/required-jars-roller-src-${ro.version}.tar"
+ basedir="${ro.build}/unshippable/roller-src" />
+ <gzip zipfile="${ro.build}/required-jars-roller-src-${ro.version}.tar.gz"
+ src="${ro.build}/required-jars-roller-src-${ro.version}.tar" />
<delete>
<fileset dir="${ro.build}" includes="*.tar"/>
Modified: incubator/roller/trunk/docs/installguide/generated/roller-install-guide.html
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/docs/installguide/generated/roller-install-guide.html?rev=405126&r1=405125&r2=405126&view=diff
==============================================================================
--- incubator/roller/trunk/docs/installguide/generated/roller-install-guide.html (original)
+++ incubator/roller/trunk/docs/installguide/generated/roller-install-guide.html Mon May 8 11:37:14 2006
@@ -7,7 +7,7 @@
<META NAME="AUTHOR" CONTENT="Dave Johnson">
<META NAME="CREATED" CONTENT="20060123;11164600">
<META NAME="CHANGEDBY" CONTENT="Dave Johnson">
- <META NAME="CHANGED" CONTENT="20060505;15113200">
+ <META NAME="CHANGED" CONTENT="20060508;14292600">
<STYLE>
<!--
@page { size: 8.5in 11in; margin: 0.79in }
@@ -146,18 +146,6 @@
your app server 19</P>
<P STYLE="margin-left: 0.2in; margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size: 16pt"><B>Appendix
B: The WEB-INF/roller.properties file 20</B></FONT></P>
- <P STYLE="margin-left: 0.2in; margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size: 16pt"><B>Appendix
- C: Setting up the optional JSPWiki plugin 27</B></FONT></P>
- <P STYLE="margin-left: 0.39in; margin-bottom: 0in">Downloading and
- installing the required JSPWiki jars 27</P>
- <P STYLE="margin-left: 0.39in; margin-bottom: 0in">Enable the
- JSPWiki plugin via Roller property override 27</P>
- <P STYLE="margin-left: 0.2in; margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size: 16pt"><B>Appendix
- D: Setting up the optional Ekit editor page 28</B></FONT></P>
- <P STYLE="margin-left: 0.39in; margin-bottom: 0in">Downloading and
- installing the required Ekit applet jar 28</P>
- <P STYLE="margin-left: 0.39in; margin-bottom: 0in">Enable the Ekit
- plugin via Roller runtime configuration definitions file 28</P>
</DIV>
<P STYLE="margin-bottom: 0in"><BR>
</P>
@@ -276,7 +264,7 @@
<P>You also need to download and install some third-party jars, jars
that we can't include in Roller due to licensing restrictions. These
are the JDBC driver, JavaMail and Activation jars.</P>
-<H3>STEP 3.1: Download and install Hibernate</H3>
+<H3><A NAME="DDE_LINK4"></A>STEP 3.1: Download and install Hibernate</H3>
<P>Roller <I>requires</I> the Hibernate persistence library, which
you must download separately from Roller.
</P>
@@ -946,9 +934,11 @@
roller-custom.properties file, search for the string “org.roller”and
replace all occurances of it with “org.apache.roller”.</B></FONT></FONT></P>
<LI><P STYLE="margin-bottom: 0in"><FONT FACE="Thorndale"><FONT SIZE=3 STYLE="font-size: 13pt"><B>WARNING:
- The jars required for Roller's JSPWiki plugin and Ekit editor have
- been removed from the Roller distribution. If you'd like to continue
- to use these plugins, please refer to Appendices C and D.</B></FONT></FONT></P>
+ The files required for Roller's JSPWiki plugin, Ekit editor and
+ Javascript enhanced editor have been removed from the Roller
+ distribution. If you'd like to continue to use these plugins, please
+ visit the Roller Support project on Java.Net
+ (http://roller.dev.java.net).</B></FONT></FONT></P>
</UL>
<H3><A NAME="section-UpgradeGuide_2.1-STEP4UpgradeTheDatabase4"></A><A NAME="ref-UpgradeGuide_2.1-4"></A>
STEP 4: Upgrade the database
@@ -1754,95 +1744,7 @@
<P STYLE="margin-bottom: 0in"><FONT FACE="Courier New"><FONT SIZE=2>aggregator.enabled=false</FONT></FONT></P>
<P STYLE="margin-bottom: 0in"><FONT FACE="Courier New"><FONT SIZE=2>aggregator.cache.enabled=</FONT></FONT></P>
<P STYLE="margin-bottom: 0in"><FONT FACE="Courier New"><FONT SIZE=2>aggregator.cache.timeout=14400</FONT></FONT></P>
-<P STYLE="margin-bottom: 0in"><BR>
-</P>
-<H2 STYLE="page-break-before: always">Appendix C: Setting up the
-optional JSPWiki plugin</H2>
-<P>If you'd like to use Roller's JSPWiki plugin, you must 1) download
-and install the required JSPWiki jars and 2) enable the JSPWiki
-plugin via a Roller custom configuration file.</P>
-<P><B>WARNING</B>: The JSPWiki editor has been deprecated (due to
-LGPL licensing) and may be removed from a future release of Roller.</P>
-<H3>Downloading and installing the required JSPWiki jars</H3>
-<P>Download JSPWiki version 2.2.33 from <A HREF="http://jspwiki.org/">http://jspwiki.org</A>,
-copy the following jars from JSPWiki's WEB-INF/lib directory to
-Roller's WEB-INF/lib directory:</P>
-<UL>
- <LI><P>JSPWiki.jar</P>
- <LI><P>ecs.jar</P>
- <LI><P>jrcs-diff.jar</P>
- <LI><P>oscache.jar</P>
-</UL>
-<P><B>NOTE</B>: The Roller Support project at Java.Net offers some
-bundles that might make this part of the installation easier. Visit
-<A HREF="http://roller.dev.java.net/">http://roller.dev.java.net</A>
-for more information.</P>
-<H3>Enable the JSPWiki plugin via Roller property override</H3>
-<P>Follow the instructions in Appendix B for setting up a
-<FONT FACE="Courier New">roller-custom.properties</FONT> file. You'll
-need to override the <FONT FACE="Courier New">plugins.page</FONT>
-property to ensure that the JSPWiki plugin is included in the list.
-For example, this setting would add the JSPWiki to the end of the
-list of built-in Roller plugins:</P>
-<P STYLE="margin-bottom: 0in"><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 9pt">plugins.page=\</FONT></FONT></P>
-<P STYLE="margin-bottom: 0in"><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 9pt">org.apache.roller.presentation.velocity.plugins.convertbreaks.ConvertLineBreaksPlugin
-\</FONT></FONT></P>
-<P STYLE="margin-bottom: 0in"><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 9pt">,org.apache.roller.presentation.velocity.plugins.topictag.TopicTagPlugin
-\</FONT></FONT></P>
-<P STYLE="margin-bottom: 0in"><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 9pt">,org.apache.roller.presentation.velocity.plugins.search.WikipediaLinkPlugin
-\</FONT></FONT></P>
-<P STYLE="margin-bottom: 0in"><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 9pt">,org.apache.roller.presentation.velocity.plugins.search.GoogleLinkPlugin
-\</FONT></FONT></P>
-<P STYLE="margin-bottom: 0in"><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 9pt">,org.apache.roller.presentation.velocity.plugins.textile.TextilePlugin
-\</FONT></FONT></P>
-<P STYLE="margin-bottom: 0in"><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 9pt">,org.apache.roller.presentation.velocity.plugins.acronyms.AcronymsPlugin
-\</FONT></FONT></P>
-<P STYLE="margin-bottom: 0in"><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 9pt">,org.apache.roller.presentation.velocity.plugins.bookmarks.BookmarkPlugin
-\</FONT></FONT></P>
-<P STYLE="margin-bottom: 0in"><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 9pt">,org.apache.roller.presentation.velocity.plugins.email.ObfuscateEmailPlugin
-\</FONT></FONT></P>
-<P STYLE="margin-bottom: 0in"><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 9pt">,org.apache.roller.presentation.velocity.plugins.smileys.SmileysPlugin
-\</FONT></FONT></P>
-<P STYLE="margin-bottom: 0in"><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 9pt">,org.apache.roller.presentation.velocity.plugins.readmore.ReadMorePlugin<B>
-\</B></FONT></FONT></P>
-<P STYLE="margin-bottom: 0in"><A NAME="DDE_LINK2"></A><FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 9pt"><B>,org.apache.roller.presentation.velocity.plugins.jspwiki.WikiPlugin</B></FONT></FONT></P>
-<P STYLE="margin-bottom: 0in"><BR>
-</P>
-<P><BR><BR>
-</P>
-<P><BR><BR>
+<P STYLE="margin-bottom: 0in; font-weight: medium"><BR>
</P>
-<H2 STYLE="page-break-before: always">Appendix D: Setting up the
-optional Ekit editor page</H2>
-<P>If you'd like to continue to use Roller's Ekit editor page, which
-was deprecated in Roller 2.3, you must 1) download and install the
-Ekit applet jar and 2) add the Ekit page to the list of available
-editors in the Roller runtime configuration file.</P>
-<P><B>WARNING</B>: The Ekit editor has been deprecated (due to LGPL
-licensing) and may be removed from a future release of Roller.</P>
-<H3>Downloading and installing the required Ekit applet jar</H3>
-<P>Download Ekit version 1.1 from <A HREF="http://www.hexidec.com/ekit.phaa">http://www.hexidec.com/ekit.ph</A>p
-and place the Ekit <FONT FACE="Courier New">ekitappletspell.jar</FONT>
-jar in Roller's editor direcotory.</P>
-<P><B>NOTE</B>: The Roller Support project at Java.Net offers some
-bundles that might make this part of the installation easier. Visit
-<A HREF="http://roller.dev.java.net/">http://roller.dev.java.net</A>
-for more information.</P>
-<H3>Enable the Ekit plugin via Roller runtime configuration
-definitions file</H3>
-<P>If you want users to be able to pick the old Ekit editor page,
-then you'll need to add it to the Roller runtime configuration
-definition file in <FONT FACE="Courier New">WEB-INF/rollerRuntimeConfigDefs.xml</FONT>
-as follows:</P>
-<P STYLE="margin-bottom: 0in; font-weight: medium"><FONT FACE="Courier New"><FONT SIZE=2><property-def
- name="users.editor.pages" key="configForm.editorPages"></FONT></FONT></P>
-<P STYLE="margin-bottom: 0in; font-weight: medium">
-<FONT FACE="Courier New"><FONT SIZE=2><type>text</type></FONT></FONT></P>
-<P STYLE="margin-bottom: 0in; font-weight: medium">
-<FONT FACE="Courier New"><FONT SIZE=2><default-value>editor-text.jsp,editor-rte.jsp,
-<B>editor-ekit.jsp</B></default-value></FONT></FONT></P>
-<P STYLE="margin-bottom: 0in; font-weight: medium"> <FONT FACE="Courier New"><FONT SIZE=2><rows>3</rows></FONT></FONT></P>
-<P STYLE="margin-bottom: 0in; font-weight: medium"> <FONT FACE="Courier New"><FONT SIZE=2><cols>40</cols></FONT></FONT></P>
-<P STYLE="margin-bottom: 0in; font-weight: medium"><FONT FACE="Courier New"><FONT SIZE=2></property-def></FONT></FONT></P>
</BODY>
</HTML>
Modified: incubator/roller/trunk/docs/installguide/generated/roller-install-guide.pdf
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/docs/installguide/generated/roller-install-guide.pdf?rev=405126&r1=405125&r2=405126&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/roller/trunk/docs/installguide/generated/roller-install-guide.txt
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/docs/installguide/generated/roller-install-guide.txt?rev=405126&r1=405125&r2=405126&view=diff
==============================================================================
--- incubator/roller/trunk/docs/installguide/generated/roller-install-guide.txt (original)
+++ incubator/roller/trunk/docs/installguide/generated/roller-install-guide.txt Mon May 8 11:37:14 2006
@@ -57,12 +57,6 @@
STEP 4: Upgrade the database 18
STEP 5: Startup your app server 19
Appendix B: The WEB-INF/roller.properties file 20
-Appendix C: Setting up the optional JSPWiki plugin 27
-Downloading and installing the required JSPWiki jars 27
-Enable the JSPWiki plugin via Roller property override 27
-Appendix D: Setting up the optional Ekit editor page 28
-Downloading and installing the required Ekit applet jar 28
-Enable the Ekit plugin via Roller runtime configuration definitions file 28
Introduction
This document describes how to install Roller in the following environment:
@@ -415,7 +409,7 @@
3.3 Review configuration properties
Review properties as described in STEP #8 of the installation guide.
WARNING: In Roller 2.3 we changed the Roller package names from org.roller to org.apache.roller. Because of this you MUST review your roller-custom.properties file, search for the string "org.roller"and replace all occurances of it with "org.apache.roller".
-WARNING: The jars required for Roller's JSPWiki plugin and Ekit editor have been removed from the Roller distribution. If you'd like to continue to use these plugins, please refer to Appendices C and D.
+WARNING: The files required for Roller's JSPWiki plugin, Ekit editor and Javascript enhanced editor have been removed from the Roller distribution. If you'd like to continue to use these plugins, please visit the Roller Support project on Java.Net (http://roller.dev.java.net).
STEP 4: Upgrade the database
Use the appropriate database upgrade script to upgrade your database. To do this, login to your database and run one (or more) of the Roller upgrade scripts located in Roller's WEB-INF/dbscripts directory that corresponds to your database. There's a directory for MySQL, PostgreSQL, HSQLDB and more.
The database script directories
@@ -820,44 +814,3 @@
aggregator.cache.enabled=
aggregator.cache.timeout=14400
-Appendix C: Setting up the optional JSPWiki plugin
-If you'd like to use Roller's JSPWiki plugin, you must 1) download and install the required JSPWiki jars and 2) enable the JSPWiki plugin via a Roller custom configuration file.
-WARNING: The JSPWiki editor has been deprecated (due to LGPL licensing) and may be removed from a future release of Roller.
-Downloading and installing the required JSPWiki jars
-Download JSPWiki version 2.2.33 from http://jspwiki.org, copy the following jars from JSPWiki's WEB-INF/lib directory to Roller's WEB-INF/lib directory:
-JSPWiki.jar
-ecs.jar
-jrcs-diff.jar
-oscache.jar
-NOTE: The Roller Support project at Java.Net offers some bundles that might make this part of the installation easier. Visit http://roller.dev.java.net for more information.
-Enable the JSPWiki plugin via Roller property override
-Follow the instructions in Appendix B for setting up a roller-custom.properties file. You'll need to override the plugins.page property to ensure that the JSPWiki plugin is included in the list. For example, this setting would add the JSPWiki to the end of the list of built-in Roller plugins:
-plugins.page=\
-org.apache.roller.presentation.velocity.plugins.convertbreaks.ConvertLineBreaksPlugin \
-,org.apache.roller.presentation.velocity.plugins.topictag.TopicTagPlugin \
-,org.apache.roller.presentation.velocity.plugins.search.WikipediaLinkPlugin \
-,org.apache.roller.presentation.velocity.plugins.search.GoogleLinkPlugin \
-,org.apache.roller.presentation.velocity.plugins.textile.TextilePlugin \
-,org.apache.roller.presentation.velocity.plugins.acronyms.AcronymsPlugin \
-,org.apache.roller.presentation.velocity.plugins.bookmarks.BookmarkPlugin \
-,org.apache.roller.presentation.velocity.plugins.email.ObfuscateEmailPlugin \
-,org.apache.roller.presentation.velocity.plugins.smileys.SmileysPlugin \
-,org.apache.roller.presentation.velocity.plugins.readmore.ReadMorePlugin \
-,org.apache.roller.presentation.velocity.plugins.jspwiki.WikiPlugin
-
-
-
-Appendix D: Setting up the optional Ekit editor page
-If you'd like to continue to use Roller's Ekit editor page, which was deprecated in Roller 2.3, you must 1) download and install the Ekit applet jar and 2) add the Ekit page to the list of available editors in the Roller runtime configuration file.
-WARNING: The Ekit editor has been deprecated (due to LGPL licensing) and may be removed from a future release of Roller.
-Downloading and installing the required Ekit applet jar
-Download Ekit version 1.1 from http://www.hexidec.com/ekit.php and place the Ekit ekitappletspell.jar jar in Roller's editor direcotory.
-NOTE: The Roller Support project at Java.Net offers some bundles that might make this part of the installation easier. Visit http://roller.dev.java.net for more information.
-Enable the Ekit plugin via Roller runtime configuration definitions file
-If you want users to be able to pick the old Ekit editor page, then you'll need to add it to the Roller runtime configuration definition file in WEB-INF/rollerRuntimeConfigDefs.xml as follows:
-<property-def name="users.editor.pages" key="configForm.editorPages">
- <type>text</type>
- <default-value>editor-text.jsp,editor-rte.jsp, editor-ekit.jsp</default-value>
- <rows>3</rows>
- <cols>40</cols>
-</property-def>
\ No newline at end of file
Modified: incubator/roller/trunk/docs/installguide/roller-install-guide.odt
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/docs/installguide/roller-install-guide.odt?rev=405126&r1=405125&r2=405126&view=diff
==============================================================================
Binary files - no diff available.