Update of apache-roller to version 5.1.2

An approximate changelog 5.0.3 to 5.1.2 (resolved issues from Jira):
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Bug 		ROL-2057
Missing NPE check in Roller PageServlet class
	Unassigned 	Kohei Nozaki 	Major 	30/Mar/15

Bug 		ROL-2058
No salt renewal on POST request
	David Johnson 	Kohei Nozaki 	Major 	30/Mar/15

Bug 		ROL-2059
Comment preview is invisible in Gaurav theme
	David Johnson 	Kohei Nozaki 	Major 	30/Mar/15

Bug 		ROL-2061
Wrong next month link of Calendar
	David Johnson 	Kohei Nozaki 	Major 	30/Mar/15

Bug 		ROL-2062
Missing NPE check in IndexOperation#getDocument()
	David Johnson 	Kohei Nozaki 	Major 	30/Mar/15

Improvement 		ROL-2064
Add viewport meta tag to Gaurav theme
	David Johnson 	Kohei Nozaki 	Trivial 	30/Mar/15

Bug 		ROL-2065
Gaurav sometimes displaying empty summary as unresolved "$entry.summary"
	David Johnson 	Kohei Nozaki 	Minor 	30/Mar/15

Bug 		ROL-2066
Comment URLs using https:// not saving properly in Gaurav theme
	David Johnson 	Kohei Nozaki 	Trivial 	30/Mar/15

Bug 		ROL-2067
Velocity configuration improvement
	David Johnson 	David Johnson 	Major 	30/Mar/15

Documentation 		ROL-2056
Wrong pointer (section number) in Install Guide at section 11.2
	Unassigned 	Kohei Nozaki 	Minor 	05/Jan/15

Bug 		ROL-2052
Custom stylesheets not being updated correctly when user switches between shared and custom themes.
	Unassigned 	Glen Mazza 	Major 	06/Oct/14

Bug 		ROL-2051
Roller not falling back to standard theme renditions when mobile one unavailable.
	Unassigned 	Glen Mazza 	Critical 	02/Oct/14

Bug 		ROL-1387
In creating tag aggregate counts, count tags only from published blog entries
	Glen Mazza 	linda skrocki 	Major 	02/Oct/14

Bug 		ROL-1620
Plus signs in categories lead to a 404 category RSS/Atom feeds
	Glen Mazza 	linda skrocki 	Major 	02/Oct/14

Bug 		ROL-2055
Comment search should be case insensitive
	Glen Mazza 	Glen Mazza 	Minor 	02/Oct/14

Bug 		ROL-2054
Newly saved categories not appearing on blog
	Glen Mazza 	Glen Mazza 	Major 	02/Oct/14

Bug 		ROL-1974
Roller's ROME Propono dependency needs updating to use newer JARs
	David Johnson 	Glen Mazza 	Minor 	25/Aug/14

Bug 		ROL-1973
ROME dependency used by Roller needs updating
	David Johnson 	Glen Mazza 	Minor 	25/Aug/14

Bug 		ROL-1942
Uploaded media file not selectable in media file view
	Greg Huber 	Budi Ariyanto 	Major 	25/Aug/14

Bug 		ROL-1948
getRealPath() null not handled
	Unassigned 	Jürgen Weber 	Major 	25/Aug/14

Task 		ROL-2039
Rename webpage and roller_templatecode tables
	Glen Mazza 	Glen Mazza 	Major 	25/Aug/14

Improvement 		ROL-2041
gaurav theme -- render full blog entries on main blog page if no summary given
	Gaurav Saini 	Glen Mazza 	Major 	25/Aug/14

Improvement 		ROL-1999
Switch from Referrers to storing tracking codes (e.g., Google Analytics)
	Unassigned 	Glen Mazza 	Major 	25/Aug/14

Bug 		ROL-1980
When deleting categories, Roller allows you to move its entries to invisible "root" category.
	Glen Mazza 	Glen Mazza 	Major 	25/Aug/14

