You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/07/08 15:24:26 UTC
svn commit: r1608775 - in /roller/trunk: NOTICE.txt README.txt
assembly-release/src/main/assembly/standard.xml docs/roller-install-guide.odt
Author: gmazza
Date: Tue Jul 8 13:24:25 2014
New Revision: 1608775
URL: http://svn.apache.org/r1608775
Log:
Added blurb to install guide on how to add external themes, simplified our notices.txt file to make it applicable for Roller today, adding .ODT doc files to distribution ZIP/tar.gz files.
Modified:
roller/trunk/NOTICE.txt
roller/trunk/README.txt
roller/trunk/assembly-release/src/main/assembly/standard.xml
roller/trunk/docs/roller-install-guide.odt
Modified: roller/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/roller/trunk/NOTICE.txt?rev=1608775&r1=1608774&r2=1608775&view=diff
==============================================================================
--- roller/trunk/NOTICE.txt (original)
+++ roller/trunk/NOTICE.txt Tue Jul 8 13:24:25 2014
@@ -5,15 +5,6 @@ COPYRIGHT NOTICES
This product includes:
-* Software developed by the Apache Software Foundation (http://www.apache.org)
- Copyright 2006 The Apache Software Foundation.
-
-* Software developed by the ROME project
- Copyright 2003-2006 Sun Microsystems, Inc.
-
-* The JDOM XML parser
- Copyright 2004 Brett McLaughlin & Jason Hunter. All rights reserved.
-
* Snippets of code from the Blojsom blog server
Copyright 2003 David A. Czarnecki & Mark Lussier. All rights reserved.
@@ -26,24 +17,15 @@ This product includes:
* Code written by Dave Johnson for RSS and Atom in Action
Copyright 2005 David M Johnson (For RSS and Atom In Action)
-* A Struts LinkTag and LinkParamTag by BSquare Software
- Copyright 2001 Bsquare Projects
-
* The Xinha WYSIWYG editor, which includes HTMLArea
- Copyright dynarch.com, 2003-2004
- Copyright 2002 interactivetools.com, inc.
-
-* The Scriptalicious JavaScript library
- Copyright 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
- Copyright 1998-2004. Erik Bosrup. All rights reserved.
-
+ htmlArea License (based on BSD license)
+ Copyright (c) 2002-2004, interactivetools.com, inc.
+ Copyright (c) 2003-2004 dynarch.com
+ All rights reserved.
+ http://trac.xinha.org/wiki/Licence
OTHER NOTICES
-* Roller includes Acegi Security
- "This product includes software developed by the Acegi Security
- System for Spring Project (http://acegisecurity.org)"
-
* Roller includes icons by Mark James (http://www.famfamfam.com/lab/icons)
@@ -52,16 +34,19 @@ CREDITS
Roller committers (in chronological order):
David M Johnson
-Lance Lanvandowska
+Lance Lanvandowska (emeritus)
Matt Raible
Mindaguas Idzelis (emeritus)
Jaap Van Der Molen (emeritus)
Anil Gangolli
-Henri Yandell
+Henri Yandell (emeritus)
Allen Gilliland (emeritus)
Elias Torres (emeritus)
Matt Schmidt (emeritus)
Jeff Blattman (emeritus)
Craig Russell
Greg Huber
+Ganesh Mathrerootham (emeritus)
+Shelan Perera (emeritus)
Glen Mazza
+Gaurav Saini
Modified: roller/trunk/README.txt
URL: http://svn.apache.org/viewvc/roller/trunk/README.txt?rev=1608775&r1=1608774&r2=1608775&view=diff
==============================================================================
--- roller/trunk/README.txt (original)
+++ roller/trunk/README.txt Tue Jul 8 13:24:25 2014
@@ -6,6 +6,8 @@ Roller is made up of the following Maven
roller-project: Top level project
app: Roller Weblogger webapp, JSP pages, Velocity templates
+ assembly-release: Used to create official distributions of Roller
+ docs: Roller documentation in ODT (OpenOffice/LibreOffice) format
it-selenium Integrated browser tests for Roller using Selenium
To pull the latest trunk sources you need a Subversion client:
Modified: roller/trunk/assembly-release/src/main/assembly/standard.xml
URL: http://svn.apache.org/viewvc/roller/trunk/assembly-release/src/main/assembly/standard.xml?rev=1608775&r1=1608774&r2=1608775&view=diff
==============================================================================
--- roller/trunk/assembly-release/src/main/assembly/standard.xml (original)
+++ roller/trunk/assembly-release/src/main/assembly/standard.xml Tue Jul 8 13:24:25 2014
@@ -43,18 +43,18 @@
<source>../LICENSE.txt</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}</outputDirectory>
</file>
- <!--file>
- <source>../weblogger-docs/installguide/generated/roller-install-guide.pdf</source>
+ <file>
+ <source>../docs/roller-install-guide.odt</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
</file>
<file>
- <source>../weblogger-docs/userguide/generated/roller-user-guide.pdf</source>
+ <source>../docs/roller-template-guide.odt</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
</file>
<file>
- <source>../weblogger-docs/templateguide/generated/roller-template-guide.pdf</source>
+ <source>../docs/roller-user-guide.odt</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
- </file-->
+ </file>
</files>
</assembly>
Modified: roller/trunk/docs/roller-install-guide.odt
URL: http://svn.apache.org/viewvc/roller/trunk/docs/roller-install-guide.odt?rev=1608775&r1=1608774&r2=1608775&view=diff
==============================================================================
Binary files - no diff available.