roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r477239 - in /incubator/roller/branches/roller_3.1: ./ docs/installguide/ docs/installguide/generated/
Date Mon, 20 Nov 2006 16:22:36 GMT
Author: snoopdave
Date: Mon Nov 20 08:22:35 2006
New Revision: 477239

URL: http://svn.apache.org/viewvc?view=rev&rev=477239
Log:
Removing JavaMail and Activation jars from release, updating docs

Modified:
    incubator/roller/branches/roller_3.1/build.xml
    incubator/roller/branches/roller_3.1/docs/installguide/generated/roller-install-guide.html
    incubator/roller/branches/roller_3.1/docs/installguide/generated/roller-install-guide.pdf
    incubator/roller/branches/roller_3.1/docs/installguide/generated/roller-install-guide.txt
    incubator/roller/branches/roller_3.1/docs/installguide/roller-install-guide.odt

Modified: incubator/roller/branches/roller_3.1/build.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/build.xml?view=diff&rev=477239&r1=477238&r2=477239
==============================================================================
--- incubator/roller/branches/roller_3.1/build.xml (original)
+++ incubator/roller/branches/roller_3.1/build.xml Mon Nov 20 08:22:35 2006
@@ -661,6 +661,8 @@
         <!-- don't include unshippables in apache release -->
         <tarfileset dir="${build.dist.binary}"
                     prefix="apache-roller-${ro.version}">
+            <exclude name="webapp/roller/WEB-INF/lib/mail.jar" />
+            <exclude name="webapp/roller/WEB-INF/lib/activation.jar" />
             <exclude name="webapp/roller/WEB-INF/lib/hibernate3.jar" />
             <exclude name="webapp/roller/WEB-INF/lib/asm.jar" />
             <exclude name="webapp/roller/WEB-INF/lib/asm-attrs.jar" />
@@ -676,6 +678,8 @@
         <!-- don't include unshippables in apache release -->
         <zipfileset dir="${build.dist.binary}"
                     prefix="apache-roller-${ro.version}">
+            <exclude name="webapp/roller/WEB-INF/lib/mail.jar" />
+            <exclude name="webapp/roller/WEB-INF/lib/activation.jar" />
             <exclude name="webapp/roller/WEB-INF/lib/hibernate3.jar" />
             <exclude name="webapp/roller/WEB-INF/lib/asm.jar" />
             <exclude name="webapp/roller/WEB-INF/lib/asm-attrs.jar" />
@@ -695,6 +699,8 @@
         <!-- only include unshippables -->
         <tarfileset dir="${build.dist.binary}"
                     prefix="apache-roller-${ro.version}">
+            <exclude name="webapp/roller/WEB-INF/lib/mail.jar" />
+            <exclude name="webapp/roller/WEB-INF/lib/activation.jar" />
             <include name="webapp/roller/WEB-INF/lib/hibernate3.jar" />
             <include name="webapp/roller/WEB-INF/lib/asm.jar" />
             <include name="webapp/roller/WEB-INF/lib/asm-attrs.jar" />
@@ -709,6 +715,8 @@
     <zip destfile="${ro.dist}/required-jars-roller-${ro.version}.zip" >
         <zipfileset dir="${build.dist.binary}"
                     prefix="apache-roller-${ro.version}">
+            <exclude name="webapp/roller/WEB-INF/lib/mail.jar" />
+            <exclude name="webapp/roller/WEB-INF/lib/activation.jar" />
             <include name="webapp/roller/WEB-INF/lib/hibernate3.jar" />
             <include name="webapp/roller/WEB-INF/lib/asm.jar" />
             <include name="webapp/roller/WEB-INF/lib/asm-attrs.jar" />

Modified: incubator/roller/branches/roller_3.1/docs/installguide/generated/roller-install-guide.html
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/docs/installguide/generated/roller-install-guide.html?view=diff&rev=477239&r1=477238&r2=477239
==============================================================================
--- incubator/roller/branches/roller_3.1/docs/installguide/generated/roller-install-guide.html
(original)
+++ incubator/roller/branches/roller_3.1/docs/installguide/generated/roller-install-guide.html
Mon Nov 20 08:22:35 2006
@@ -3,19 +3,27 @@
 <HEAD>
 	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
 	<TITLE></TITLE>