Bug 		ROL-1981
Allow user to specify order of blog categories
	Glen Mazza 	Glen Mazza 	Major 	25/Aug/14

Task 		ROL-1979
Remove subcategory functionality from Roller 5.1
	Glen Mazza 	Glen Mazza 	Major 	25/Aug/14

Bug 		ROL-1554
Listing Box "Invite a new user to join..." does not have a horizontal scrolling bar
	Glen Mazza 	Davis Nguyen 	Major 	25/Aug/14

Improvement 		ROL-2038
Add dualTheme element to themes.xml descriptor
	Glen Mazza 	Glen Mazza 	Blocker 	25/Aug/14

Improvement 		ROL-1938
Switch to mobile template only in standard template's index page
	Unassigned 	Tiger Gui 	Major 	25/Aug/14

Improvement 		ROL-1937
Standard and Mobile template switch improvement patch
	Unassigned 	Tiger Gui 	Major 	25/Aug/14

New Feature 		ROL-1934
LDAP Comment Authenticator
	Dave Johnson (Inactive) 	Nick Padilla 	Major 	25/Jan/12 	25/Aug/14

Task 		ROL-1977
Remove unused properties from ApplicationResources.properties
	Glen Mazza 	Anil Gangolli 	Minor 	25/Aug/14

Improvement 		ROL-1881
Add delete blog entry option to entries page
	Unassigned 	Nicolas Muller 	Major 	25/Aug/14

Bug 		ROL-1571
missing graphic alt text
	Unassigned 	mike duigou 	Major 	25/Aug/14

Bug 		ROL-1928
Missing 500-to-510-migration.vm file in Roller Mobile branch
	David Johnson 	David Johnson 	Major 	25/Aug/14

Task 		ROL-2043
Switch from YUI3 to JQuery UI for autocomplete, tabs, dialogs
	Glen Mazza 	Glen Mazza 	Major 	25/Aug/14

Task 		ROL-2022
Add Categories, demote tags from gaurav theme
	Gaurav Saini 	Glen Mazza 	Major 	25/Aug/14

Task 		ROL-2008
In "switch to (media) folder" drop-down, don't list the current folder the user is in.
	Greg Huber 	Glen Mazza 	Major 	25/Aug/14

Bug 		ROL-1273
resource item error
	Glen Mazza 	Jian Liu 	Major 	25/Aug/14

Task 		ROL-1434
lots of UI messaging needs to be converted to i18n keys in resource bundles
	Glen Mazza 	Allen Gilliland 	Major 	25/Aug/14

Bug 		ROL-2044
Member management page allows user to remove himself from blog.
	Glen Mazza 	Glen Mazza 	Major 	25/Aug/14

Bug 		ROL-1966
Search highlight problem
	Glen Mazza 	Maciej Rumianowski 	Major 	25/Aug/14

Bug 		ROL-1957
Unable to find RSD template
	Unassigned 	Harsh Gupta 	Major 	25/Aug/14

Bug 		ROL-1792
Hit count increments with <link rel="stylesheet" type="text/css" media="all" href="$model.weblog.stylesheet">
	Greg Huber 	Greg Huber 	Trivial 	25/Aug/14

Bug 		ROL-1716
a bug found when call getPopularTags with the limit=-1 (v4 m1)
	Unassigned 	guoweizhan 	Major 	25/Aug/14

Bug 		ROL-1414
Email scrambler not detecting hyphens in email addresses
	Allen Gilliland 	linda skrocki 	Major 	25/Aug/14

Improvement 		ROL-1649
Korean translation resource file
	Unassigned 	Woonsan Ko 	Minor 	25/Aug/14

Bug 		ROL-1930
Saving Template causes Null Pointer Exception
	David Johnson 	David Johnson 	Blocker 	25/Aug/14

Task 		ROL-1983
Only expose AJAX User List Servlet to admin users
	Glen Mazza 	Glen Mazza 	Major 	25/Aug/14

Task 		ROL-1986
Stop sending re-confirmation email after blogger approves comment.
	Greg Huber 	Glen Mazza 	Minor 	25/Aug/14

