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 2013/06/08 21:51:11 UTC
svn commit: r1491047 - in /roller/branches/fewer_modules/weblogger-docs: ./
devguide/ examples/ examples/rollertask/
examples/scripting/groovy/examples/rollerapi/
examples/scripting/groovy/src/org/apache/roller/scripting/ installguide/
installguide/gen...
Author: snoopdave
Date: Sat Jun 8 19:51:11 2013
New Revision: 1491047
URL: http://svn.apache.org/r1491047
Log:
Merge from trunk
Added:
roller/branches/fewer_modules/weblogger-docs/devguide/roller-doc-template.ott
- copied unchanged from r1490991, roller/trunk/weblogger-docs/devguide/roller-doc-template.ott
Removed:
roller/branches/fewer_modules/weblogger-docs/installguide/generated/
roller/branches/fewer_modules/weblogger-docs/installguide/old/
roller/branches/fewer_modules/weblogger-docs/roller-doc-template.ott
roller/branches/fewer_modules/weblogger-docs/templateguide/generated/
roller/branches/fewer_modules/weblogger-docs/userguide/generated/
Modified:
roller/branches/fewer_modules/weblogger-docs/README.txt
roller/branches/fewer_modules/weblogger-docs/examples/README.txt
roller/branches/fewer_modules/weblogger-docs/examples/rollertask/rollertask.sh
roller/branches/fewer_modules/weblogger-docs/examples/scripting/groovy/examples/rollerapi/groovy
roller/branches/fewer_modules/weblogger-docs/examples/scripting/groovy/src/org/apache/roller/scripting/GroovyRunner.java
roller/branches/fewer_modules/weblogger-docs/installguide/roller-install-guide.odt
Modified: roller/branches/fewer_modules/weblogger-docs/README.txt
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-docs/README.txt?rev=1491047&r1=1491046&r2=1491047&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-docs/README.txt (original)
+++ roller/branches/fewer_modules/weblogger-docs/README.txt Sat Jun 8 19:51:11 2013
@@ -1,10 +1,11 @@
In this directory you'll find:
- userguide/ - User guide in Open Office 2.0 ODT and PDF formats
- installguide/ - User guide in Open Office 2.0 ODT and PDF formats
+ userguide/ - User guide in Libre/Open Office 2.0 ODT
+ installguide/ - User guide in Libre/Open Office 2.0 ODT
examples/ - example configuration and script files
testing/ - Test plans (under development)
-
+Libre/Open Office offers Export-to-PDF and -to-HTML options if desired.
+PDF is provided with each production release.
Modified: roller/branches/fewer_modules/weblogger-docs/examples/README.txt
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-docs/examples/README.txt?rev=1491047&r1=1491046&r2=1491047&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-docs/examples/README.txt (original)
+++ roller/branches/fewer_modules/weblogger-docs/examples/README.txt Sat Jun 8 19:51:11 2013
@@ -1,6 +1,6 @@
Example Roller configuration and testing files
-rollertask - example script for running Roller asks on the command-line
+rollertask - example script for running Roller tasks on the command-line
configs/resin - example configs for Resin
configs/tomcat - example configs for Tomcat
configs/wbloggar - example config for w:bloggar blogging client
Modified: roller/branches/fewer_modules/weblogger-docs/examples/rollertask/rollertask.sh
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-docs/examples/rollertask/rollertask.sh?rev=1491047&r1=1491046&r2=1491047&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-docs/examples/rollertask/rollertask.sh (original)
+++ roller/branches/fewer_modules/weblogger-docs/examples/rollertask/rollertask.sh Sat Jun 8 19:51:11 2013
@@ -31,10 +31,7 @@ export CONFIG_OVERRIDE
# --- YOU SHOULD NOT NEED TO EDIT BELOW THIS LINE ---
-# Hack: setting catalina.base=. allows us to save log in ./logs
-
${JAVA_HOME}/bin/java \
- -Dcatalina.base=. \
-Droller.custom.config=${CONFIG_OVERRIDE} \
-cp ${WEBAPP_DIR}/WEB-INF/lib/roller-business.jar \
${WEBAPP_DIR}/WEB-INF/lib/roller-core.jar \
Modified: roller/branches/fewer_modules/weblogger-docs/examples/scripting/groovy/examples/rollerapi/groovy
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-docs/examples/scripting/groovy/examples/rollerapi/groovy?rev=1491047&r1=1491046&r2=1491047&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-docs/examples/scripting/groovy/examples/rollerapi/groovy (original)
+++ roller/branches/fewer_modules/weblogger-docs/examples/scripting/groovy/examples/rollerapi/groovy Sat Jun 8 19:51:11 2013
@@ -30,8 +30,6 @@ done
export RGPATH
-# Hack: setting catalina.base=. allows us to save log in ./logs
java \
-Droller.custom.config=roller-custom.properties \
--Dcatalina.base=. \
-classpath ${RGPATH} groovy.lang.GroovyShell $1 $2 $3 $4 $5 $6 $7 $8 $9 $10
Modified: roller/branches/fewer_modules/weblogger-docs/examples/scripting/groovy/src/org/apache/roller/scripting/GroovyRunner.java
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-docs/examples/scripting/groovy/src/org/apache/roller/scripting/GroovyRunner.java?rev=1491047&r1=1491046&r2=1491047&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-docs/examples/scripting/groovy/src/org/apache/roller/scripting/GroovyRunner.java (original)
+++ roller/branches/fewer_modules/weblogger-docs/examples/scripting/groovy/src/org/apache/roller/scripting/GroovyRunner.java Sat Jun 8 19:51:11 2013
@@ -86,9 +86,7 @@ ${GROOVY_HOME}/lib/commons-cli-1.0.jar:\
${WEBAPP_DIR}/WEB-INF/lib/roller-business.jar
echo ${RGPATH}
-# Hack: setting catalina.base=. allows us to save log in ./logs
java \
-Droller.custom.config=roller-custom.properties \
--Dcatalina.base=. \
-cp ${RGPATH} org.apache.roller.scripting.GroovyRunner $WEBAPP_DIR $JARS_DIR $1
*/
Modified: roller/branches/fewer_modules/weblogger-docs/installguide/roller-install-guide.odt
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-docs/installguide/roller-install-guide.odt?rev=1491047&r1=1491046&r2=1491047&view=diff
==============================================================================
Binary files - no diff available.