-	<META NAME="GENERATOR" CONTENT="StarOffice 8  (Solaris x86)">
+	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.0  (Solaris x86)">
 	<META NAME="AUTHOR" CONTENT="Dave Johnson">
 	<META NAME="CREATED" CONTENT="20060123;11164600">
 	<META NAME="CHANGEDBY" CONTENT="Dave Johnson">
-	<META NAME="CHANGED" CONTENT="20060912;13352900">
+	<META NAME="CHANGED" CONTENT="20061120;9101800">
 	<STYLE>
 	<!--
 		@page { size: 8.5in 11in; margin: 0.5in }
 		P { margin-bottom: 0.08in }
 		P.western { font-family: "Times New Roman" }
 		H2.western { font-family: "Times New Roman" }
+		H2.cjk { font-family: "Andale Sans UI" }
+		H2.ctl { font-family: "Lucidasans" }
 		H3.western { font-family: "Times New Roman" }
+		H3.cjk { font-family: "Andale Sans UI" }
+		H3.ctl { font-family: "Lucidasans" }
 		H4.western { font-family: "Times New Roman"; font-size: 13pt }
+		H4.cjk { font-family: "Andale Sans UI" }
+		H4.ctl { font-family: "Lucidasans" }
+		PRE { font-family: "Cumberland", monospace }
+		TT { font-family: "Cumberland", monospace }
 	-->
 	</STYLE>
 </HEAD>
@@ -30,15 +38,17 @@
 </P>
 <P CLASS="western" ALIGN=CENTER STYLE="margin-bottom: 0in"><FONT SIZE=7 STYLE="font-size:
40pt"><B>Installation
 Guide</B></FONT></P>
-<P CLASS="western" ALIGN=CENTER STYLE="margin-bottom: 0in"><FONT COLOR="#ff0000"><FONT
SIZE=7 STYLE="font-size: 40pt"><B>DRAFT
-#20060912</B></FONT></FONT></P>
+<P CLASS="western" ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
+</P>
 <P CLASS="western" ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
 </P>
 <P CLASS="western" ALIGN=CENTER STYLE="margin-bottom: 0in"><FONT SIZE=7 STYLE="font-size:
32pt"><B>Apache
-Roller </B></FONT>
+Roller</B></FONT></P>
+<P CLASS="western" ALIGN=CENTER STYLE="margin-bottom: 0in">
+<FONT SIZE=5 STYLE="font-size: 20pt"><B>(incubating) </B></FONT>
 </P>
 <P CLASS="western" ALIGN=CENTER STYLE="margin-bottom: 0in"><A NAME="DDE_LINK1"></A>
-<FONT SIZE=5 STYLE="font-size: 20pt"><B>Version 3.0 (incubating)</B></FONT></P>
+<FONT SIZE=7 STYLE="font-size: 32pt"><B>Version 3.1</B></FONT></P>
 <P CLASS="western" ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
 </P>
 <P CLASS="western" ALIGN=CENTER STYLE="margin-bottom: 0in"><BR>
@@ -115,65 +125,94 @@
 		<FONT FACE="Albany, sans-serif"><FONT SIZE=4 STYLE="font-size: 16pt"><B>Table
 		of Contents</B></FONT></FONT></P>
 	</DIV>
-	<P STYLE="margin-left: 0.2in; margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size:
16pt"><B>Introduction	3</B></FONT></P>
+	<P STYLE="margin-left: 0.2in; margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size:
16pt"><B>Introduction	4</B></FONT></P>
 	<P STYLE="margin-left: 0.2in; margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size:
16pt"><B>STEP
-	1: Before you install Roller	4</B></FONT></P>
+	1: Before you install Roller	5</B></FONT></P>
 	<P STYLE="margin-left: 0.2in; margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size:
16pt"><B>STEP
-	2: Unpack the Roller distribution	5</B></FONT></P>
+	2: Unpack the Roller distribution	6</B></FONT></P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">UNIX example	6</P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">Windows example	6</P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">Roller
+	distribution layout	6</P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">The ROLLER
+	environment variable	6</P>
 	<P STYLE="margin-left: 0.2in; margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size:
16pt"><B>STEP
-	3: Install required third party jars	6</B></FONT></P>
+	3: Install required third party jars	7</B></FONT></P>
 	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">STEP 3.1:
-	Download and install Hibernate	6</P>
+	Download and install Hibernate	7</P>
 	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">STEP 3.2: Install