Improvement 		ROL-1978
Switch to more SEO-friendly hyphens instead of underscores to separate blog titles
	Glen Mazza 	Glen Mazza 	Minor 	25/Aug/14

Bug 		ROL-1616
Input fields not emptied after creating a new user
	Unassigned 	Ronald Iwema 	Minor 	25/Aug/14

Bug 		ROL-1638
Problem with themes on case sensitive file systems
	Unassigned 	German Eichberger 	Major 	25/Aug/14

New Feature 		ROL-1021
Referrer queue warning / filling up in logs. unclosed sessions.
	Unassigned 	Rob Wilson 	Major 	25/Aug/14

Bug 		ROL-1927
Roller 5 MSSQL Issues/Fixes
	David Johnson 	Nick Padilla 	Major 	25/Aug/14

Improvement 		ROL-2034
Hide Profile Password fields with SSO
	Glen Mazza 	Jürgen Weber 	Major 	25/Aug/14

Bug 		ROL-1794
file uploads with spaces in their names are 404ing (incorrect URL escaping?)
	Greg Huber 	Dick Davies 	Major 	25/Aug/14

Improvement 		ROL-1370
Support of email notifications preference for blog commentors
	Unassigned 	linda skrocki 	Major 	25/Aug/14

Bug 		ROL-1346
Weblog Calendar incorrectly assuming Sunday is first day of week for every locale.
	Unassigned 	Vahid Zaboli 	Major 	25/Aug/14

Test 		ROL-2033
Test Roller 5.1 with a weblog client
	David Johnson 	David Johnson 	Major 	25/Aug/14

Task 		ROL-2010
Update User's Guide with new app screen shots
	Glen Mazza 	Glen Mazza 	Major 	25/Aug/14

Bug 		ROL-2002
https:// URLs not being processed correctly in the comment URL field
	Greg Huber 	Glen Mazza 	Major 	25/Aug/14

Task 		ROL-1994
Switch to Apache Commons Collections 4.0
	Unassigned 	Glen Mazza 	Minor 	25/Aug/14

Bug 		ROL-1870
Duplicate bookmarks not showing
	Unassigned 	Greg Huber 	Major 	25/Aug/14

Bug 		ROL-1925
Patch for the bug of OpenID only authentication
	Glen Mazza 	Shutra 	Major 	25/Aug/14

Improvement 		ROL-929
Resign | "Are you sure?" Confirmation
	Glen Mazza 	Greg Hamer 	Minor 	25/Aug/14

Improvement 		ROL-2015
Add a description element to theme descriptor file (theme.xml)
	Greg Huber 	Glen Mazza 	Major 	25/Aug/14

Task 		ROL-1997
Switch WeblogEntry's pub status fields (DRAFT, PUBLISHED, PENDING, SCHEDULED) to an enum type
	Unassigned 	Glen Mazza 	Minor 	25/Aug/14

Task 		ROL-1995
Switch to JPA Typed Queries
	Glen Mazza 	Glen Mazza 	Major 	25/Aug/14

Task 		ROL-1984
./app/src/test/resources/WEB-INF/security.xml needs updating to Spring & Spring Security 3.x namespaces
	Unassigned 	Glen Mazza 	Major 	25/Aug/14

Bug 		ROL-1738
Charset of E-Mail Subject Needs to be configurable
	Unassigned 	SATO Naoki 	Major 	25/Aug/14

Bug 		ROL-1715
SiteModel's getWeblogsByLetterPager not documented correctly
	Glen Mazza 	David Johnson 	Minor 	25/Aug/14

Task 		ROL-2028
Separate the Basic Theme into Basic and Basic Mobile Themes
	David Johnson 	Glen Mazza 	Major 	25/Aug/14

Bug 		ROL-2018
"Notify me of new comments" not working on trunk.
	Glen Mazza 	Glen Mazza 	Major 	25/Aug/14

Task 		ROL-2000
Change current rol_ prefix for two newest tables
	Unassigned 	Glen Mazza 	Minor 	25/Aug/14

