Merge pull request #273 from phasenraum2010/milestone-1.0.27

Milestone 1.0.27

Author: phasenraum2010

LICENSE

@@ -0,0 +1,191 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included on
+the same "printed page" as the copyright notice for easier identification within
+third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

LICENSE.code.txt

@@ -1,12 +1,10 @@
-   All code in this repository is:
-   =======================================================================
-   Copyright (c) 2013 Thomas Woehlke All Rights Reserved
+   Copyright 2017 Thomas Woehlke
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+     http://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,

README.md

@@ -1,29 +1,34 @@
-# [Twitterwall2]( https://github.com/phasenraum2010/twitterwall2 )
+# [Twitterwall2](https://github.com/phasenraum2010/twitterwall2)
 
-+ Twitterwall with [spring:boot]( https://projects.spring.io/spring-boot/ ) for [heroku]( https://heroku.com )
-+ More Info: https://phasenraum2010.github.io/twitterwall2/
++ Twitterwall with [spring:boot](https://projects.spring.io/spring-boot/) for [heroku](https://heroku.com)
++ More Info: [https://phasenraum2010.github.io/twitterwall2/](https://phasenraum2010.github.io/twitterwall2/)
 
 ## Development 
 
-### Repository:
-- Get Source Code: git clone https://github.com/phasenraum2010/twitterwall2.git
-- Project: https://github.com/phasenraum2010/twitterwall2/projects/1
-- Issues: https://github.com/phasenraum2010/twitterwall2/issues
+### Repository
+- Get Source Code: git clone [https://github.com/phasenraum2010/twitterwall2.git](https://github.com/phasenraum2010/twitterwall2.git)
+- Project: [https://github.com/phasenraum2010/twitterwall2/projects/1](https://github.com/phasenraum2010/twitterwall2/projects/1)
+- Issues: [https://github.com/phasenraum2010/twitterwall2/issues](https://github.com/phasenraum2010/twitterwall2/issues)
 
 ### heroku CLI
 - heroku login
 - heroku pg:psql --app {app-name}
 - heroku logs -t --app {app-name}
+- more: 
+  - [https://devcenter.heroku.com/categories/command-line](https://devcenter.heroku.com/categories/command-line)
+  - [https://devcenter.heroku.com/articles/heroku-cli](https://devcenter.heroku.com/articles/heroku-cli)
 
-### Setup Testing on Localhost
-- Get Credentials from your Twitter-Account: [Refer to "Manage your Apps" on Twitter's dev pages](https://dev.twitter.com/apps)
-- Edit your .profile with the Credentials from your Twitter-Account
+
+### Setup Test and Development on Localhost
+- **Get Credentials from your Twitter-Account:** 
+  - [Refer to "Manage your Apps" on Twitter's dev pages](https://dev.twitter.com/apps)
+- **Edit your .profile with the Credentials from your Twitter-Account**
   - export DATABASE_URL=jdbc:postgresql://localhost:5432/postgres?user=postgres
   - export TWITTER_CONSUMER_KEY={Credentials from your Twitter-Account}
   - export TWITTER_CONSUMER_SECRET={Credentials from your Twitter-Account}
   - export TWITTER_ACCESS_TOKEN={Credentials from your Twitter-Account}
   - export TWITTER_ACCESS_TOKEN_SECRET={Credentials from your Twitter-Account}
-- Edit app behaviour
+- **Edit app behaviour**
   - export TWITTERWALL_SHOW_USERS_MENU=true
   - export TWITTERWALL_CONTEXT_TEST=true
   - export TWITTER_PAGE_SIZE=500
@@ -36,7 +41,7 @@
   - export TWITTERWALL_SCHEDULER_ALLOW_SEARCH=true
   - export TWITTERWALL_SCHEDULER_HEROKU_DB_LIMIT=false
   - export TWITTERWALL_SCHEDULER_USER_LIST_ALLOW=true
-- Edit Use Case 
+- **Edit Tasks / Use Cases** 
   - export TWITTER_SEARCH_TERM=#hibernate OR #java OR #TYPO3
   - export TWITTERWALL_INFO_WEBPAGE=https://github.com/phasenraum2010/twitterwall2
   - export TWITTERWALL_THEME=typo3
@@ -47,7 +52,7 @@
   - export TWITTERWALL_LOGIN_USERNAME=admin
   - export TWITTERWALL_LOGIN_PASSWORD=password
 
-- run with: mvn clean spring-boot:run
+- run with: **mvn clean spring-boot:run**
 
 ## Contribute
 
@@ -60,7 +65,7 @@ updates.
 Contribute your fixes and new features back to the main codebase using
 [GitHub pull requests][github-pull-req].
 
-[twitterwall-github]: http://github.com/andriusvelykis/reflow-maven-skin/
+[twitterwall-github]: https://github.com/phasenraum2010/twitterwall2/
 [github-pull-req]: http://help.github.com/articles/using-pull-requests
 
 ### Issues (bug and feature tracker)
@@ -84,12 +89,12 @@ If you _really really_ like it and want to support the author, I will be glad to
 [av-site]: https://twitter.com/ThomasWoehlke
 [donate]: https://www.paypal.me/ThomasWoehlke
 
-### Author:  
+### Author  
 
 **Thomas Wöhlke**
-+ Twitter: https://twitter.com/ThomasWoehlke
-+ Github: https://github.com/phasenraum2010
-+ Blog: https://thomas-woehlke.blogspot.de
++ Twitter: [https://twitter.com/ThomasWoehlke](https://twitter.com/ThomasWoehlke)
++ Github: [https://github.com/phasenraum2010](https://github.com/phasenraum2010)
++ Blog: [https://thomas-woehlke.blogspot.de](https://thomas-woehlke.blogspot.de)
 
 ### Acknowledgements
 
@@ -98,15 +103,21 @@ If you _really really_ like it and want to support the author, I will be glad to
 + JavaScript goodies with [jQuery][jquery].
 + More icons by [fontawesome][fontawesome].
 + Twitterwall Backend is made with [Java][java] and [Spring-Boot][spring-boot].
++ Spring Frameworks used: [MQ][spring-integration], [JPA][spring-data-jpa], [Security][spring-security] and [Twitter][spring-social-twitter]
 + Database [PostgreSQL][postgresql] and jdbc by [PostgreSQL-JDBC][postgresql-jdbc].
-+ Running on Cloud-Service [Heroku][heroku].
++ Running on Cloud-Service [Heroku][heroku] with [Heroku PostegreSQL][postgresql-heroku].
 
 [java]: http://www.oracle.com/technetwork/java/javase/downloads/index.html
 [fontawesome]: http://fontawesome.io/icons/
 [postgresql-jdbc]: https://jdbc.postgresql.org/
 [postgresql]: https://www.postgresql.org/
-[heroku]: https://heroku.com
+[heroku]: https://heroku.com/
+[postgresql-heroku]: https://devcenter.heroku.com/categories/heroku-postgres/
 [spring-boot]: https://projects.spring.io/spring-boot/
+[spring-integration]: http://projects.spring.io/spring-integration/
+[spring-data-jpa]: http://projects.spring.io/spring-data-jpa/
+[spring-security]: http://projects.spring.io/spring-security/
+[spring-social-twitter]: http://projects.spring.io/spring-social-twitter/
 [bootstrap]: http://getbootstrap.com/
 [glyphicons]: http://glyphicons.com/
 [webfonts]: http://www.google.com/webfonts/
@@ -116,9 +127,12 @@ If you _really really_ like it and want to support the author, I will be glad to
 
 © 2017 Thomas Wöhlke
 
-Licensed under the Apache License, Version 2.0
+Licensed under the **Apache License, Version 2.0**
+
+[http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
 
-http://www.apache.org/licenses/LICENSE-2.0
+Except where otherwise noted, Documentation of this work is licensed under 
+[Creative Commons CC BY-ND 3.0](http://creativecommons.org/licenses/by-nd/3.0/)
 
 
 

_config.yml

@@ -1 +1,5 @@
 theme: jekyll-theme-slate
+title: Twitterwall2
+description:  Twitterwall with spring:boot for heroku using spring-integration for MQ and spring-data-jpa for PostgreSQL
+google_analytics: UA-17174370-7
+

pom.xml

@@ -541,9 +541,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <version>2.17</version>
-                <configuration>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                </configuration>
             </plugin>
 
             <plugin>
@@ -584,9 +581,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>taglist-maven-plugin</artifactId>
                 <version>2.4</version>
-                <configuration>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                </configuration>
             </plugin>
 
             <plugin>
@@ -605,31 +599,12 @@
                 </reportSets>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.20</version>
-            </plugin>
-
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
                 <version>2.7</version>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-changes-plugin</artifactId>
-                <version>2.12.1</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>github-report</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-
         </plugins>
     </reporting>