-	JDBC driver jar(s)	6</P>
+	JDBC driver jar(s)	7</P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">UNIX example	7</P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">Windows example	7</P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">NOTES	7</P>
 	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">STEP 3.3: Install
-	JavaMail and Activation jars	7</P>
+	JavaMail and Activation jars	9</P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">UNIX example	9</P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">Windows example	9</P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">NOTES	9</P>
 	<P STYLE="margin-left: 0.2in; margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size:
16pt"><B>STEP
-	4: Create Roller tables in your database	8</B></FONT></P>
+	4: Create Roller tables in your database	10</B></FONT></P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">UNIX example	10</P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">Windows
+	example	10</P>
 	<P STYLE="margin-left: 0.2in; margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size:
16pt"><B>STEP
-	5: Deploy Roller to your application server	9</B></FONT></P>
+	5: Deploy Roller to your application server	12</B></FONT></P>
 	<P STYLE="margin-left: 0.2in; margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size:
16pt"><B>STEP
-	6: Check your internationalization settings	11</B></FONT></P>
+	6: Check your internationalization settings	14</B></FONT></P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">Check your
+	application server's URI encoding setting!	14</P>
 	<P STYLE="margin-left: 0.2in; margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size:
16pt"><B>STEP
-	7: Setup Roller data directories 	12</B></FONT></P>
+	7: Setup Roller data directories 	15</B></FONT></P>
 	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">STEP 7.1: Create
-	uploads directory	12</P>
+	uploads directory	15</P>
 	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">STEP 7.2: Create
-	search-index directory	12</P>
+	search-index directory	15</P>
 	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">STEP 7.3: Create
-	planet-cache directory (optional)	12</P>
+	planet-cache directory (optional)	15</P>
 	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">STEP 7.4: Make
-	sure that the logs subdirectory exists	13</P>
+	sure that the logs subdirectory exists	15</P>
 	<P STYLE="margin-left: 0.2in; margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size:
16pt"><B>STEP
-	8: Review Roller configuration	14</B></FONT></P>
+	8: Review Roller configuration	16</B></FONT></P>
 	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">STEP 8.1: Review
-	the WEB-INF/classes/roller.properties file	14</P>
+	the WEB-INF/classes/roller.properties file	16</P>
 	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">Where to define
-	custom properties	14</P>
+	custom properties	16</P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">What properties
+	you should set	16</P>
 	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">STEP 8.2: Change
-	keys in the WEB-INF/security.xml file	15</P>
+	keys in the WEB-INF/security.xml file	17</P>
+	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">STEP 8.3: Verify
+	the database dialet setting in the Hibernate configuration file	17</P>
 	<P STYLE="margin-left: 0.2in; margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size:
16pt"><B>STEP
-	9: Start Tomcat and start using Roller	16</B></FONT></P>
+	9: Start Tomcat and start using Roller	18</B></FONT></P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">UNIX example	18</P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">Windows
+	example	18</P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">You're done! 	18</P>
 	<P STYLE="margin-left: 0.2in; margin-bottom: 0in"><FONT SIZE=4 STYLE="font-size:
16pt"><B>Appendix
-	A: Upgrading an existing Roller installation	17</B></FONT></P>
-	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">STEP 1: Shutdown
-	and backup your old Roller 	17</P>
-	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">STEP 2: Install
-	the new Roller 	17</P>
-	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">STEP 3: Copy
-	resources and update configs 	18</P>
+	A: Upgrading an existing Roller installation	19</B></FONT></P>
+	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">Important notes
+	about Roller 3.0	19</P>
+	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">UPGRADE STEP 1:
+	Shutdown and backup your old Roller 	20</P>
+	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">UPGRADE STEP 2:
+	Install the new Roller 	20</P>
+	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">UPGRADE STEP 3:
+	Copy resources and update configs 	20</P>
 	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">3.1 Copy your old
-	resources and other files you've added	18</P>
+	resources and other files you've added	20</P>
 	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">3.2 Remove
-	JavaMail jars if duplicated	18</P>
+	JavaMail jars if duplicated	20</P>
 	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">3.3 Review