Bug 		ROL-1992
Blogroll OPML import page raising 500 Security Error
	Unassigned 	Glen Mazza 	Major 	25/Aug/14

Task 		ROL-1991
Switch publish date pop-up calendar to one with year entry option
	Unassigned 	Glen Mazza 	Minor 	25/Aug/14

Improvement 		ROL-1907
Inefficient use of key set iterator.
	Unassigned 	Shelan Perera 	Minor 	25/Aug/14

Bug 		ROL-2032
Test Roller 5.1 with blogs.apache.org database & themes
	David Johnson 	David Johnson 	Major 	25/Aug/14

Bug 		ROL-2007
Changing values in Media File Editor frequently results in permissions error.
	Greg Huber 	Glen Mazza 	Major 	25/Aug/14

Bug 		ROL-1988
Category search not working if space exists in category
	Glen Mazza 	Glen Mazza 	Major 	25/Aug/14

Bug 		ROL-1952
Roller 5.0.1 does not work with PostgreSQL 9.1
	Unassigned 	Matthias Wimmer 	Major 	25/Aug/14

Bug 		ROL-1746
Uploaded file names are lower-cased with AtomPub.
	Greg Huber 	Tatsuya Noyori 	Major 	25/Aug/14

Bug 		ROL-1596
Frontpage theme lose record!
	Glen Mazza 	xiaojf 	Major 	25/Aug/14

Improvement 		ROL-1430
French Translation (based on version 4.0 files)
	Unassigned 	Denis Balazuc 	Minor 	25/Aug/14

Improvement 		ROL-1965
Searching with locale on Multi Language blog
	Glen Mazza 	Maciej Rumianowski 	Major 	25/Aug/14

Bug 		ROL-2016
roller-startup.log not created on startup
	Greg Huber 	Greg Huber 	Minor 	25/Aug/14

Bug 		ROL-2009
Custom template theme folder creation isn't working
	Unassigned 	Glen Mazza 	Major 	25/Aug/14

Improvement 		ROL-1947
Provide a blog entry-level description field that can go into HTML header field
	Dave Johnson (Inactive) 	Glen Mazza 	Major 	25/Aug/14

Bug 		ROL-1956
ValidateSaltFilter not working on file upload
	Greg Huber 	Matthias Wimmer 	Major 	25/Aug/14

Bug 		ROL-1954
user weblogs cannot be managed when admin logs in and select any user via Server Aministration and clicks on eit
	Unassigned 	Harsh Gupta 	Major 	25/Aug/14

Bug 		ROL-1795
Posting comments with SchemeEnforcementFilter in operation.
	Greg Huber 	Greg Huber 	Minor 	25/Aug/14

Task 		ROL-2030
Replace Xinha editor with something more recent
	Unassigned 	Glen Mazza 	Minor 	25/Aug/14

Task 		ROL-1968
Upgrade Spring Security from 2.0.7 to 3.1.4
	Unassigned 	Glen Mazza 	Major 	25/Aug/14

Improvement 		ROL-1964
SearchServlet does not preserve locale
	Unassigned 	Maciej Rumianowski 	Minor 	25/Aug/14

Task 		ROL-2005
Switch to top-level folders only for Media Files
	Unassigned 	Glen Mazza 	Major 	25/Aug/14

Bug 		ROL-1739
Missing constraint on weblogentrytagagg table
	Glen Mazza 	David Johnson 	Major 	25/Aug/14

Bug 		ROL-1778
Blog entry preview before first publish not working with Derby database
	Glen Mazza 	José Arthur Benetasso Villanova 	Major 	25/Aug/14

3 files changed, 16 insertions, 15 deletions

diff --git a/www/apache-roller/Makefile b/www/apache-roller/Makefile
index e228c986cde..2b20d5ff535 100644
--- a/www/apache-roller/Makefile
+++ b/www/apache-roller/Makefile
@@ -1,21 +1,22 @@
-# $NetBSD: Makefile,v 1.12 2014/01/12 22:22:25 spz Exp $
+# $NetBSD: Makefile,v 1.13 2015/05/19 21:28:27 spz Exp $
 #
 
