[roller] 01/01: Merge branch 'master' into roller-6.0.x

2019-10-06 Thread snoopdave
This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch roller-6.0.x
in repository https://gitbox.apache.org/repos/asf/roller.git

commit 26fcd8b202bad336195337ae2e9982c52534a226
Merge: c0b5636 cc00163
Author: David M. Johnson 
AuthorDate: Sun Oct 6 18:11:15 2019 -0400

Merge branch 'master' into roller-6.0.x

 docs/images/db-connection-error.png| Bin 0 -> 249829 bytes
 docs/images/no-tables-found.png| Bin 0 -> 47762 bytes
 docs/images/roller-home.png| Bin 0 -> 108395 bytes
 docs/images/roller-install-guide-tomcat-deploy.png | Bin 0 -> 21951 bytes
 docs/images/roller-install-guide-tomcat.png| Bin 0 -> 102281 bytes
 docs/roller-install-guide.adoc | 855 +
 6 files changed, 855 insertions(+)



[roller] 01/01: Merge branch 'master' into roller-6.0.x

2019-09-21 Thread snoopdave
This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch roller-6.0.x
in repository https://gitbox.apache.org/repos/asf/roller.git

commit 23739e2b98f75158c74c04605fe601dec1368166
Merge: 605797d 026f8f1
Author: David M. Johnson 
AuthorDate: Sat Sep 21 16:17:04 2019 -0400

Merge branch 'master' into roller-6.0.x

# Conflicts:
#   LICENSE.txt
#   NOTICE.txt

 Dockerfile |   6 +-
 LICENSE.txt|  28 +
 app/pom.xml|   2 +-
 .../weblogger/business/search/FieldConstants.java  |   4 -
 .../business/search/IndexManagerImpl.java  | 136 -
 .../business/search/operations/IndexOperation.java |  10 +-
 .../search/operations/ReadFromIndexOperation.java  |   3 +-
 .../search/operations/SearchOperation.java |  40 +++---
 .../apache/roller/weblogger/config/PingConfig.java |  31 +++--
 .../weblogger/ui/struts2/admin/UserEdit.java   |  16 +--
 app/src/main/resources/struts.xml  |   6 +-
 .../webapp/WEB-INF/jsps/admin/GlobalConfig.jsp |   8 +-
 .../main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp   |  12 +-
 .../main/webapp/WEB-INF/jsps/editor/Entries.jsp|  29 +++--
 .../webapp/WEB-INF/jsps/editor/EntryEditor.jsp |   3 +-
 app/src/main/webapp/roller-ui/scripts/ajax-user.js |   3 +-
 LICENSE.txt => binary-includes/LICENSE.txt | 109 -
 binary-includes/NOTICE.txt |  27 
 doap_roller.rdf|  15 ++-
 docker-compose.yml |   7 +-
 20 files changed, 323 insertions(+), 172 deletions(-)

diff --cc LICENSE.txt
index 89d78e0,f7d3e4d..83b89fc
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@@ -324,6 -324,33 +324,34 @@@ Copyright (c) 2011-2019 The Bootstrap A
  
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
++
+ 
---
+ This product bundles Summernote WYSIWYG editor, which is available under a
+ "MIT" license. For details, see
+ /webjars/summernote/0.8.11/dist/summernote.min.js
+ https://github.com/summernote/summernote/blob/develop/LICENSE
+ 
+ The MIT License (MIT)
+ 
+ Copyright (c) 2015~ Summernote Team 
(https://github.com/orgs/summernote/people)
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is