-	configuration properties	18</P>
-	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">STEP 4: Upgrade
-	the database 	18</P>
-	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">STEP 5: Startup
-	your app server 	19</P>
+	configuration properties	21</P>
+	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">UPGRADE STEP 4:
+	Upgrade the database 	21</P>
+	<P STYLE="margin-left: 0.39in; margin-bottom: 0in">UPGRADE STEP 5:
+	Startup your app server 	21</P>
+	<P STYLE="margin-left: 0.59in; margin-bottom: 0in">And you're done!
+		21</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>
+	B: The WEB-INF/roller.properties file	23</B></FONT></P>
 </DIV>
 <P CLASS="western" STYLE="margin-bottom: 0in"><BR>
 </P>
@@ -371,27 +410,31 @@
 Install JavaMail and Activation jars</H3>
 <P CLASS="western">If you like to use Roller's e-mail notification
 features, you'll need to add the JavaMail and Activation jars to your
-application server's classpath. Currently, we ship these jars with
-Roller, but you will need to  <B>move</B> them from the Roller
-<FONT FACE="Courier New">WEB-INF/lib</FONT> directory and into the
-Tomcat <FONT FACE="Courier New">common/lib</FONT> directory, or your
-server's equivalent location.</P>
+application server's classpath. You can find them here:
+<A HREF="http://java.sun.com/products/javamail/">http://java.sun.com/products/javamail/</A>.
+Add them to Tomcat <FONT FACE="Courier New">common/lib</FONT>
+directory, or your server's equivalent location.</P>
 <H4 CLASS="western">UNIX example</H4>
-<P CLASS="western"><FONT FACE="Courier New"><FONT SIZE=3>	% mv
-$ROLLER/WEB-INF/lib/mail.jar $CATALINA_HOME/common/lib</FONT></FONT></P>
+<P CLASS="western"><FONT FACE="Courier New"><FONT SIZE=3>	% cp
+mail.jar $CATALINA_HOME/common/lib</FONT></FONT></P>
 <P CLASS="western"><FONT SIZE=2><FONT SIZE=3><FONT FACE="Courier New">
%
-mv $ROLLER/WEB-INF/lib/activation.jar $CATALINA_HOME/common/lib</FONT></FONT>
</FONT></P>
+cp activation.jar $CATALINA_HOME/common/lib</FONT></FONT>	</FONT></P>
 <H4 CLASS="western">Windows example</H4>
-<P CLASS="western"><FONT FACE="Courier New"><FONT SIZE=3>	c&gt; move
-%ROLLER%\WEB-INF\lib\mail.jar %CATALINA_HOME%\common\lib</FONT></FONT></P>
-<P CLASS="western"><FONT FACE="Courier New"><FONT SIZE=3>	C&gt; move
-%ROLLER%\WEB-INF\lib\activation.jar %CATALINA_HOME%\common\lib</FONT></FONT></P>
+<P CLASS="western"><FONT FACE="Courier New"><FONT SIZE=3>	c&gt; copy
+mail.jar %CATALINA_HOME%\common\lib</FONT></FONT></P>
+<P CLASS="western"><FONT FACE="Courier New"><FONT SIZE=3>	C&gt; copy
+activation.jar %CATALINA_HOME%\common\lib</FONT></FONT></P>
 <H4 CLASS="western">NOTES</H4>
 <UL>
 	<LI><P CLASS="western">To enable the Roller's e-mail notification
 	features, you'll also need to setup a mail session resource in your
 	application server configuration file (see the next section) and
 	you'll need to configure e-mail notification in the Roller UI.</P>
+	<LI><P CLASS="western">The Roller Support project at Java.Net offers
+	some bundles that might make this part of the installation easier.
+	It includes both mail.jar and activation.jar. Visit
+	<A HREF="http://roller.dev.java.net/">http://roller.dev.java.net</A>
+	for more information.</P>
 </UL>
 <H2 CLASS="western" STYLE="page-break-before: always"><A NAME="section-InstallationGuide_2.x-STEP3CreateRollerTablesInYourDatabase3"></A><A
NAME="ref-InstallationGuide_2.x-3"></A>
 STEP 4: Create Roller tables in your database</H2>
@@ -660,7 +703,7 @@
 <H3 CLASS="western">STEP 7.2: Create <TT>search-index</TT> directory</H3>
 <P CLASS="western">By default, Roller creates and maintains its text
 search index data in files under the directory</P>
-<P CLASS="western"><TT><FONT FACE="Courier New">	${user.home}/roller_data/roller-index</FONT></TT>
+<P CLASS="western"><TT><FONT FACE="Courier New">	${user.home}/roller_data/search-index</FONT></TT>
 </P>
 <P CLASS="western">Again, <TT><FONT FACE="Courier New">${user.home}</FONT>
 </TT>is the Java system property that normally evaluates to the home
