Author: snoopdave
Date: Sun May 8 18:58:06 2011
New Revision: 1100790
URL: http://svn.apache.org/viewvc?rev=1100790&view=rev
Log:
Removing uploads.dir and setting uploads.migrate.auto=false in
roller.properties, so that 4.0 to 5.0 file migration will not happen unless
explicitly enabled by user
Modified:
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide.html
roller/trunk/weblogger-docs/installguide/generated/roller-install-guide.pdf
roller/trunk/weblogger-docs/installguide/roller-install-guide.odt
Modified:
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1100790&r1=1100789&r2=1100790&view=diff
==============================================================================
---
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties
(original)
+++
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties
Sun May 8 18:58:06 2011
@@ -112,14 +112,12 @@ mediafiles.storage.dir=${user.home}/roll
# The context path under which resoures will be made available
mediafile.resource.url=/resources
-# The directory in which Roller will upload files
-uploads.dir=${user.home}/roller_data/uploads
-
-# The context path under which resoures will be made available
-uploads.url=/resources
+# The directory in which Roller 4.0 used to upload files
+# (only set this if you want 4.0 to 5.0 migration of uploaded files to occur)
+# uploads.dir=${user.home}/roller_data/uploads
# Migrate old file resoures to Roller 5.0 Mediafile Storage automatically
-uploads.migrate.auto=true
+uploads.migrate.auto=false
# Directory in which search index is to be created
# (delete this directory to force Roller to recreate the entire search index)
Modified:
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide.html
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide.html?rev=1100790&r1=1100789&r2=1100790&view=diff
==============================================================================
---
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide.html
(original)
+++
roller/trunk/weblogger-docs/installguide/generated/html/roller-install-guide.html
Sun May 8 18:58:06 2011
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN"
"http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml";><!--This file was converted to
xhtml by OpenOffice.org - see http://xml.openoffice.org/odf2xhtml for more
info.--><head profile="http://dublincore.org/documents/dcmi-terms/";><meta
http-equiv="Content-Type" content="application/xhtml+xml;
charset=utf-8"/><title xml:lang="en-US">- no title specified</title><meta
name="DCTERMS.title" content="" xml:lang="en-US"/><meta name="DCTERMS.language"
content="en-US" scheme="DCTERMS.RFC4646"/><meta name="DCTERMS.source"
content="http://xml.openoffice.org/odf2xhtml"/><meta name="DCTERMS.issued"
content="2007-07-06T11:18:20" scheme="DCTERMS.W3CDTF"/><meta
name="DCTERMS.modified" content="2011-05-02T20:57:25"
scheme="DCTERMS.W3CDTF"/><meta name="DCTERMS.provenance" content=""
xml:lang="en-US"/><meta name="DCTERMS.subject" content=", OpenDS Directory
Server Administration Framework" xml:lang="en-US"/><link rel="schema.DC"
href="http://purl.org/dc/elements/1.1/"; hreflang="en"/><link rel="schema.DCTER
MS" href="http://purl.org/dc/terms/"; hreflang="en"/><link rel="schema.DCTYPE"
href="http://purl.org/dc/dcmitype/"; hreflang="en"/><link rel="schema.DCAM"
href="http://purl.org/dc/dcam/"; hreflang="en"/><base href="."/><style
type="text/css">
+<html xmlns="http://www.w3.org/1999/xhtml";><!--This file was converted to
xhtml by OpenOffice.org - see http://xml.openoffice.org/odf2xhtml for more
info.--><head profile="http://dublincore.org/documents/dcmi-terms/";><meta
http-equiv="Content-Type" content="application/xhtml+xml;
charset=utf-8"/><title xml:lang="en-US">- no title specified</title><meta
name="DCTERMS.title" content="" xml:lang="en-US"/><meta name="DCTERMS.language"
content="en-US" scheme="DCTERMS.RFC4646"/><meta name="DCTERMS.source"
content="http://xml.openoffice.org/odf2xhtml"/><meta name="DCTERMS.issued"
content="2007-07-06T11:18:20" scheme="DCTERMS.W3CDTF"/><meta
name="DCTERMS.modified" content="2011-05-08T14:49:00"
scheme="DCTERMS.W3CDTF"/><meta name="DCTERMS.provenance" content=""
xml:lang="en-US"/><meta name="DCTERMS.subject" content=", OpenDS Directory
Server Administration Framework" xml:lang="en-US"/><link rel="schema.DC"
href="http://purl.org/dc/elements/1.1/"; hreflang="en"/><link rel="schema.DCTER
MS" href="http://purl.org/dc/terms/"; hreflang="en"/><link rel="schema.DCTYPE"
href="http://purl.org/dc/dcmitype/"; hreflang="en"/><link rel="schema.DCAM"
href="http://purl.org/dc/dcam/"; hreflang="en"/><base href="."/><style
type="text/css">
@page { }
table { border-collapse:collapse; border-spacing:0; empty-cells:show }
td, th { vertical-align:top; font-size:12pt;}
@@ -104,14 +104,16 @@
.P57 { font-size:12pt; font-family:Times New Roman; writing-mode:lr-tb;
background-color:#ffff00; padding-bottom:0.0835in; padding-top:0in;
border-top-style:none; border-bottom-style:none; }
.P57_borderEnd { font-size:12pt; margin-bottom:0.0835in;
font-family:Times New Roman; writing-mode:lr-tb; background-color:#ffff00;
padding-top:0in; border-top-style:none;}
.P58 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in;
font-family:Times New Roman; writing-mode:lr-tb; }
- .P59 { font-size:14pt; margin-bottom:0.0835in; margin-top:0in;
font-family:Courier New; writing-mode:lr-tb; margin-left:1in; margin-right:0in;
text-indent:0in; }
+ .P59 { font-size:12pt; margin-bottom:0.0835in; margin-top:0in;
font-family:Times New Roman; writing-mode:lr-tb; }
.P6_borderStart { font-size:13pt; margin-top:0in; font-family:Times New
Roman; writing-mode:lr-tb; text-align:left ! important;
background-color:transparent; font-weight:normal; padding-bottom:0.0835in;
border-bottom-style:none; }
.P6 { font-size:13pt; font-family:Times New Roman; writing-mode:lr-tb;
text-align:left ! important; background-color:transparent; font-weight:normal;
padding-bottom:0.0835in; padding-top:0in; border-top-style:none;
border-bottom-style:none; }
.P6_borderEnd { font-size:13pt; margin-bottom:0.0835in;
font-family:Times New Roman; writing-mode:lr-tb; text-align:left ! important;
background-color:transparent; font-weight:normal; padding-top:0in;
border-top-style:none;}
- .P60 { font-size:14pt; margin-bottom:0.0835in; margin-top:0in;
font-family:Times New Roman; writing-mode:lr-tb; margin-left:0.5in;
margin-right:0in; text-indent:0in; }
- .P61 { font-size:18pt; font-style:italic; font-weight:bold;
margin-bottom:0.0835in; margin-top:0.1665in; font-family:Helvetica;
writing-mode:lr-tb; }
- .P62 { font-size:18pt; font-style:italic; font-weight:bold;
margin-bottom:0.0835in; margin-top:0.1665in; font-family:Helvetica;
writing-mode:lr-tb; }
+ .P60 { font-size:11pt; margin-bottom:0.0835in; margin-top:0in;
font-family:Courier New; writing-mode:lr-tb; }
+ .P61 { font-size:14pt; margin-bottom:0.0835in; margin-top:0in;
font-family:Courier New; writing-mode:lr-tb; margin-left:1in; margin-right:0in;
text-indent:0in; }
+ .P62 { font-size:14pt; margin-bottom:0.0835in; margin-top:0in;
font-family:Times New Roman; writing-mode:lr-tb; margin-left:0.5in;
margin-right:0in; text-indent:0in; }
.P63 { font-size:18pt; font-style:italic; font-weight:bold;
margin-bottom:0.0835in; margin-top:0.1665in; font-family:Helvetica;
writing-mode:lr-tb; }
+ .P64 { font-size:18pt; font-style:italic; font-weight:bold;
margin-bottom:0.0835in; margin-top:0.1665in; font-family:Helvetica;
writing-mode:lr-tb; }
+ .P65 { font-size:18pt; font-style:italic; font-weight:bold;
margin-bottom:0.0835in; margin-top:0.1665in; font-family:Helvetica;
writing-mode:lr-tb; }
.P7_borderStart { font-size:36pt; margin-top:0in;
font-family:Helvetica, sans-serif; writing-mode:lr-tb; text-align:right !
important; background-color:transparent; font-weight:bold; padding-bottom:0in;
border-bottom-style:none; }
.P7 { font-size:36pt; font-family:Helvetica, sans-serif;
writing-mode:lr-tb; text-align:right ! important; background-color:transparent;
font-weight:bold; padding-bottom:0in; padding-top:0in; border-top-style:none;
border-bottom-style:none; }
.P7_borderEnd { font-size:36pt; margin-bottom:0in;
font-family:Helvetica, sans-serif; writing-mode:lr-tb; text-align:right !
important; background-color:transparent; font-weight:bold; padding-top:0in;
border-top-style:none;}
@@ -135,44 +137,44 @@
.Table2_B { width:5.7694in; }
.Bullet_20_Symbols { font-family:StarSymbol; font-size:9pt; }
.T1 { font-weight:bold; }
- .T10 { font-family:Courier New; font-size:10pt; }
- .T11 { font-family:Courier New; font-size:10pt; font-weight:bold; }
- .T12 { font-family:Courier New; font-size:11pt; }
- .T13 { font-family:Courier New; font-size:11pt; font-style:italic;
font-weight:bold; }
- .T14 { font-family:Courier New; font-size:11pt; font-style:normal;
font-weight:normal; }
- .T17 { font-style:italic; }
- .T18 { font-style:italic; font-weight:bold; }
- .T19 { font-style:italic; }
+ .T10 { font-family:Courier New; font-size:11pt; }
+ .T11 { font-family:Courier New; font-size:11pt; font-style:italic;
font-weight:bold; }
+ .T12 { font-family:Courier New; font-size:11pt; font-style:normal;
font-weight:normal; }
+ .T13 { font-style:italic; }
+ .T14 { font-style:italic; font-weight:bold; }
+ .T15 { font-style:italic; }
+ .T16 { font-family:Courier New; font-size:12pt; font-style:normal; }
+ .T17 { font-family:Courier New; font-style:italic; font-weight:bold; }
+ .T18 { font-family:Times New Roman; }
+ .T19 { font-family:Times New Roman; font-size:12pt; font-style:normal; }
.T2 { font-weight:bold; }
- .T20 { font-family:Courier New; font-size:12pt; font-style:normal; }
- .T21 { font-family:Courier New; font-style:italic; font-weight:bold; }
- .T22 { font-family:Times New Roman; }
- .T23 { font-family:Times New Roman; font-size:12pt; font-style:normal; }
- .T24 { font-family:Times New Roman; font-size:12pt; font-style:normal;
font-weight:bold; }
- .T25 { font-family:Times New Roman; font-size:12pt; font-style:normal;
font-weight:normal; }
- .T26 { font-family:Times New Roman; font-size:12pt; font-style:italic; }
- .T27 { font-family:Times New Roman; font-size:13pt; }
- .T28 { font-family:Courier New, monospace; font-size:12pt;
font-style:normal; }
- .T29 { font-family:Courier New; font-size:14pt;
background-color:#ffffff; }
+ .T20 { font-family:Times New Roman; font-size:12pt; font-style:normal;
font-weight:bold; }
+ .T21 { font-family:Times New Roman; font-size:12pt; font-style:normal;
font-weight:normal; }
+ .T22 { font-family:Times New Roman; font-size:12pt; font-style:italic; }
+ .T23 { font-family:Times New Roman; font-size:13pt; }
+ .T24 { font-family:Courier New, monospace; font-size:12pt;
font-style:normal; }
+ .T25 { font-family:Courier New; font-size:14pt;
background-color:#ffffff; }
+ .T26 { font-size:14pt; background-color:#ffffff; }
+ .T27 { font-family:Courier New; }
+ .T28 { font-size:12pt; font-style:normal; }
+ .T29 { font-size:12pt; }
.T3 { font-weight:bold; }
- .T30 { font-size:14pt; background-color:#ffffff; }
- .T31 { font-family:Courier New; }
- .T32 { font-size:12pt; font-style:normal; }
- .T33 { font-size:12pt; }
- .T34 { font-style:normal; }
- .T35 { font-weight:normal; }
- .T36 { font-size:13pt; }
- .T37 { font-size:14pt; }
- .T38 { font-size:11pt; }
- .T39 { font-size:11pt; font-weight:bold; }
+ .T30 { font-style:normal; }
+ .T31 { font-weight:normal; }
+ .T32 { font-size:13pt; }
+ .T33 { font-size:14pt; }
+ .T34 { font-size:11pt; }
+ .T35 { font-size:11pt; font-weight:bold; }
+ .T36 { color:#000000; font-family:Times New Roman;
letter-spacing:normal; font-style:normal; font-weight:bold; }
+ .T37 { font-family:Courier; }
+ .T38 { color:#ff0000; }
.T4 { font-family:Courier New; }
- .T41 { color:#000000; font-family:Times New Roman;
letter-spacing:normal; font-style:normal; font-weight:bold; }
- .T42 { font-family:Courier; }
- .T43 { color:#ff0000; }
.T5 { font-family:Courier New; font-size:12pt; font-style:normal; }
- .T7 { font-family:Courier New; font-size:12pt; }
- .T9 { font-family:Courier New; font-weight:bold; }
+ .T6 { font-family:Courier New; font-size:12pt; }
+ .T7 { font-family:Courier New; font-weight:bold; }
+ .T8 { font-family:Courier New; font-size:10pt; }
+ .T9 { font-family:Courier New; font-size:10pt; font-weight:bold; }
.Teletype { font-family:Cumberland, monospace; }
<!-- ODF styles with no properties representable as CSS -->
.Sect2 .Endnote_20_Symbol .Footnote_20_Symbol { }
[... 5 lines stripped ...]
Modified:
roller/trunk/weblogger-docs/installguide/generated/roller-install-guide.pdf
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-docs/installguide/generated/roller-install-guide.pdf?rev=1100790&r1=1100789&r2=1100790&view=diff
==============================================================================
Binary files - no diff available.
Modified: roller/trunk/weblogger-docs/installguide/roller-install-guide.odt
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-docs/installguide/roller-install-guide.odt?rev=1100790&r1=1100789&r2=1100790&view=diff
==============================================================================
Binary files - no diff available.
