This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a change to branch search-published-entries
in repository https://gitbox.apache.org/repos/asf/roller.git
from be44021e2 Merge remote-tracking branch 'origin/roller-6.1.x' into
search-published-entries
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 639c308da Refuse disabled accounts when signing in with an OpenID URL
(#224)
add 666e793fe Limit search queries to the search fields and stop indexing
comment email addresses (#225)
add 9c8a1d908 Merge remote-tracking branch 'origin/roller-6.1.x' into
search-published-entries
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 24 ++++
.../roller/weblogger/business/UserManager.java | 17 ++-
.../business/jpa/JPABookmarkManagerImpl.java | 33 ++++++
.../weblogger/business/jpa/JPAUserManagerImpl.java | 35 ++++--
.../business/search/lucene/FieldConstants.java | 3 +
.../business/search/lucene/IndexOperation.java | 28 -----
.../business/search/lucene/LuceneIndexManager.java | 23 ++++
.../business/search/lucene/SearchOperation.java | 49 +++++++-
.../pojos/wrapper/WeblogBookmarkWrapper.java | 27 ++++-
.../roller/weblogger/ui/core/RollerSession.java | 9 +-
.../weblogger/ui/core/security/OpenIdUrls.java | 36 ++++++
.../ui/core/security/RollerUserDetailsService.java | 17 ++-
.../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 +++
.../business/jpa/JPAUserManagerLikePrefixTest.java | 37 ++++++
.../business/search/IndexManagerTest.java | 10 ++
.../business/search/lucene/IndexedFieldsTest.java | 108 +++++++++++++++++
.../search/lucene/SearchFieldsQueryParserTest.java | 69 +++++++++++
.../pojos/wrapper/WeblogBookmarkWrapperTest.java | 56 +++++++++
.../security/RollerUserDetailsServiceTest.java | 116 ++++++++++++++++++
.../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 ++++++++
32 files changed, 1239 insertions(+), 69 deletions(-)
create mode 100644
app/src/main/java/org/apache/roller/weblogger/ui/core/security/OpenIdUrls.java
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
create mode 100644
app/src/test/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerLikePrefixTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/business/search/lucene/IndexedFieldsTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/business/search/lucene/SearchFieldsQueryParserTest.java
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/core/security/RollerUserDetailsServiceTest.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