@@ -1012,7 +1055,7 @@
 <PRE>   <FONT FACE="Courier New"><FONT SIZE=3>% cd $CATALINA_HOME/webapps</FONT></FONT>
    <FONT FACE="Courier New"><FONT SIZE=3>% mkdir /somewhere/safe/roller-old</FONT></FONT>
    <FONT FACE="Courier New"><FONT SIZE=3>% mv roller /somewhere/safe/roller-old</FONT></FONT></PRE><H3
CLASS="western">
-<A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller11"></A><A
NAME="section-UpgradeGuide_2.1-STEP2InstallTheNewRoller2"></A><A NAME="ref-UpgradeGuide_2.1-2"></A>
+<A NAME="section-UpgradeGuide_2.1-STEP2InstallTheNewRoller2"></A><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller11"></A><A
NAME="ref-UpgradeGuide_2.1-2"></A>
 UPGRADE STEP 2: Install the new Roller 
 </H3>
 <P CLASS="western">Follow the normal installation instructions to
@@ -1027,7 +1070,7 @@
 	the installation, we'll do that later 
 	</P>
 </UL>
-<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller12"></A><A
NAME="section-UpgradeGuide_2.1-STEP3CopyResourcesAndUpdateConfigs3"></A><A NAME="ref-UpgradeGuide_2.1-3"></A>
+<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP3CopyResourcesAndUpdateConfigs3"></A><A
NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller12"></A><A NAME="ref-UpgradeGuide_2.1-3"></A>
 UPGRADE STEP 3: Copy resources and update configs 
 </H3>
 <H4 CLASS="western"><A NAME="section-UpgradeGuide_2.1-3.1CopyYourOldResourcesAndOtherFilesYouveAdded"></A>
@@ -1045,16 +1088,9 @@
 NOTE: If you have any new themes under roller/themes, make sure to
 copy those as well. 
 </P>
-<H4 CLASS="western"><A NAME="section-UpgradeGuide_2.1-3.2RemoveJavaMailJarsIfDuplicated"></A>
-3.2 Remove JavaMail jars if duplicated</H4>
-<P CLASS="western">In an upgrade installation, you may already have
-the JavaMail jars <TT>mail.jar</TT> and <TT>activation.jar</TT> in
-your Tomcat <TT>common/lib</TT>. If so, you should remove them from
-the <TT>WEB-INF/lib</TT> directory within the web app. (Keep them
-only in the <TT>common/lib</TT> directory.) 
-</P>
-<H4 CLASS="western"><A NAME="section-UpgradeGuide_2.1-3.3ReviewConfigurationProperties"></A>
-3.3 Review configuration properties</H4>
+<H4 CLASS="western"></H4>
+<H4 CLASS="western" STYLE="page-break-before: always">3.2 Review
+configuration properties</H4>
 <P CLASS="western">Review properties as described in STEP #8 of the
 installation guide.</P>
 <UL>
@@ -1067,14 +1103,14 @@
 <P CLASS="western" STYLE="margin-bottom: 0in"><BR>
 </P>
 <UL>
-	<LI><P CLASS="western" STYLE="margin-bottom: 0in"><B>WARNING: The
-	files required for Roller's JSPWiki plugin, Ekit editor and
+	<LI VALUE=1><P CLASS="western" STYLE="margin-bottom: 0in"><B>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).</B></P>
 </UL>
-<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller13"></A><A
NAME="section-UpgradeGuide_2.1-STEP4UpgradeTheDatabase4"></A><A NAME="ref-UpgradeGuide_2.1-4"></A>
+<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP4UpgradeTheDatabase4"></A><A
NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller13"></A><A NAME="ref-UpgradeGuide_2.1-4"></A>
 UPGRADE STEP 4: Upgrade the database 
 </H3>
 <P CLASS="western">Use the appropriate database upgrade script to
@@ -1087,39 +1123,41 @@
 <P CLASS="western">The database script directories 
 </P>
 <UL>
-	<LI><P CLASS="western" STYLE="margin-bottom: 0in"><FONT FACE="Courier New">WEB-INF/dbscripts/mysql
-	</FONT>
+	<LI><P CLASS="western" STYLE="margin-bottom: 0in"><FONT FACE="Courier New"><FONT
SIZE=2 STYLE="font-size: 11pt">WEB-INF/dbscripts/mysql
+	</FONT></FONT>
 	</P>
