This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a change to branch openid-account-state
in repository https://gitbox.apache.org/repos/asf/roller.git
from eeea610aa Merge remote-tracking branch 'origin/roller-6.1.x' into
openid-account-state
add 931161efb Keep blogroll links to web and relative URLs (#221)
add 3aab7aca3 Match only user names in the user search for non-admins and
escape LIKE wildcards (#222)
add dfb0af67e Require a role in the weblog for page and resource previews
(#223)
add d1cd47c56 Merge remote-tracking branch 'origin/roller-6.1.x' into
openid-account-state
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 14 +++
.../roller/weblogger/business/UserManager.java | 17 ++-
.../business/jpa/JPABookmarkManagerImpl.java | 33 ++++++
.../weblogger/business/jpa/JPAUserManagerImpl.java | 35 ++++--
.../pojos/wrapper/WeblogBookmarkWrapper.java | 27 ++++-
.../rendering/servlets/PreviewResourceServlet.java | 6 +
.../ui/rendering/servlets/PreviewServlet.java | 8 +-
.../weblogger/ui/rendering/util/PreviewAccess.java | 50 ++++++++
.../weblogger/ui/struts2/ajax/UserDataServlet.java | 13 +-
.../apache/roller/weblogger/util/LinkScheme.java | 73 ++++++++++++
.../org/apache/roller/weblogger/pojos/User.orm.xml | 10 +-
app/src/main/webapp/WEB-INF/velocity/weblog.vm | 16 +--
.../business/BookmarkImportParsingTest.java | 32 +++++
.../apache/roller/weblogger/business/UserTest.java | 15 +++
.../jpa/JPAUserManagerLikePrefixTest.java} | 31 ++---
.../pojos/wrapper/WeblogBookmarkWrapperTest.java | 56 +++++++++
.../servlets/PreviewResourceServletTest.java | 32 ++++-
.../servlets/PreviewServletAccessTest.java | 64 ++++++++++
.../ui/rendering/util/PreviewAccessTest.java | 109 +++++++++++++++++
.../ui/struts2/ajax/UserDataServletTest.java | 132 +++++++++++++++++++++
.../roller/weblogger/util/LinkSchemeTest.java | 51 ++++++++
21 files changed, 781 insertions(+), 43 deletions(-)
create mode 100644
app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/PreviewAccess.java
create mode 100644
app/src/main/java/org/apache/roller/weblogger/util/LinkScheme.java
copy
app/src/{main/java/org/apache/roller/weblogger/ui/core/security/OpenIdUrls.java
=>
test/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerLikePrefixTest.java}
(52%)
create mode 100644
app/src/test/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapperTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServletAccessTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/PreviewAccessTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/struts2/ajax/UserDataServletTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/util/LinkSchemeTest.java