This is an automated email from the ASF dual-hosted git repository. adityasharma pushed a change to branch ROL-2138 in repository https://gitbox.apache.org/repos/asf/roller.git.
from 1438660 Fixed: NOTICE file does not have standard content (ROL-2138) Improved text of the ALv2 and improved the statements as per the standards. Removed copyright notice of sub dependencies of Xinha WYSIWYG editor Updated license file as per the standards add ddd4193 Update README.txt add 76d87c2 Better notes about the fork. add 1cbd3dc Remove duplicate text, fix links. add d7eaa93 Remove unnecessary text. add 61cf7e3 title Rollarcus add 0364bc9 Update README.md add d3ffb06 Merge branch 'trunk' of https://github.com/apache/roller into trunk add 8f9d134 Update README.md add 00bfff9 Merge branch 'trunk' of https://github.com/snoopdave/rollarcus into trunk add f6e3764 Merge branch 'trunk' of https://github.com/apache/roller into trunk add 35c2b8d Did not mean to commit this. add 624ad3b Texan will fail if these directories are not present. add 2da6c3c Beginnings of a Bootstrap rewrite of the Roller editor/admin UI, using Struts-Bootstrap plugin. The main menu and edit weblog page are essentially complete. add bf13e4f More progress: the Entries page is essentially complete. add f73f35a Ready updates add a5ec43b Comment management page done. add 700682a Progress on categories page. add f515dea Update readme to mention the bootstrap-ui branch. add 8925b14 Merge branch 'trunk' into bootstrap-ui add 53ae365 Also need hsqldb for texen. add 5bd3c53 Categories page is complete with add, edit and delete category in place. add 8042fd7 clean-up no longer used code add c5e8475 Fix: "javax.servlet.ServletException: File [/WEB-INF/jsps/core/Login-css.jsp] not found" add 80765a0 Merge pull request #1 from lbtc-xxx/fix_login_css_jsp_not_found add 122eac4 Apply style to buttons in EditPage add a025403 Merge pull request #4 from lbtc-xxx/apply_style_to_buttons_in_editpage add 95c6a4c Prevent 404 not found at getting domTT.js and domTT.css add 8a3e3fc Merge pull request #5 from lbtc-xxx/prevent_404_for_domTT add a376348 Prevent annoying scrolling in EntryEdit page add c206a69 Merge pull request #3 from lbtc-xxx/prevent_annoying_scrolling_in_editpage add 845faf2 Fix: Buttons in the menu page (such as New Entry, Entries and so on) doesn't work. add 127d337 Merge pull request #2 from lbtc-xxx/make_buttons_in_menu_work add 604dba3 Small progress on Bookmarks (aka Blogroll) page conversion to Bootstrap. add 8116858 Weekend's worth of work towards converting the Bookmarks page to Bootstrap, almost done. add 0f5c869 Add new blogroll implemented add f76eb9d progress towards modal confirmation dialogs on bookmarks page. add 8553cb5 When new blogroll created, switch to it. add dec8559 Blogroll rename implemented add 3d5d89b Edit existing bookmark now works add a3f685b Fix bad alignment of buttons below blogroll table on Safari add 0e23401 test commit add 31e8022 Another test commit & push add 8da2fc0 Converted "My Profile" page to Bootstrap with some JavaScript form validation. Also removed some no longer used pages. add 04a101d Link to screenshots on Flickr add 8913513 Fix problem with save button disable/enable logic. add 2f4b2b3 Add Bootstrap to Create Weblog page, also fix validation logic on Profile page. add 29adfd3 Bootstrapification of "Roller Configuration" or GlobalConfig page. add 2da0e39 Merge branch 'master' into bootstrap-ui add 525400b Fixes to the Bookmarks page. add 5cd3b9b Fix some bugs in the bookmarks page. add b335e53 Fix front-page weblog selector. add 3586dd7 Some progress on Bootstrap version of MediaFileView page. add 73528e0 Some progress on Bootstrap version of MediaFileView page. add 436aae8 Small progress on Bootstrapization of media files view. add a175b0d Better button layout. add 129af05 Merge branch 'roller-5.2.0' into bootstrap-ui add 312f0f7 Merge branch 'roller-5.2.0' into bootstrap-ui add 859ff26 Fix merge issue that omitted ROME fetcher add 5c74873 Merge branch 'master' into bootstrap-ui add 94cb260 Ignore some tests that depend on http://rollerweblogger.org having good SSL certs; apparently LetsEncrypt certs are not up to snuff. add 4ef312f Merge branch 'master' into bootstrap-ui add ff5ba85 Fix a couple of merge problems that I missed. add 0ec5df0 Converted New User Registration page to use Struts2/Bootstrap plugin. add 378c2ed Fix layout problem on entry edit page. add d2320b0 Fix problem introduced in merge from master to bootstrap-ui add 4e44afe Remove redundant content-type code add 37277bb Remove redundant content-type code add ff31349 Convert setup page to Bootstrap add f8ee9d7 Set version in Bootstrap branch to 6.0.0-SNAPSHOT add 7f4ac30 Convert docs README to Markdown add c6459e5 With a multi-host blog setup, use hostname to determine match instead of URL. add 76672ce master is no longer 5.2.0 add 870e933 master is no longer 5.2.0 add 9b7d562 Merge branch 'master' into bootstrap-ui add 952c438 Need to whitelist "upgrade" instead of "update" add 85b6244 Merge branch 'master' into bootstrap-ui add 57a19fd Improvements to Login form layout add 84579b4 Progress on WeblogConfig page; more work remains. add e83e5f8 Server Administration (GlobalConfig) working well and looking good with Bootstrap. add bb92ba2 Weblog config and remove pages converted to Struts Bootstrap. add 7cd8d6f Switch to WebJars for Bootstrap, JQuery and JQuery UI, llso remove unecessary usage of Angular. add 77e003d ThemeEdit page rewritten for Bootstrap, needs more polish. Note, theme logic in CreateWeblog is incomplete. add 840f46c More tweaks to Theme Edit page. add 5889e03 Remove unecessary usage of Angular in Create Weblog page. add 96a0065 Wrong password tip on user register page. add 48e9708 Convert stylesheet edit page to Struts 2 Bootstrap and rework UI logic add 4d21faf preparing for 5.1.2 rc1 add 947ddf3 Merge commit '4d21faf095b402f7a5c197ca6592c3bf23b70273' add 40547d2 Merge branch 'roller-5.2.0' add ad62b85 Bump JDK version up to 1.8 and upgrade to latest Jetty for mvn jetty:run add 7df1f1d Merge branch 'master' into bootstrap-ui add 2ade07d Fix merge problems, switch to same version of Log4j2 that Struts uses and progress on Templates and TemplateEdit pages. add de9086c Almost done with Bootstrap conversion of Theme Edit, Templates and Template Edit pages. add 7fc12f4 Finished converting Theme and Template pages to Boostrap. add b7f4daa Beginning of a CDI based weblogger provider. add 8192321 So far unsuccessful experiments with CdiWebloggerProvider add 922929b Upgraded to Guice 4.2.1 and now Roller tests run successfully under Java 10, have not tried 11 yet. add 09708c0 Needed this change to avoid ClassNotFoundException: org.apache.logging.log4j.util.ReflectionUtil when running on Tomcat 8. add e56f312 Cleanup abandoned CDI efforts. add 3daa8a7 Cleanup abandoned CDI efforts. add 9e94f5f Oops, I meant 11. add 2f60b45 Merge branch 'java11' into bootstrap-ui add 3564e13 I was wrong, Java 10 works by Java 11 fails. More work to do. add 6976363 Converted weblog member and ping pages, also fixed Admin Menu regression add 593f9ba Converted weblog maintenance page. add 2ec0cba Fix regression in comments page. add 47049ac UserAdmin and UserEdit pages converted to Bootstrap, also switched back to Java 8. add 67fa3a5 Add missing header. add 44b008d Converted Ping Target management pages to Struts Bootstrap. add fb34b0a Use same version of Log4j2 as Struts does add bcea95e Merge branch 'roller-5.2.0' add 9117008 Minor refactoring add 958c491 ROL-2103 Upgrade vulnerable commons-collections to 3.2.2 add fa7c495 Merge branch 'master' into feature/ROL-2103 add 06cad06 Merge pull request #6 from nuzayats/feature/ROL-2103 add 2429c59 Fixed Spelling. add ed10d7e Merge pull request #13 from jimmycasey/master add 92df1c2 Upgrade Xinha add 4c9b3cf Merge pull request #11 from nuzayats/update_xinha add c01077b Brain methods of class Register automatically refactored with Bandago add 9e4c56e Merge pull request #9 from santiago-a-vidal/BandagoRefactorings add c17f7b3 Make some Lucene configuration adjustable add d362f5d Merge pull request #10 from nuzayats/ROL-2090 add af67f5c Fix mispelling add b5a12c1 Merge branch 'roller-5.2.x' add 593ff47 Draft create add 66f0785 fix:(plugins) use a better version of maven deploy plugin add 645f8ef Executable jar for Roller add bf5658a Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/roller add 6ac1365 This branch is not 6, and not the same as Apache Roller. add 45a0231 Merge branch 'master' of https://github.com/apache/roller add 26f2892 Merge branch 'master' of https://github.com/snoopdave/rollarcus add 3745417 Revert "Merge branch 'master' of https://github.com/snoopdave/rollarcus" add de461a7 Merge pull request #23 from snoopdave/master add cd196fe Merge branch 'master' into bootstrap-ui add 3f5b3e2 Move to JUnit 5 . add b7d4dbc Start of a Jetty lifecycle add f169765 Ping target adding and editing via modal/AJAX, also fixes to AJAX elsewhere. add 6c5bfef Fixing some regressions, deleting unnecessary JSP code. add 17912d1 Cache info converted. add 6a7af01 Add missing bootstrap style. add 927af81 Converted planet config, subscriptions and groups pages to Bootstrap. Code complete! add b1a8797 Reorganize Planet Group actions, fix bugs. add de34f66 Fixes the datepickers. add c3a31ec Fixed broken allow comments control and improve form layout. add 22a43ba Add client-side validate to category add/edit and add subscription forms. add 748bc49 Progress on Media File pages; almost done! add f164e8d Completed Media File Add page. add 8c386dd Completed Bootstrapification of Media File Success page. add e647108 Formatting. add 30496f9 Adding .gitignore from PR #7. add 957137a Fix up the Media File Edit modal. add 1a7e0db EditEntry's Insert Media File feature working reasonably well now, but not in Rich Text Edit mode. add 52bc039 Replacing Xinha with Summernote because it's the best option for Bootstrap, is actively developed and is available via Webjars. add d45f71b Replacing Xinha with Summernote (continued) add d60a729 Allow empty for blogroll selector add 98e5991 Better help text for blogroll page add 6658c59 Fixes to member pages. add c3cfdc1 Add Insert Media File support for rich text editor. add 4f6db03 Work around apparent Struts 2 Bootstrap bug(?) add 04fb5f6 Before and after screen-shots. add e67c47b Sidebars always on left, add ASF feather and make date controls consistent. add 0e406c5 More tweaks to layout and ASF logo display. add e51dc89 Simple Dockerfile for Roller and docker-compose setup for running Tomcat, PostgreSQL and Roller. add 3ae0621 Simple Dockerfile for Roller and docker-compose setup for running Tomcat, PostgreSQL and Roller. add 6981c3a License headers add 39338f4 Merge branch 'roller-5.2.x' add dda7b19 Ignore working files add d456d54 From Kohei's PR add c4e2fd3 Merge branch 'master' into bootstrap-ui add 848c017 docker-compose setup now working with Roller 6 snapshot. add 1215d30 Update status add 5918db4 Polish auto-installer, login and other pages. add 3e531ef More polish of web UI. add 38f9568 More UI polish, also updated theme previews. add 0e77733 Polish the docker-compose setup. add 518af5e Allow action-methods per action, fix delete entry from EditEntry page add ab229c6 Merge branch 'roller-5.2.x' add ed48b47 I was wrong, Java 10 works by Java 11 fails. More work to do. add 4e955ce Merge branch 'master' into java11 add 3633dcb Fix merge problems add 07b51df Updated most maven dependencies which didn't require code changes. Tests are now green on (AdoptOpen)JDK 11 and 12 using language level 11 and 12. Added an explicit dependency to ASM 7.1 to better control which version is used and improve compatibility with latest bytecodes. add e2d7830 updated .gitignore for NetBeans. add d284c76 Changed 'eclipselink' artifact to 'org.eclipse.persistence.jpa' + removed old 'javax.persistence' dependency. Both jakarta.persistence-2.2.2.jar and org.eclipse.persistence.jpa-2.7.4.jars are now signed and don't cause a security exception during classloading. Workaround of using old JPA API jar is no longer needed. add 6b3f0a4 Merge pull request #25 from mbien/java11 add e72e15c Merge pull request #14 from apache/java11 add 18b5371 Simplification of recent remember-me fix. add 88f02b9 More remember-me fixes. add 4b43c5a Merge branch 'master' into bootstrap-ui add 110721e Make IntelliJ happy. add 046a685 Java 11 in boostrap-ui! add 7b67746 Convert upgrade page to bootstrap add 0534f40 tiles-popuppage-only-content should extend so that it inherits attributes. add 2476eeb Fix remove Planet sub from group. add 4d52940 Minor changes: speliing correction, license header, remove obsolete config prop. add f7eaaca Improvements to Dockerfile and Docker Compose setup. add a963bb1 Merge branch 'roller-5.2.x' add 6a1c12e Merge branch 'master' into bootstrap-ui add c0fb435 Fix a couple of merge problems. add d950b73 Back off on ASM version. add 1a2054d Prepare for merge to master. add bacf2dd Merge pull request #22 from apache/bootstrap-ui add 7afbbd6 cd roller before docker compose add 192b006 Merge branch 'master' of https://github.com/apache/roller into ROL-2138 No new revisions were added by this update. Summary of changes: .gitignore | 32 +- Dockerfile | 84 + LICENSE.txt | 27 + README.md | 33 +- app/pom.xml | 139 +- .../org/apache/roller/weblogger/TestUtils.java | 3 +- .../weblogger/business/MediaFileManager.java | 7 + .../roller/weblogger/business/WebloggerImpl.java | 9 +- .../business/jpa/JPAMediaFileManagerImpl.java | 21 + .../business/jpa/JPAWeblogEntryManagerImpl.java | 76 +- .../weblogger/business/jpa/JPAWebloggerImpl.java | 13 +- .../business/search/IndexManagerImpl.java | 26 +- .../business/search/operations/IndexOperation.java | 4 +- .../business/themes/SharedThemeFromDir.java | 3 +- .../business/themes/ThemeManagerImpl.java | 20 +- .../roller/weblogger/config/runtime/ConfigDef.java | 29 +- .../weblogger/config/runtime/PropertyDef.java | 6 +- .../roller/weblogger/planet/ui/PlanetConfig.java | 8 +- .../weblogger/planet/ui/PlanetGroupSubs.java | 343 ++ .../roller/weblogger/planet/ui/PlanetGroups.java | 162 +- .../weblogger/planet/ui/PlanetGroupsBean.java | 73 - .../weblogger/planet/ui/PlanetSubscriptions.java | 236 -- .../roller/weblogger/pojos/ThemeTemplate.java | 2 +- .../roller/weblogger/pojos/WeblogEntryComment.java | 5 +- .../plugins/{XinhaEditor.java => Summernote.java} | 13 +- .../ui/core/plugins/UIPluginManagerImpl.java | 2 +- .../roller/weblogger/ui/core/util/menu/Menu.java | 4 +- .../weblogger/ui/core/util/menu/MenuHelper.java | 42 +- .../ui/rendering/WeblogRequestMapper.java | 20 +- .../weblogger/ui/rendering/model/SiteModel.java | 16 +- .../weblogger/ui/struts2/admin/CreateUserBean.java | 16 +- .../weblogger/ui/struts2/admin/GlobalConfig.java | 176 +- .../weblogger/ui/struts2/admin/PingTargetEdit.java | 12 +- .../weblogger/ui/struts2/admin/UserAdmin.java | 19 +- .../weblogger/ui/struts2/admin/UserEdit.java | 11 +- .../ui/struts2/ajax/ThemeDataServlet.java | 3 +- .../roller/weblogger/ui/struts2/core/Install.java | 2 +- .../roller/weblogger/ui/struts2/core/Register.java | 115 +- .../weblogger/ui/struts2/editor/BookmarkEdit.java | 6 +- .../weblogger/ui/struts2/editor/Bookmarks.java | 20 +- .../weblogger/ui/struts2/editor/CategoryEdit.java | 21 +- .../weblogger/ui/struts2/editor/Comments.java | 73 +- .../weblogger/ui/struts2/editor/EntryBean.java | 3 + .../weblogger/ui/struts2/editor/FolderEdit.java | 19 +- .../weblogger/ui/struts2/editor/MediaFileAdd.java | 18 +- .../weblogger/ui/struts2/editor/MediaFileBase.java | 16 +- .../weblogger/ui/struts2/editor/MediaFileEdit.java | 15 +- .../ui/struts2/editor/MediaFileImageChooser.java | 41 +- .../weblogger/ui/struts2/editor/MediaFileView.java | 18 +- .../ui/struts2/editor/StylesheetEdit.java | 329 +- .../weblogger/ui/struts2/editor/TemplateEdit.java | 5 +- .../ui/struts2/editor/TemplateRemove.java | 117 +- .../weblogger/ui/struts2/editor/Templates.java | 342 +- .../ui/struts2/editor/TemplatesRemove.java | 254 -- .../weblogger/ui/struts2/editor/WeblogConfig.java | 3 +- .../roller/weblogger/ui/struts2/util/UIAction.java | 5 +- .../ui/struts2/util/UISecurityInterceptor.java | 11 +- .../main/resources/ApplicationResources.properties | 390 +- .../resources/ApplicationResources_de.properties | 22 +- .../resources/ApplicationResources_es.properties | 20 +- .../resources/ApplicationResources_fr.properties | 22 +- .../resources/ApplicationResources_ja.properties | 22 +- .../resources/ApplicationResources_ko.properties | 22 +- .../resources/ApplicationResources_ru.properties | 22 +- .../ApplicationResources_zh_CN.properties | 20 +- app/src/main/resources/logback.xml | 13 + .../roller/weblogger/config/roller.properties | 15 +- .../roller/weblogger/config/runtimeConfigDefs.xml | 10 +- .../weblogger/ui/struts2/admin/admin-menu.xml | 4 +- app/src/main/resources/struts.xml | 197 +- .../resources/template/roller/checkboxlist.ftl | 106 - .../main/webapp/WEB-INF/jsps/admin/CacheInfo.jsp | 5 +- .../webapp/WEB-INF/jsps/admin/GlobalConfig.jsp | 226 +- .../webapp/WEB-INF/jsps/admin/PingTargetEdit.jsp | 59 - .../webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp | 42 - .../main/webapp/WEB-INF/jsps/admin/PingTargets.jsp | 354 +- .../webapp/WEB-INF/jsps/admin/PlanetConfig.jsp | 100 +- .../PlanetGroupSidebar.jsp} | 63 +- .../webapp/WEB-INF/jsps/admin/PlanetGroupSubs.jsp | 164 + .../WEB-INF/jsps/admin/PlanetGroupSubsSidebar.jsp | 72 + .../webapp/WEB-INF/jsps/admin/PlanetGroups.jsp | 172 +- .../WEB-INF/jsps/admin/PlanetSubscriptions.jsp | 101 - .../main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp | 45 +- .../main/webapp/WEB-INF/jsps/admin/UserEdit.jsp | 169 +- .../webapp/WEB-INF/jsps/core/CreateDatabase.jsp | 2 +- .../main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp | 204 +- .../{tiles/css-sidebar.jsp => core/Login-css.jsp} | 10 +- app/src/main/webapp/WEB-INF/jsps/core/Login.jsp | 237 +- app/src/main/webapp/WEB-INF/jsps/core/MainMenu.jsp | 222 +- .../webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp | 35 +- app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp | 183 +- app/src/main/webapp/WEB-INF/jsps/core/Register.jsp | 282 +- app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp | 177 +- .../webapp/WEB-INF/jsps/core/UpgradeDatabase.jsp | 49 +- .../webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp | 91 - .../main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp | 920 ++++- .../WEB-INF/jsps/editor/BookmarksSidebar.jsp | 67 +- .../main/webapp/WEB-INF/jsps/editor/Categories.jsp | 328 +- .../WEB-INF/jsps/editor/CategoriesSidebar.jsp | 59 +- .../webapp/WEB-INF/jsps/editor/CategoryEdit.jsp | 72 - .../webapp/WEB-INF/jsps/editor/CategoryRemove.jsp | 51 - .../main/webapp/WEB-INF/jsps/editor/Comments.jsp | 485 +-- .../webapp/WEB-INF/jsps/editor/CommentsSidebar.jsp | 155 +- .../main/webapp/WEB-INF/jsps/editor/Entries.jsp | 230 +- .../webapp/WEB-INF/jsps/editor/EntriesSidebar.jsp | 229 +- .../main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp | 627 +-- .../webapp/WEB-INF/jsps/editor/EntryEditor.jsp | 292 +- .../webapp/WEB-INF/jsps/editor/EntryRemove.jsp | 61 - .../webapp/WEB-INF/jsps/editor/EntrySidebar.jsp | 43 +- .../main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp | 59 - .../webapp/WEB-INF/jsps/editor/Maintenance.jsp | 16 +- .../webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp | 232 +- .../WEB-INF/jsps/editor/MediaFileAddSuccess.jsp | 309 +- .../webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp | 305 +- .../WEB-INF/jsps/editor/MediaFileImageChooser.jsp | 195 +- .../WEB-INF/jsps/editor/MediaFileSidebar.jsp | 235 +- .../webapp/WEB-INF/jsps/editor/MediaFileView.jsp | 615 ++- .../WEB-INF/jsps/editor/MediaFileViewLight.jsp | 17 + .../webapp/WEB-INF/jsps/editor/MemberResign.jsp | 24 +- .../main/webapp/WEB-INF/jsps/editor/Members.jsp | 10 +- .../webapp/WEB-INF/jsps/editor/MembersInvite.jsp | 72 +- .../webapp/WEB-INF/jsps/editor/MembersSidebar.jsp | 57 +- app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp | 15 +- .../webapp/WEB-INF/jsps/editor/StylesheetEdit.jsp | 146 +- .../webapp/WEB-INF/jsps/editor/TemplateEdit.jsp | 387 +- .../main/webapp/WEB-INF/jsps/editor/Templates.jsp | 158 +- .../webapp/WEB-INF/jsps/editor/TemplatesRemove.jsp | 54 - .../WEB-INF/jsps/editor/TemplatesSidebar.jsp | 59 +- .../main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp | 385 +- .../webapp/WEB-INF/jsps/editor/WeblogConfig.jsp | 332 +- .../WEB-INF/jsps/editor/WeblogRemoveConfirm.jsp | 51 +- .../main/webapp/WEB-INF/jsps/taglibs-struts2.jsp | 20 +- .../WEB-INF/jsps/tiles/bannerInstallation.jsp | 40 +- .../webapp/WEB-INF/jsps/tiles/bannerStatus.jsp | 135 +- .../main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp | 20 - app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp | 22 +- app/src/main/webapp/WEB-INF/jsps/tiles/menu.jsp | 76 +- .../main/webapp/WEB-INF/jsps/tiles/messages.jsp | 9 +- .../webapp/WEB-INF/jsps/tiles/tiles-errorpage.jsp | 5 +- .../WEB-INF/jsps/tiles/tiles-installpage.jsp | 65 +- .../{tiles-popuppage.jsp => tiles-loginpage.jsp} | 103 +- .../WEB-INF/jsps/tiles/tiles-mainmenupage.jsp | 93 +- .../webapp/WEB-INF/jsps/tiles/tiles-popuppage.jsp | 5 +- .../WEB-INF/jsps/tiles/tiles-simple-tabbedpage.jsp | 57 + .../webapp/WEB-INF/jsps/tiles/tiles-simplepage.jsp | 70 +- .../webapp/WEB-INF/jsps/tiles/tiles-tabbedpage.jsp | 110 +- .../userStatus.jsp} | 67 +- app/src/main/webapp/WEB-INF/tiles.xml | 184 +- app/src/main/webapp/WEB-INF/web.xml | 4 + app/src/main/webapp/roller-ui/JQueryUI-README.txt | 26 - .../authoring/editors/xinha-0.96.1/Xinha.css | 477 --- .../authoring/editors/xinha-0.96.1/XinhaCore.js | 4322 -------------------- .../authoring/editors/xinha-0.96.1/XinhaLoader.js | 213 - .../editors/xinha-0.96.1/XinhaLoader_readme.txt | 5 - .../editors/xinha-0.96.1/compression_readme.txt | 8 - .../editors/xinha-0.96.1/examples/full_example.css | 78 - .../authoring/editors/xinha-0.96.1/htmlarea.js | 10 - .../editors/xinha-0.96.1/images/de/bold.gif | Bin 57 -> 0 bytes .../editors/xinha-0.96.1/images/de/italic.gif | Bin 63 -> 0 bytes .../editors/xinha-0.96.1/images/de/underline.gif | Bin 69 -> 0 bytes .../editors/xinha-0.96.1/images/ed_about.gif | Bin 76 -> 0 bytes .../editors/xinha-0.96.1/images/ed_align.gif | Bin 3388 -> 0 bytes .../xinha-0.96.1/images/ed_align_center.gif | Bin 61 -> 0 bytes .../xinha-0.96.1/images/ed_align_justify.gif | Bin 60 -> 0 bytes .../editors/xinha-0.96.1/images/ed_align_left.gif | Bin 60 -> 0 bytes .../editors/xinha-0.96.1/images/ed_align_right.gif | Bin 61 -> 0 bytes .../editors/xinha-0.96.1/images/ed_blank.gif | Bin 56 -> 0 bytes .../xinha-0.96.1/images/ed_buttons_main.gif | Bin 6629 -> 0 bytes .../xinha-0.96.1/images/ed_buttons_main.png | Bin 20448 -> 0 bytes .../editors/xinha-0.96.1/images/ed_charmap.gif | Bin 134 -> 0 bytes .../editors/xinha-0.96.1/images/ed_clearfonts.gif | Bin 134 -> 0 bytes .../editors/xinha-0.96.1/images/ed_color_bg.gif | Bin 172 -> 0 bytes .../editors/xinha-0.96.1/images/ed_color_fg.gif | Bin 164 -> 0 bytes .../editors/xinha-0.96.1/images/ed_copy.gif | Bin 97 -> 0 bytes .../editors/xinha-0.96.1/images/ed_custom.gif | Bin 50 -> 0 bytes .../editors/xinha-0.96.1/images/ed_cut.gif | Bin 78 -> 0 bytes .../editors/xinha-0.96.1/images/ed_delete.gif | Bin 80 -> 0 bytes .../editors/xinha-0.96.1/images/ed_format_bold.gif | Bin 57 -> 0 bytes .../xinha-0.96.1/images/ed_format_italic.gif | Bin 67 -> 0 bytes .../xinha-0.96.1/images/ed_format_strike.gif | Bin 66 -> 0 bytes .../editors/xinha-0.96.1/images/ed_format_sub.gif | Bin 67 -> 0 bytes .../editors/xinha-0.96.1/images/ed_format_sup.gif | Bin 67 -> 0 bytes .../xinha-0.96.1/images/ed_format_underline.gif | Bin 69 -> 0 bytes .../editors/xinha-0.96.1/images/ed_help.gif | Bin 55 -> 0 bytes .../editors/xinha-0.96.1/images/ed_hr.gif | Bin 53 -> 0 bytes .../editors/xinha-0.96.1/images/ed_html.gif | Bin 64 -> 0 bytes .../editors/xinha-0.96.1/images/ed_image.gif | Bin 125 -> 0 bytes .../editors/xinha-0.96.1/images/ed_indent_less.gif | Bin 84 -> 0 bytes .../editors/xinha-0.96.1/images/ed_indent_more.gif | Bin 84 -> 0 bytes .../editors/xinha-0.96.1/images/ed_killword.gif | Bin 151 -> 0 bytes .../xinha-0.96.1/images/ed_left_to_right.gif | Bin 72 -> 0 bytes .../editors/xinha-0.96.1/images/ed_link.gif | Bin 78 -> 0 bytes .../editors/xinha-0.96.1/images/ed_list_bullet.gif | Bin 72 -> 0 bytes .../editors/xinha-0.96.1/images/ed_list_num.gif | Bin 76 -> 0 bytes .../editors/xinha-0.96.1/images/ed_overwrite.gif | Bin 100 -> 0 bytes .../editors/xinha-0.96.1/images/ed_paste.gif | Bin 126 -> 0 bytes .../editors/xinha-0.96.1/images/ed_print.gif | Bin 117 -> 0 bytes .../editors/xinha-0.96.1/images/ed_redo.gif | Bin 67 -> 0 bytes .../xinha-0.96.1/images/ed_right_to_left.gif | Bin 75 -> 0 bytes .../editors/xinha-0.96.1/images/ed_rmformat.gif | Bin 105 -> 0 bytes .../editors/xinha-0.96.1/images/ed_save.gif | Bin 128 -> 0 bytes .../editors/xinha-0.96.1/images/ed_save.png | Bin 230 -> 0 bytes .../editors/xinha-0.96.1/images/ed_saveas.gif | Bin 104 -> 0 bytes .../editors/xinha-0.96.1/images/ed_selectall.gif | Bin 150 -> 0 bytes .../editors/xinha-0.96.1/images/ed_show_border.gif | Bin 88 -> 0 bytes .../editors/xinha-0.96.1/images/ed_splitblock.gif | Bin 82 -> 0 bytes .../editors/xinha-0.96.1/images/ed_splitcel.gif | Bin 111 -> 0 bytes .../editors/xinha-0.96.1/images/ed_undo.gif | Bin 67 -> 0 bytes .../xinha-0.96.1/images/ed_word_cleaner.gif | Bin 652 -> 0 bytes .../editors/xinha-0.96.1/images/fr/bold.gif | Bin 128 -> 0 bytes .../xinha-0.96.1/images/fr/strikethrough.gif | Bin 131 -> 0 bytes .../editors/xinha-0.96.1/images/fr/underline.gif | Bin 134 -> 0 bytes .../xinha-0.96.1/images/fullscreen_maximize.gif | Bin 87 -> 0 bytes .../xinha-0.96.1/images/fullscreen_minimize.gif | Bin 87 -> 0 bytes .../editors/xinha-0.96.1/images/insert_table.gif | Bin 104 -> 0 bytes .../editors/xinha-0.96.1/images/insertfilelink.gif | Bin 148 -> 0 bytes .../editors/xinha-0.96.1/images/insertmacro.png | Bin 638 -> 0 bytes .../authoring/editors/xinha-0.96.1/images/tidy.gif | Bin 375 -> 0 bytes .../editors/xinha-0.96.1/images/toggle_borders.gif | Bin 73 -> 0 bytes .../xinha-0.96.1/images/xinha-small-icon.gif | Bin 556 -> 0 bytes .../editors/xinha-0.96.1/images/xinha_logo.gif | Bin 3006 -> 0 bytes .../authoring/editors/xinha-0.96.1/lang/b5.js | 29 - .../authoring/editors/xinha-0.96.1/lang/ch.js | 56 - .../authoring/editors/xinha-0.96.1/lang/cz.js | 50 - .../authoring/editors/xinha-0.96.1/lang/da.js | 172 - .../authoring/editors/xinha-0.96.1/lang/de.js | 171 - .../authoring/editors/xinha-0.96.1/lang/ee.js | 50 - .../authoring/editors/xinha-0.96.1/lang/el.js | 55 - .../authoring/editors/xinha-0.96.1/lang/es.js | 167 - .../authoring/editors/xinha-0.96.1/lang/eu.js | 169 - .../authoring/editors/xinha-0.96.1/lang/fa.js | 169 - .../authoring/editors/xinha-0.96.1/lang/fi.js | 38 - .../authoring/editors/xinha-0.96.1/lang/fr.js | 171 - .../authoring/editors/xinha-0.96.1/lang/gb.js | 29 - .../authoring/editors/xinha-0.96.1/lang/he.js | 64 - .../authoring/editors/xinha-0.96.1/lang/hu.js | 64 - .../authoring/editors/xinha-0.96.1/lang/it.js | 55 - .../authoring/editors/xinha-0.96.1/lang/ja.js | 175 - .../authoring/editors/xinha-0.96.1/lang/lt.js | 53 - .../authoring/editors/xinha-0.96.1/lang/lv.js | 42 - .../authoring/editors/xinha-0.96.1/lang/nb.js | 78 - .../authoring/editors/xinha-0.96.1/lang/nl.js | 64 - .../authoring/editors/xinha-0.96.1/lang/pl.js | 125 - .../authoring/editors/xinha-0.96.1/lang/pt_br.js | 184 - .../authoring/editors/xinha-0.96.1/lang/ro.js | 63 - .../authoring/editors/xinha-0.96.1/lang/ru.js | 185 - .../authoring/editors/xinha-0.96.1/lang/sh.js | 140 - .../authoring/editors/xinha-0.96.1/lang/si.js | 50 - .../authoring/editors/xinha-0.96.1/lang/sr.js | 140 - .../authoring/editors/xinha-0.96.1/lang/sv.js | 116 - .../authoring/editors/xinha-0.96.1/lang/th.js | 50 - .../authoring/editors/xinha-0.96.1/lang/vn.js | 56 - .../authoring/editors/xinha-0.96.1/license.txt | 30 - .../xinha-0.96.1/modules/AboutBox/AboutBox.js | 156 - .../xinha-0.96.1/modules/AboutBox/about.css | 51 - .../xinha-0.96.1/modules/AboutBox/dialog.html | 95 - .../modules/ColorPicker/ColorPicker.js | 624 --- .../xinha-0.96.1/modules/ColorPicker/lang/pt_br.js | 22 - .../xinha-0.96.1/modules/CreateLink/dialog.html | 28 - .../xinha-0.96.1/modules/CreateLink/lang/pt_br.js | 18 - .../xinha-0.96.1/modules/CreateLink/link.html | 136 - .../xinha-0.96.1/modules/CreateLink/link.js | 67 - .../modules/CreateLink/pluginMethods.js | 109 - .../xinha-0.96.1/modules/Dialogs/DetachedDialog.js | 24 - .../xinha-0.96.1/modules/Dialogs/XinhaDialog.js | 916 ----- .../editors/xinha-0.96.1/modules/Dialogs/dialog.js | 74 - .../xinha-0.96.1/modules/Dialogs/div-dialog.js | 26 - .../xinha-0.96.1/modules/Dialogs/panel-dialog.js | 50 - .../xinha-0.96.1/modules/Dialogs/popupwin.js | 122 - .../xinha-0.96.1/modules/FullScreen/full-screen.js | 154 - .../xinha-0.96.1/modules/FullScreen/lang/de.js | 6 - .../xinha-0.96.1/modules/FullScreen/lang/es.js | 6 - .../xinha-0.96.1/modules/FullScreen/lang/fr.js | 5 - .../xinha-0.96.1/modules/FullScreen/lang/ja.js | 5 - .../xinha-0.96.1/modules/FullScreen/lang/nb.js | 6 - .../xinha-0.96.1/modules/FullScreen/lang/nl.js | 6 - .../xinha-0.96.1/modules/FullScreen/lang/pl.js | 6 - .../xinha-0.96.1/modules/FullScreen/lang/pt_br.js | 18 - .../xinha-0.96.1/modules/FullScreen/lang/ru.js | 6 - .../xinha-0.96.1/modules/FullScreen/lang/sv.js | 6 - .../editors/xinha-0.96.1/modules/Gecko/Gecko.js | 471 --- .../xinha-0.96.1/modules/Gecko/paraHandlerBest.js | 295 -- .../xinha-0.96.1/modules/GetHtml/DOMwalk.js | 197 - .../modules/GetHtml/TransformInnerHTML.js | 155 - .../xinha-0.96.1/modules/GetHtml/lang/pt_br.js | 18 - .../xinha-0.96.1/modules/InsertImage/dialog.html | 83 - .../modules/InsertImage/insert_image.html | 173 - .../modules/InsertImage/insert_image.js | 70 - .../modules/InsertImage/pluginMethods.js | 113 - .../xinha-0.96.1/modules/InsertTable/dialog.html | 100 - .../modules/InsertTable/insert_table.html | 157 - .../modules/InsertTable/insert_table.js | 57 - .../modules/InsertTable/pluginMethods.js | 81 - .../modules/InternetExplorer/InternetExplorer.js | 477 --- .../editors/xinha-0.96.1/modules/Opera/Opera.js | 471 --- .../editors/xinha-0.96.1/modules/WebKit/WebKit.js | 485 --- .../editors/xinha-0.96.1/popups/blank.html | 1 - .../editors/xinha-0.96.1/popups/editor_help.html | 62 - .../editors/xinha-0.96.1/popups/popup.css | 39 - .../authoring/editors/xinha-0.96.1/popups/popup.js | 107 - .../editors/xinha-0.96.1/popups/select_color.html | 359 -- .../editors/xinha-0.96.1/release-notes.txt | 380 -- .../skins/blue-look/button-background.png | Bin 145 -> 0 bytes .../xinha-0.96.1/skins/blue-look/separator.gif | Bin 91 -> 0 bytes .../editors/xinha-0.96.1/skins/blue-look/skin.css | 105 - .../skins/green-look/button-background.gif | Bin 78 -> 0 bytes .../xinha-0.96.1/skins/green-look/separator.gif | Bin 91 -> 0 bytes .../editors/xinha-0.96.1/skins/green-look/skin.css | 96 - .../editors/xinha-0.96.1/skins/silva/dialog.jpg | Bin 22222 -> 0 bytes .../editors/xinha-0.96.1/skins/silva/html.gif | Bin 1255 -> 0 bytes .../editors/xinha-0.96.1/skins/silva/skin.css | 177 - .../editors/xinha-0.96.1/skins/silva/skin.xml | 11 - .../editors/xinha-0.96.1/skins/silva/statusbar.png | Bin 2879 -> 0 bytes .../editors/xinha-0.96.1/skins/silva/toolbar.png | Bin 2889 -> 0 bytes app/src/main/webapp/roller-ui/images/clippy.svg | 4 + app/src/main/webapp/roller-ui/images/feather.svg | 138 + .../jquery-ui-1.11.0/images/animated-overlay.gif | Bin 1738 -> 0 bytes .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 212 -> 0 bytes .../images/ui-bg_flat_55_fbec88_40x100.png | Bin 206 -> 0 bytes .../images/ui-bg_glass_75_d0e5f5_1x400.png | Bin 336 -> 0 bytes .../images/ui-bg_glass_85_dfeffc_1x400.png | Bin 341 -> 0 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 332 -> 0 bytes .../images/ui-bg_gloss-wave_55_5c9ccc_500x100.png | Bin 5824 -> 0 bytes .../images/ui-bg_inset-hard_100_f5f8f9_1x100.png | Bin 333 -> 0 bytes .../images/ui-bg_inset-hard_100_fcfdfd_1x100.png | Bin 292 -> 0 bytes .../images/ui-icons_217bc0_256x240.png | Bin 4549 -> 0 bytes .../images/ui-icons_2e83ff_256x240.png | Bin 4549 -> 0 bytes .../images/ui-icons_469bdd_256x240.png | Bin 4549 -> 0 bytes .../images/ui-icons_6da8d5_256x240.png | Bin 4549 -> 0 bytes .../images/ui-icons_cd0a0a_256x240.png | Bin 4549 -> 0 bytes .../images/ui-icons_d8e7f3_256x240.png | Bin 4549 -> 0 bytes .../images/ui-icons_f9bd01_256x240.png | Bin 4549 -> 0 bytes .../roller-ui/jquery-ui-1.11.0/jquery-ui.min.css | 7 - .../roller-ui/jquery-ui-1.11.0/jquery-ui.min.js | 10 - app/src/main/webapp/roller-ui/scripts/ajax-user.js | 22 +- app/src/main/webapp/roller-ui/styles/roller.css | 882 +--- .../webapp/roller-ui/yui3/cssbase/cssbase-min.css | 8 - .../main/webapp/roller-ui/yui3/cssbase/cssbase.css | 84 - .../roller-ui/yui3/cssfonts/cssfonts-min.css | 8 - .../webapp/roller-ui/yui3/cssfonts/cssfonts.css | 49 - .../roller-ui/yui3/cssreset/cssreset-min.css | 8 - .../webapp/roller-ui/yui3/cssreset/cssreset.css | 123 - app/src/main/webapp/theme/scripts/roller.js | 50 +- app/src/main/webapp/themes/basic/basic-preview.png | Bin 85441 -> 263513 bytes app/src/main/webapp/themes/basic/theme.xml | 19 +- .../webapp/themes/basicmobile/basic-preview.png | Bin 86498 -> 0 bytes .../themes/basicmobile/basicmobile-preview.png | Bin 0 -> 263910 bytes app/src/main/webapp/themes/basicmobile/theme.xml | 21 +- .../webapp/themes/fauxcoly/fauxcoly-preview.png | Bin 0 -> 264191 bytes .../themes/fauxcoly/images/fauxcoly-preview.png | Bin 83656 -> 0 bytes app/src/main/webapp/themes/fauxcoly/theme.xml | 19 +- .../webapp/themes/frontpage/frontpage-preview.png | Bin 0 -> 361014 bytes app/src/main/webapp/themes/frontpage/theme.xml | 21 +- app/src/main/webapp/themes/gaurav/entry.vm | 5 - .../main/webapp/themes/gaurav/gaurav-preview.png | Bin 0 -> 222735 bytes .../webapp/themes/gaurav/images/theme-gaurav.png | Bin 75585 -> 0 bytes app/src/main/webapp/themes/gaurav/theme.xml | 19 +- app/src/main/webapp/themes/gaurav/weblog.vm | 24 +- .../roller/planet/business/EntryBasicTests.java | 26 +- .../planet/business/EntryFunctionalTests.java | 28 +- .../roller/planet/business/GroupBasicTests.java | 19 +- .../planet/business/GroupFunctionalTests.java | 22 +- .../roller/planet/business/PlanetBasicTests.java | 8 +- .../planet/business/PlanetFunctionalTests.java | 33 +- .../roller/planet/business/PlanetTestSuite.java | 71 - .../roller/planet/business/PropertiesTest.java | 18 +- .../planet/business/RomeFeedFetcherTest.java | 39 +- .../business/SingleThreadedFeedUpdaterTest.java | 26 +- .../planet/business/SubscriptionBasicTests.java | 10 +- .../business/SubscriptionFunctionalTests.java | 22 +- .../planet/util/rome/DiskFeedInfoCacheTest.java | 26 +- .../apache/roller/testing/DerbyJunitExtension.java | 156 + .../apache/roller/util/PropertyExpanderTest.java | 37 +- .../java/org/apache/roller/util/RegexUtilTest.java | 49 +- .../org/apache/roller/util/UtilitiesTestSuite.java | 40 - .../roller/weblogger/business/BookmarkTest.java | 39 +- .../roller/weblogger/business/CommentTest.java | 33 +- .../business/CustomTemplateRenditionTest.java | 27 +- .../weblogger/business/FileContentManagerTest.java | 39 +- .../roller/weblogger/business/FolderCRUDTest.java | 16 +- .../business/FolderFunctionalityTest.java | 29 +- .../roller/weblogger/business/HitCountTest.java | 42 +- .../weblogger/business/IndexManagerTest.java | 37 +- .../roller/weblogger/business/MediaFileTest.java | 55 +- .../roller/weblogger/business/PermissionTest.java | 37 +- .../roller/weblogger/business/PingsTest.java | 51 +- .../weblogger/business/PlanetManagerLocalTest.java | 45 +- .../roller/weblogger/business/PropertiesTest.java | 34 +- .../weblogger/business/SQLScriptRunnerTest.java | 28 +- .../roller/weblogger/business/TaskLockTest.java | 37 +- .../weblogger/business/ThemeManagerTest.java | 60 + .../apache/roller/weblogger/business/UserTest.java | 41 +- .../weblogger/business/WeblogCategoryCRUDTest.java | 16 +- .../business/WeblogCategoryFunctionalityTest.java | 21 +- .../roller/weblogger/business/WeblogEntryTest.java | 89 +- .../roller/weblogger/business/WeblogPageTest.java | 34 +- .../roller/weblogger/business/WeblogStatsTest.java | 60 +- .../roller/weblogger/business/WeblogTest.java | 31 +- .../business/jpa/JPAOAuthManagerTest.java | 12 +- .../business/plugins/CommentPluginsTest.java | 19 +- .../business/WebloggerRomeFeedFetcherTest.java | 13 +- .../weblogger/ui/ApplicationResourcesTest.java | 44 +- .../roller/weblogger/ui/UIPluginManagerTest.java | 23 +- .../apache/roller/weblogger/ui/UITestSuite.java | 45 - .../weblogger/ui/core/filters/InitFilterTest.java | 12 +- .../ui/rendering/util/CommentValidatorTest.java | 35 +- .../weblogger/ui/struts2/util/UIActionTest.java | 17 +- .../roller/weblogger/util/BlacklistTest.java | 59 +- .../roller/weblogger/util/LRUCache2Test.java | 37 +- .../weblogger/util/LinkbackExtractorTest.java | 40 +- .../roller/weblogger/util/UtilitiesTest.java | 51 +- app/src/test/resources/roller-custom.properties | 1 + assembly-release/copy-files.sh | 1 + assembly-release/copy-to-asf.sh | 2 + assembly-release/pom.xml | 2 +- assembly-release/sign-release.sh | 4 +- .../sql/derby.properties => docker-compose.yml | 45 +- .../sql/derby.properties => docker/entry-point.sh | 31 +- docker/wait-for-it.sh | 178 + docs/README.md | 10 + docs/README.txt | 9 - docs/before-and-after/entries.png | Bin 0 -> 1656714 bytes docs/before-and-after/entry-edit.png | Bin 0 -> 1764121 bytes docs/before-and-after/main-menu.png | Bin 0 -> 1402108 bytes docs/before-and-after/media-file-view.png | Bin 0 -> 2194673 bytes .../examples/rollerapi/roller-custom.properties | 6 +- docs/readme-images/edit-entry.jpg | Bin 0 -> 176852 bytes docs/readme-images/entries.jpg | Bin 0 -> 144071 bytes it-selenium/pom.xml | 2 +- .../src/test/resources/roller-jettyrun.properties | 2 +- pom.xml | 19 +- 431 files changed, 9778 insertions(+), 25188 deletions(-) create mode 100644 Dockerfile create mode 100644 app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroupSubs.java delete mode 100644 app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetGroupsBean.java delete mode 100644 app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java rename app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/{XinhaEditor.java => Summernote.java} (86%) delete mode 100644 app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java create mode 100644 app/src/main/resources/logback.xml delete mode 100644 app/src/main/resources/template/roller/checkboxlist.ftl delete mode 100644 app/src/main/webapp/WEB-INF/jsps/admin/PingTargetEdit.jsp delete mode 100644 app/src/main/webapp/WEB-INF/jsps/admin/PingTargetRemove.jsp copy app/src/main/webapp/WEB-INF/jsps/{editor/MediaFileAddSuccessInclude.jsp => admin/PlanetGroupSidebar.jsp} (65%) create mode 100644 app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroupSubs.jsp create mode 100644 app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroupSubsSidebar.jsp delete mode 100644 app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp copy app/src/main/webapp/WEB-INF/jsps/{tiles/css-sidebar.jsp => core/Login-css.jsp} (90%) delete mode 100644 app/src/main/webapp/WEB-INF/jsps/editor/BookmarkEdit.jsp delete mode 100644 app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp delete mode 100644 app/src/main/webapp/WEB-INF/jsps/editor/CategoryRemove.jsp delete mode 100644 app/src/main/webapp/WEB-INF/jsps/editor/EntryRemove.jsp delete mode 100644 app/src/main/webapp/WEB-INF/jsps/editor/FolderEdit.jsp delete mode 100644 app/src/main/webapp/WEB-INF/jsps/editor/TemplatesRemove.jsp delete mode 100644 app/src/main/webapp/WEB-INF/jsps/tiles/head-ajax.jsp copy app/src/main/webapp/WEB-INF/jsps/tiles/{tiles-popuppage.jsp => tiles-loginpage.jsp} (51%) create mode 100644 app/src/main/webapp/WEB-INF/jsps/tiles/tiles-simple-tabbedpage.jsp copy app/src/main/webapp/WEB-INF/jsps/{editor/MediaFileAddSuccessInclude.jsp => tiles/userStatus.jsp} (65%) delete mode 100644 app/src/main/webapp/roller-ui/JQueryUI-README.txt delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/Xinha.css delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/XinhaCore.js delete mode 100755 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/XinhaLoader.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/XinhaLoader_readme.txt delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/compression_readme.txt delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/examples/full_example.css delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/htmlarea.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/de/bold.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/de/italic.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/de/underline.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_about.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_align.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_align_center.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_align_justify.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_align_left.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_align_right.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_blank.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_buttons_main.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_buttons_main.png delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_charmap.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_clearfonts.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_color_bg.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_color_fg.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_copy.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_custom.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_cut.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_delete.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_format_bold.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_format_italic.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_format_strike.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_format_sub.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_format_sup.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_format_underline.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_help.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_hr.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_html.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_image.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_indent_less.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_indent_more.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_killword.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_left_to_right.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_link.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_list_bullet.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_list_num.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_overwrite.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_paste.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_print.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_redo.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_right_to_left.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_rmformat.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_save.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_save.png delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_saveas.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_selectall.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_show_border.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_splitblock.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_splitcel.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_undo.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/ed_word_cleaner.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/fr/bold.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/fr/strikethrough.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/fr/underline.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/fullscreen_maximize.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/fullscreen_minimize.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/insert_table.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/insertfilelink.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/insertmacro.png delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/tidy.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/toggle_borders.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/xinha-small-icon.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/images/xinha_logo.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/b5.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/ch.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/cz.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/da.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/de.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/ee.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/el.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/es.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/eu.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/fa.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/fi.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/fr.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/gb.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/he.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/hu.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/it.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/ja.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/lt.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/lv.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/nb.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/nl.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/pl.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/pt_br.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/ro.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/ru.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/sh.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/si.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/sr.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/sv.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/th.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/lang/vn.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/license.txt delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/AboutBox/AboutBox.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/AboutBox/about.css delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/AboutBox/dialog.html delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/ColorPicker/ColorPicker.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/ColorPicker/lang/pt_br.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/CreateLink/dialog.html delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/CreateLink/lang/pt_br.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/CreateLink/link.html delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/CreateLink/link.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/CreateLink/pluginMethods.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/Dialogs/DetachedDialog.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/Dialogs/XinhaDialog.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/Dialogs/dialog.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/Dialogs/div-dialog.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/Dialogs/panel-dialog.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/Dialogs/popupwin.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/FullScreen/full-screen.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/FullScreen/lang/de.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/FullScreen/lang/es.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/FullScreen/lang/fr.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/FullScreen/lang/ja.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/FullScreen/lang/nb.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/FullScreen/lang/nl.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/FullScreen/lang/pl.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/FullScreen/lang/pt_br.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/FullScreen/lang/ru.js delete mode 100755 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/FullScreen/lang/sv.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/Gecko/Gecko.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/Gecko/paraHandlerBest.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/GetHtml/DOMwalk.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/GetHtml/TransformInnerHTML.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/GetHtml/lang/pt_br.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/InsertImage/dialog.html delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/InsertImage/insert_image.html delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/InsertImage/insert_image.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/InsertImage/pluginMethods.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/InsertTable/dialog.html delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/InsertTable/insert_table.html delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/InsertTable/insert_table.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/InsertTable/pluginMethods.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/InternetExplorer/InternetExplorer.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/Opera/Opera.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/modules/WebKit/WebKit.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/popups/blank.html delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/popups/editor_help.html delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/popups/popup.css delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/popups/popup.js delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/popups/select_color.html delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/release-notes.txt delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/skins/blue-look/button-background.png delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/skins/blue-look/separator.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/skins/blue-look/skin.css delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/skins/green-look/button-background.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/skins/green-look/separator.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/skins/green-look/skin.css delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/skins/silva/dialog.jpg delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/skins/silva/html.gif delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/skins/silva/skin.css delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/skins/silva/skin.xml delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/skins/silva/statusbar.png delete mode 100644 app/src/main/webapp/roller-ui/authoring/editors/xinha-0.96.1/skins/silva/toolbar.png create mode 100644 app/src/main/webapp/roller-ui/images/clippy.svg create mode 100644 app/src/main/webapp/roller-ui/images/feather.svg delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/animated-overlay.gif delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_flat_0_aaaaaa_40x100.png delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_flat_55_fbec88_40x100.png delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_75_d0e5f5_1x400.png delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_85_dfeffc_1x400.png delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_glass_95_fef1ec_1x400.png delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_inset-hard_100_f5f8f9_1x100.png delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-bg_inset-hard_100_fcfdfd_1x100.png delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_217bc0_256x240.png delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_2e83ff_256x240.png delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_469bdd_256x240.png delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_6da8d5_256x240.png delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_cd0a0a_256x240.png delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_d8e7f3_256x240.png delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/images/ui-icons_f9bd01_256x240.png delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.css delete mode 100644 app/src/main/webapp/roller-ui/jquery-ui-1.11.0/jquery-ui.min.js delete mode 100644 app/src/main/webapp/roller-ui/yui3/cssbase/cssbase-min.css delete mode 100644 app/src/main/webapp/roller-ui/yui3/cssbase/cssbase.css delete mode 100644 app/src/main/webapp/roller-ui/yui3/cssfonts/cssfonts-min.css delete mode 100644 app/src/main/webapp/roller-ui/yui3/cssfonts/cssfonts.css delete mode 100644 app/src/main/webapp/roller-ui/yui3/cssreset/cssreset-min.css delete mode 100644 app/src/main/webapp/roller-ui/yui3/cssreset/cssreset.css delete mode 100644 app/src/main/webapp/themes/basicmobile/basic-preview.png create mode 100644 app/src/main/webapp/themes/basicmobile/basicmobile-preview.png create mode 100644 app/src/main/webapp/themes/fauxcoly/fauxcoly-preview.png delete mode 100644 app/src/main/webapp/themes/fauxcoly/images/fauxcoly-preview.png create mode 100644 app/src/main/webapp/themes/frontpage/frontpage-preview.png create mode 100644 app/src/main/webapp/themes/gaurav/gaurav-preview.png delete mode 100644 app/src/main/webapp/themes/gaurav/images/theme-gaurav.png delete mode 100644 app/src/test/java/org/apache/roller/planet/business/PlanetTestSuite.java create mode 100644 app/src/test/java/org/apache/roller/testing/DerbyJunitExtension.java delete mode 100644 app/src/test/java/org/apache/roller/util/UtilitiesTestSuite.java create mode 100644 app/src/test/java/org/apache/roller/weblogger/business/ThemeManagerTest.java delete mode 100644 app/src/test/java/org/apache/roller/weblogger/ui/UITestSuite.java create mode 100644 assembly-release/copy-files.sh create mode 100755 assembly-release/copy-to-asf.sh copy app/src/main/resources/sql/derby.properties => docker-compose.yml (52%) copy app/src/main/resources/sql/derby.properties => docker/entry-point.sh (52%) mode change 100644 => 100755 create mode 100755 docker/wait-for-it.sh create mode 100644 docs/README.md delete mode 100644 docs/README.txt create mode 100644 docs/before-and-after/entries.png create mode 100644 docs/before-and-after/entry-edit.png create mode 100644 docs/before-and-after/main-menu.png create mode 100644 docs/before-and-after/media-file-view.png create mode 100644 docs/readme-images/edit-entry.jpg create mode 100644 docs/readme-images/entries.jpg