-	<LI><P CLASS="western" STYLE="margin-bottom: 0in"><FONT FACE="Courier New">WEB-INF/dbscripts/postgresql
-	</FONT>
+	<LI><P CLASS="western" STYLE="margin-bottom: 0in"><FONT FACE="Courier New"><FONT
SIZE=2 STYLE="font-size: 11pt">WEB-INF/dbscripts/postgresql
+	</FONT></FONT>
 	</P>
-	<LI><P CLASS="western" STYLE="margin-bottom: 0in"><FONT FACE="Courier New">WEB-INF/dbscripts/hsql
-	</FONT>
+	<LI><P CLASS="western" STYLE="margin-bottom: 0in"><FONT FACE="Courier New"><FONT
SIZE=2 STYLE="font-size: 11pt">WEB-INF/dbscripts/hsql
+	</FONT></FONT>
 	</P>
 	<LI><P CLASS="western">and more... 
 	</P>
 </UL>
 <P CLASS="western">There is an upgrade script for each release of
 Roller. If you're upgrading from Roller 2.3, which was the last
-release before 3.0 you'll only need to run two scripts:
-<TT><FONT FACE="Courier New">210-to-230-migration.sql</FONT></TT>
and
+release before 3.0 you'll need to run three scripts:
+<TT><FONT FACE="Courier New">230-to-240-migration.sql</FONT></TT>,
 <FONT FACE="Courier New">240-to-300-migration.sql</FONT> (Roller 2.4
-was never officially released). For example, here's how you'd do that
-for a MySQL database running on UNIX: 
-</P>
-<PRE>    <FONT FACE="Courier New"><FONT SIZE=3>% cd $CATALINA_HOME/webapps/roller/WEB-INF/dbscripts/mysql</FONT></FONT>
-    <FONT FACE="Courier New"><FONT SIZE=3>% mysql -u root -p</FONT></FONT>
-    <FONT FACE="Courier New"><FONT SIZE=3>password: *****</FONT></FONT>
-    <FONT FACE="Courier New"><FONT SIZE=3>mysql&gt; use roller;</FONT></FONT>
-    <FONT FACE="Courier New"><FONT SIZE=3>mysql&gt; source 230-to-240-migration.sql</FONT></FONT>
-    <FONT FACE="Courier New"><FONT SIZE=3>mysql&gt; source 240-to-300-migration.sql</FONT></FONT>
-    <FONT FACE="Courier New"><FONT SIZE=3>mysql&gt; quit</FONT></FONT></PRE><P
CLASS="western">
+was never officially released) and finally <TT><FONT FACE="Courier New">300-to-310-migration.sql</FONT></TT>.
+For example, here's how you'd do that for a MySQL database running on
+UNIX: 
+</P>
+<PRE>    <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">%
cd $CATALINA_HOME/webapps/roller/WEB-INF/dbscripts/mysql</FONT></FONT>
+    <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">% mysql -u
root -p</FONT></FONT>
+    <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">password: *****</FONT></FONT>
+    <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">mysql&gt;
use roller;</FONT></FONT>
+    <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">mysql&gt;
source 230-to-240-migration.sql</FONT></FONT>
+    <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">mysql&gt;
source 240-to-300-migration.sql</FONT></FONT>
+    <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">mysql&gt;
source 300-to-310-migration.sql</FONT></FONT>
+    <FONT FACE="Courier New"><FONT SIZE=2 STYLE="font-size: 11pt">mysql&gt;
quit</FONT></FONT></PRE><P CLASS="western">
 <BR><BR>
 </P>
 <P CLASS="western">If you're upgrading from an earlier release you'll
 have to run each of the older scripts in order to upgrade your
 database.</P>
-<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller14"></A><A
NAME="section-UpgradeGuide_2.1-STEP5StartupTomcat5"></A><A NAME="ref-UpgradeGuide_2.1-5"></A>
+<H3 CLASS="western"><A NAME="section-UpgradeGuide_2.1-STEP5StartupTomcat5"></A><A
NAME="section-UpgradeGuide_2.1-STEP1ShutdownAndBackupYourOldRoller14"></A><A NAME="ref-UpgradeGuide_2.1-5"></A>
 UPGRADE STEP 5: Startup your app server 
 </H3>
 <P CLASS="western">Use the standard Tomcat <FONT FACE="Courier New">startup.sh</FONT>