-DISTNAME=	roller-weblogger-${ROLLER_VER}-for-tomcat
+DISTNAME=	roller-release-${ROLLER_VER}-standard
 PKGNAME=	apache-roller-${ROLLER_VER}
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-for//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-standard//}
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_APACHE:=roller/roller-5/v${ROLLER_VER}/bin/}
+MASTER_SITES=	${MASTER_SITE_APACHE:=roller/roller-5.1/v${ROLLER_VER}/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://roller.apache.org/
+LICENSE=	apache-2.0
 COMMENT=	Full-featured, multi-user and group-blog server
 
 BUILD_DEPENDS+=	fastjar-[0-9]*:../../archivers/fastjar
 
 USE_JAVA=	run
 USE_JAVA2=	1.5
-ROLLER_VER=	5.0.3
+ROLLER_VER=	5.1.2
 
 PLIST_SUBST+=		PKGNAME_NOREV=${PKGNAME_NOREV:Q}
 
@@ -29,11 +30,11 @@ do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/apache-roller
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/apache-roller
 
-	${INSTALL_DATA} ${WRKSRC}/docs/roller-*.pdf \
+	${INSTALL_DATA} ${WRKSRC}/docs/roller-*.odt \
 		${DESTDIR}${PREFIX}/share/doc/apache-roller
 	${INSTALL_DATA} ${WRKSRC}/*.txt \
 		${DESTDIR}${PREFIX}/share/doc/apache-roller
-	${INSTALL_DATA} ${WRKSRC}/webapp/roller-${ROLLER_VER}-tomcat.war \
+	${INSTALL_DATA} ${WRKSRC}/webapp/roller.war \
 		${DESTDIR}${PREFIX}/share/apache-roller/${PKGNAME_NOREV}.war
 	${INSTALL_DATA} ${FILESDIR}/roller-custom.properties \
 		${DESTDIR}${PREFIX}/share/examples/apache-roller
diff --git a/www/apache-roller/PLIST b/www/apache-roller/PLIST
index 1aee8d21f33..f95e982797e 100644
--- a/www/apache-roller/PLIST
+++ b/www/apache-roller/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:17 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/05/19 21:28:27 spz Exp $
 share/doc/apache-roller/LICENSE.txt
 share/doc/apache-roller/NOTICE.txt
 share/doc/apache-roller/README.txt
-share/doc/apache-roller/roller-install-guide.pdf
-share/doc/apache-roller/roller-template-guide.pdf
-share/doc/apache-roller/roller-user-guide.pdf
+share/doc/apache-roller/roller-install-guide.odt
+share/doc/apache-roller/roller-template-guide.odt
+share/doc/apache-roller/roller-user-guide.odt
 share/apache-roller/${PKGNAME_NOREV}.war
 share/examples/apache-roller/roller-custom.properties
diff --git a/www/apache-roller/distinfo b/www/apache-roller/distinfo
index ff082d84139..3393d51b216 100644
--- a/www/apache-roller/distinfo
+++ b/www/apache-roller/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2014/01/12 22:22:25 spz Exp $
+$NetBSD: distinfo,v 1.6 2015/05/19 21:28:27 spz Exp $
 
-SHA1 (roller-weblogger-5.0.3-for-tomcat.tar.gz) = d2a10293c9665b6a2864447b58f883b348be3144
-RMD160 (roller-weblogger-5.0.3-for-tomcat.tar.gz) = 4884520ebf953539629854b3afd545e24c60744e
-Size (roller-weblogger-5.0.3-for-tomcat.tar.gz) = 31622161 bytes
+SHA1 (roller-release-5.1.2-standard.tar.gz) = b1b49d52728222d088e37579e8f53651efce5f4d
+RMD160 (roller-release-5.1.2-standard.tar.gz) = 7c754799e0ec348359d0d7a07826e653eb181284
+Size (roller-release-5.1.2-standard.tar.gz) = 35919465 bytes