This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git
from 5b6cbbf3a Merge pull request #119 from mbien/dependency_updates_2
add 85be53630 Refactoring index implementation to isolate Lucene
dependency.
add 1157bc3bf Progress towards test for SearchResultsModel
add 880a94d8f Progress on refactoring
add d725bc4ea Lucene API usage now isolated in search.lucene package.
add 6de2fcf84 test fix
add 51e40eeb1 Whittle down the code a bit more.
add c8865d359 Whittle down the code a bit more.
add fab95f5a2 Merge pull request #123 from snoopdave/solr-impl
No new revisions were added by this update.
Summary of changes:
app/pom.xml | 31 +++
.../weblogger/business/jpa/JPAWebloggerModule.java | 4 +-
.../weblogger/business/search/IndexManager.java | 71 +++----
.../search/SearchResultList.java} | 47 ++---
.../{TestTask.java => search/SearchResultMap.java} | 61 +++---
.../{operations => lucene}/AddEntryOperation.java | 11 +-
.../search/{ => lucene}/FieldConstants.java | 2 +-
.../{operations => lucene}/IndexOperation.java | 18 +-
.../business/search/{ => lucene}/IndexUtil.java | 4 +-
.../LuceneIndexManager.java} | 207 ++++++++++++++++-----
.../ReIndexEntryOperation.java | 12 +-
.../ReadFromIndexOperation.java | 9 +-
.../RebuildWebsiteIndexOperation.java | 25 ++-
.../RemoveEntryOperation.java | 12 +-
.../RemoveWebsiteIndexOperation.java | 15 +-
.../{operations => lucene}/SearchOperation.java | 46 +++--
.../WriteToIndexOperation.java | 13 +-
.../business/search/lucene}/package-info.java | 4 +-
.../business/search/operations/package-info.java | 22 ---
.../weblogger/business/search/package-info.java | 2 +-
.../business/search/solr/SolrIndexManager.java | 88 +++++++++
.../apache/roller/weblogger/pojos/WeblogEntry.java | 2 +-
.../ui/rendering/model/SearchResultsFeedModel.java | 149 ++++-----------
.../ui/rendering/model/SearchResultsModel.java | 183 +++++-------------
.../ui/rendering/util/WeblogSearchRequest.java | 2 +-
.../weblogger/ui/struts2/editor/Maintenance.java | 3 +-
app/src/main/resources/log4j2.xml | 1 +
app/src/main/resources/rome.properties | 2 +-
.../java/org/apache/roller/util/DerbyManager.java | 2 +-
.../weblogger/business/IndexManagerTest.java | 157 ----------------
.../business/search/IndexManagerTest.java | 158 ++++++++++++++++
.../model/SearchResultsFeedModelTest.java | 128 +++++++++++++
.../ui/rendering/model/SearchResultsModelTest.java | 142 ++++++++++++++
app/src/test/resources/log4j2.xml | 2 +-
34 files changed, 963 insertions(+), 672 deletions(-)
copy
app/src/main/java/org/apache/roller/weblogger/{ui/core/util/menu/Menu.java =>
business/search/SearchResultList.java} (52%)
copy app/src/main/java/org/apache/roller/weblogger/business/{TestTask.java =>
search/SearchResultMap.java} (51%)
rename
app/src/main/java/org/apache/roller/weblogger/business/search/{operations =>
lucene}/AddEntryOperation.java (88%)
rename app/src/main/java/org/apache/roller/weblogger/business/search/{ =>
lucene}/FieldConstants.java (96%)
rename
app/src/main/java/org/apache/roller/weblogger/business/search/{operations =>
lucene}/IndexOperation.java (93%)
rename app/src/main/java/org/apache/roller/weblogger/business/search/{ =>
lucene}/IndexUtil.java (94%)
rename
app/src/main/java/org/apache/roller/weblogger/business/search/{IndexManagerImpl.java
=> lucene/LuceneIndexManager.java} (60%)
rename
app/src/main/java/org/apache/roller/weblogger/business/search/{operations =>
lucene}/ReIndexEntryOperation.java (86%)
rename
app/src/main/java/org/apache/roller/weblogger/business/search/{operations =>
lucene}/ReadFromIndexOperation.java (80%)
rename
app/src/main/java/org/apache/roller/weblogger/business/search/{operations =>
lucene}/RebuildWebsiteIndexOperation.java (85%)
rename
app/src/main/java/org/apache/roller/weblogger/business/search/{operations =>
lucene}/RemoveEntryOperation.java (85%)
rename
app/src/main/java/org/apache/roller/weblogger/business/search/{operations =>
lucene}/RemoveWebsiteIndexOperation.java (85%)
rename
app/src/main/java/org/apache/roller/weblogger/business/search/{operations =>
lucene}/SearchOperation.java (81%)
rename
app/src/main/java/org/apache/roller/weblogger/business/search/{operations =>
lucene}/WriteToIndexOperation.java (78%)
copy app/src/main/java/org/apache/roller/{planet/business =>
weblogger/business/search/lucene}/package-info.java (89%)
delete mode 100644
app/src/main/java/org/apache/roller/weblogger/business/search/operations/package-info.java
create mode 100644
app/src/main/java/org/apache/roller/weblogger/business/search/solr/SolrIndexManager.java
delete mode 100644
app/src/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/business/search/IndexManagerTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsFeedModelTest.java
create mode 100644
app/src/test/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModelTest.java