@@ -1138,9 +1176,6 @@
 Roller user mailing list for help. If there are any interesting
 messages in the log files, send those along too. 
 </P>
-<P CLASS="western"><BR><BR>
-</P>
-<H2 CLASS="western"></H2>
 <H2 CLASS="western" STYLE="page-break-before: always">Appendix B: The
 <FONT FACE="Courier New">WEB-INF/roller.properties</FONT> file</H2>
 <P CLASS="western">This file defines the default start-up properties

Modified: incubator/roller/branches/roller_3.1/docs/installguide/generated/roller-install-guide.pdf
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/docs/installguide/generated/roller-install-guide.pdf?view=diff&rev=477239&r1=477238&r2=477239
==============================================================================
Binary files - no diff available.

Modified: incubator/roller/branches/roller_3.1/docs/installguide/generated/roller-install-guide.txt
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/docs/installguide/generated/roller-install-guide.txt?view=diff&rev=477239&r1=477238&r2=477239
==============================================================================
--- incubator/roller/branches/roller_3.1/docs/installguide/generated/roller-install-guide.txt
(original)
+++ incubator/roller/branches/roller_3.1/docs/installguide/generated/roller-install-guide.txt
Mon Nov 20 08:22:35 2006
@@ -174,15 +174,16 @@
 For MySQL 5.X users, we recommend that you use the J/Connector 3.1.X JDBC drivers instead
of the newer 3.1.X series, you'll also need to change the Hibernate configuration file to
use the MySQL5 dialect (see Section 8.3 for details on that).
 
 STEP 3.3: Install JavaMail and Activation jars
-If you like to use Roller's e-mail notification features, you'll need to add the JavaMail
and Activation jars to your application server's classpath. Currently, we ship these jars
with Roller, but you will need to  move them from the Roller WEB-INF/lib directory and into
the Tomcat common/lib directory, or your server's equivalent location.
+If you like to use Roller's e-mail notification features, you'll need to add the JavaMail
and Activation jars to your application server's classpath. You can find them here: http://java.sun.com/products/javamail/.
Add them to Tomcat common/lib directory, or your server's equivalent location.
 UNIX example
-	% mv $ROLLER/WEB-INF/lib/mail.jar $CATALINA_HOME/common/lib
-	% mv $ROLLER/WEB-INF/lib/activation.jar $CATALINA_HOME/common/lib	
+	% cp mail.jar $CATALINA_HOME/common/lib
+	% cp activation.jar $CATALINA_HOME/common/lib	
 Windows example
-	c> move %ROLLER%\WEB-INF\lib\mail.jar %CATALINA_HOME%\common\lib
-	C> move %ROLLER%\WEB-INF\lib\activation.jar %CATALINA_HOME%\common\lib
+	c> copy mail.jar %CATALINA_HOME%\common\lib
+	C> copy activation.jar %CATALINA_HOME%\common\lib
 NOTES
 To enable the Roller's e-mail notification features, you'll also need to setup a mail session
resource in your application server configuration file (see the next section) and you'll need
to configure e-mail notification in the Roller UI.
+The Roller Support project at Java.Net offers some bundles that might make this part of the
installation easier. It includes both mail.jar and activation.jar. Visit http://roller.dev.java.net
for more information.
 STEP 4: Create Roller tables in your database
 Create a new database within your MySQL installation, create a user with all privileges within
that database and run the Roller database creation script to create tables within that new
database. Roller includes database creation scripts for a variety of database, but MySQL is
the most widely used and best supported option. You can find the database creation scripts
in the Roller webapp directory $ROLLER/WEB-INF/dbscripts/<dbname>. Here's the list of
scripts currently in Roller:
 WEB-INF/dbscripts/mysql/creatdb.sql	
@@ -467,7 +468,7 @@
    % cp -r /somewhere/safe/roller-old/roller/resources .
 NOTE: If you have any new themes under roller/themes, make sure to copy those as well. 
 
-3.3 Review configuration properties
+3.2 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".
 

Modified: incubator/roller/branches/roller_3.1/docs/installguide/roller-install-guide.odt
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/docs/installguide/roller-install-guide.odt?view=diff&rev=477239&r1=477238&r2=477239
==============================================================================
Binary files - no diff available.



Mime
View raw message