This is an automated email from the ASF dual-hosted git repository. solomax pushed a change to branch java11-modules in repository https://gitbox.apache.org/repos/asf/openmeetings.git
discard 470272eb6 no jira: unmerged file is fixed discard d205e21ff More work on JPMS discard e275fc84d Build fixed discard db1c0e948 Code clean-up discard a1ce10048 The build is green discard 99d6a117f Some more work on modules discard 7e1560b9d Another attempt to fix the build discard ce02e8294 some compilation errors are resolved discard b4a4a8ee2 OpenJpa modules were changed discard d6805ed83 Simple-xml is dropped discard 5b2d2dd76 no jira: project is partially converted to use java11 modules add cbf3e37ff [OPENMEETINGS-2732] libraries and plugins add fdabf606b [OPENMEETINGS-2732] mockito add 70a7cdf6f Migrating blog posts from Roller add 7e47ea147 Blog posts: build is fixed add 55c245531 [OPENMEETINGS-2732] dependencies; header of blog posts add 463158b4e blog post: post clean-up add fa67693a9 [OPENMEETINGS-2733] couple Sonar issues are addressed add 41f21a2fd no jira: index page for blog posts is added add 1ddcab234 [OPENMEETINGS-2733] minor Sonar issue add ce2797acd [OPENMEETINGS-2732] postrges, mssql, tika, mockito, jaxb-runtime, bytebuddy add bcd8f3ef5 [OPENMEETINGS-2736] arabic add 878918234 Release preparation: documentation is updated add bdc231062 Switching to the next development version add 2b039f96a [OPENMEETINGS-2757] reflow skin, font-awesome, ojdbc, bytebuddy add 3857e6a3f site: javadoc generation is fixed add b07375af0 Broken links are fixed add bc1c8a9c6 [OPENMEETINGS-2757] maven-surefire add cc6016e2b [OPENMEETINGS-2760] RTL menu should be fixed; mvn-3.9.0 build is fixed add e02266c34 [OPENMEETINGS-2757] maven-site add acec88122 Discontinued demo servers are removed add 28446ba5e [OPENMEETINGS-2757] reflow, tomcat, postgresql, bytebuddy add b9caa5e8c [OPENMEETINGS-2757] tomcat, wicket-bootstrap, jetty, mockito, bytebuddy add 2cdb88a4d [OPENMEETINGS-2757] bytebuddy, logback, slf4j, postgresql, jettison, ical4j, wicket-bootstrap and maven plugins add 4b0c46c24 [OPENMEETINGS-2757] spring, swagger, plugins add 6a10c749e [OPENMEETINGS-2757] wicket-jquery-ui, kurento add a28dea888 [OPENMEETINGS-2762] Invitation hash check is more strict add c25f0f890 [OPENMEETINGS-2739] security page is updated add 5eb7afd27 no jira: pom clean-up add 25e772759 [OPENMEETINGS-2763] TURN should work add bcdbb43e3 [OPENMEETINGS-2761] German translation is imported add 4e89e0ca0 [OPENMEETINGS-2764] permissions being set as expected add 9f12a4899 [OPENMEETINGS-2765] paths are being validated add 8e65a1344 [OPENMEETINGS-2765] paths are being validated add afa6bc415 [OPENMEETINGS-2758] deprecated KMS API is dropped add f91ff1917 [OPENMEETINGS-2765] config creation is fixed add bdfa4af4b [OPENMEETINGS-2757] bytebuddy add 1681800c2 [OPENMEETINGS-2757] maven plugins add a304dc0d5 [OPENMEETINGS-2757] font-awesome, maven plugins add b184fdd7f [OPENMEETINGS-2757] bytebuddy; maven-site-plugin downgraded add 00dedcdb9 no jira: NotInited page behavior is fixed add 1d1db94a4 [OPENMEETINGS-2757] maven-site-plugin, ical4j, ldap-api-all add ecf5d1ef4 [OPENMEETINGS-2757] maven-site-plugin downgraded add 3321de5af no jira: compiler option to display deprecations add 45f10819c no jira: turning OFF dependabot PRs add d702d15ae [OPENMEETINGS-2757] spring add e9409e37b [OPENMEETINGS-2757] maven-info-reports, tomcat add 96fd223d8 [OPENMEETINGS-2757] wicket, wicketstuff, the way tomcat is downloaded add fbc405b8e [OPENMEETINGS-2757] wicket-bootstrap, code clean-up add 02532c5cb [OPENMEETINGS-2757] maven-checkstyle, asterisk-java, mysql, logback; code clean-up add fe74b9773 [OPENMEETINGS-2767] WebRTCPeer was updated with latest changes from OpenVidu; instructions to enable service were added add dd245c51f [OPENMEETINGS-2767] code clean-up add ac38cb5cc [OPENMEETINGS-2757] JS libraries are updated add 0915969d2 [OPENMEETINGS-2768] Save button is always visible for new events add 287146a6e [OPENMEETINGS-2769] 'ask permission' dialog should be fixed add 822319e9d [OPENMEETINGS-2757] junit add 900a3ed84 [OPENMEETINGS-2759] translations were imported add ef91f39a3 [OPENMEETINGS-2758] some Sonar code smells are addressed add 328c9b42d [OPENMEETINGS-2757] checkstyle add 120c49ba9 [OPENMEETINGS-2758] some Sonar issues are addressed add 4313f519b [OPENMEETINGS-2758] build should be fixed add 33cee768e [OPENMEETINGS-2758] some Sonar issues are addressed add 726e9d321 7.1.0 Release Candidate 1 add 3db34bf3b Switching to the next dev version add 377d78681 [OPENMEETINGS-2770] maven-surefire add 45995b7c4 no jira: typo is fixed add 1d58ad44c [OPENMEETINGS-2770] tomcat add e014c78d2 [OPENMEETINGS-2770] jacoco add 4de8f7c0a [OPENMEETINGS-2773] login/email should be case insensitive add 5d9e8fb5f [OPENMEETINGS-2770] maven-assembly-plugin, tika add 15d6e2947 [OPENMEETINGS-2774] initial commit to fix styles in the emails add f2497f3a1 [OPENMEETINGS-2770] commons-io, swagger, plugins add 282893bed fixed #188 add 186ba54f6 updated #188 - removed external resources and comments, added new line at end of files, style still in inline CSS add affd8589f update - removed inline styles and updated email templates - #188 add b73f721c2 update #188 - fixed the style and moved repeated div to parent template (AbstractTemplatePage) add f7c829e5c minor update #188 - .vscode/settings.json, style sass attibutes removed add a2e5b6372 fixes #188 - removed head tags fixed the style add 77df42f4f fixes apache#188 - removed head tags fixed the style add 8f1173cf0 [OPENMEETINGS-2770] wicket, wicketstuff, wicket-bootstrap, asterisk, ojdbc, swagger, bytebuddy, maven plugins add a751a82d9 [OPENMEETINGS-2770] tomcat, cxf, commons-io add e5b21fd17 [OPENMEETINGS-2770] apache-parent, logback, swagger; code clean-up add 97fa53e0c [OPENMEETINGS-2770] spring, ical4j, h2, commons-codec, swagger add 67a48db55 [OPENMEETINGS-2775] source artifact is buildable again add 587126f3a [OPENMEETINGS-2770] junit, spring, tomcat, ical4j, mysql and plugins add 103072649 no jira: code clean-up add 93c47f5c5 [OPENMEETINGS-2770] commons-lang, mssql driver, logback add 357ad9c05 [OPENMEETINGS-2770] font-awesome, tomcat, ojdbc, logback, bytebuddy add 1cb368917 [OPENMEETINGS-2232] JS code is better aligned and browserable add f821b8bb9 [OPENMEETINGS-2232] RTL related clean-up add 48f172bb3 [OPENMEETINGS-2770] m-site, reflow-skin, aspectjtools add 482412d9b [OPENMEETINGS-2232] background position is fixed add 6440427dc [OPENMEETINGS-2776] profile image will be shrinked if larger than 250x250px add 09dcd5be5 [OPENMEETINGS-2232] CSS is being built by sass add 4424fc4a5 [OPENMEETINGS-2232] CSS is converted to SASS add a6fb4e3bf [OPENMEETINGS-2232] CSS issue is fixed add 20519e6f2 [OPENMEETINGS-2777] message folders should be user-private add e201ff9ba [OPENMEETINGS-2770] tomcat add 53f2d769a [OPENMEETINGS-2770] jetty; code clean-up add c3d28c78b [OPENMEETINGS-2770] wicket, wicketstuff, spring, cxf, aspectjtools, h2, mssql-driver, ldap-api-all, tika, slf4j, swagger, bytebuddy and maven plugins new 8ad375614 no jira: project is partially converted to use java11 modules new 0ab39529e Simple-xml is dropped new f9278477e OpenJpa modules were changed new ddffa6d46 some compilation errors are resolved new 36b5a7c0f Another attempt to fix the build new e2ea4752f Some more work on modules new c7cc0e2e3 The build is green new d2566a889 Code clean-up new 1da606c92 Build fixed new 178a64fd7 More work on JPMS new 2c47b78db no jira: unmerged file is fixed This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (470272eb6) \ N -- N -- N refs/heads/java11-modules (2c47b78db) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .asf.yaml | 17 + CHANGELOG.md | 73 +- README.md | 46 +- openmeetings-core/pom.xml | 23 +- .../openmeetings/core/converter/BaseConverter.java | 13 +- .../core/converter/ImageConverter.java | 29 +- .../openmeetings/core/data/file/FileProcessor.java | 3 +- .../openmeetings/core/ldap/LdapLoginManager.java | 2 +- openmeetings-db/pom.xml | 23 +- .../db/dao/calendar/AppointmentDao.java | 11 +- .../db/dao/calendar/MeetingMemberDao.java | 7 +- .../db/dao/calendar/OmCalendarDao.java | 6 +- .../openmeetings/db/dao/file/FileItemDao.java | 6 +- .../apache/openmeetings/db/dao/label/LabelDao.java | 5 +- .../db/dao/record/RecordingChunkDao.java | 7 +- .../openmeetings/db/dao/room/InvitationDao.java | 16 +- .../apache/openmeetings/db/dao/room/PollDao.java | 6 +- .../openmeetings/db/dao/server/LdapConfigDao.java | 6 +- .../openmeetings/db/dao/server/OAuth2Dao.java | 15 +- .../openmeetings/db/dao/server/SOAPLoginDao.java | 14 +- .../apache/openmeetings/db/dao/user/GroupDao.java | 6 +- .../db/dao/user/PrivateMessageDao.java | 6 +- .../db/dao/user/PrivateMessageFolderDao.java | 15 +- .../openmeetings/db/dao/user/UserContactDao.java | 12 +- .../apache/openmeetings/db/dao/user/UserDao.java | 39 +- .../apache/openmeetings/db/dto/basic/Health.java | 11 +- .../openmeetings/db/entity/basic/Client.java | 10 +- .../db/entity/basic/Configuration.java | 1 + .../db/entity/server/RemoteSessionObject.java | 15 +- .../db/entity/user/PrivateMessageFolder.java | 4 + .../apache/openmeetings/db/entity/user/User.java | 74 +- .../org/apache/openmeetings/db/util/DaoHelper.java | 12 +- openmeetings-install/pom.xml | 2 +- .../apache/openmeetings/backup/BackupImport.java | 5 + .../java/org/apache/openmeetings/cli/Admin.java | 1 - .../installation/ImportInitvalues.java | 8 +- openmeetings-mediaserver/pom.xml | 31 +- .../apache/openmeetings/mediaserver/KStream.java | 6 +- openmeetings-screenshare/pom.xml | 2 +- openmeetings-server/pom.xml | 106 ++- .../src/main/assembly/components/all.xml | 2 + .../src/main/assembly/scripts/openmeetings.service | 1 + openmeetings-server/src/main/assembly/src.xml | 3 + .../blog/apache_openmeetings_2_0_incubating.md | 96 +++ .../markdown/blog/apache_openmeetings_2_1_11.md | 99 +++ .../markdown/blog/apache_openmeetings_2_1_12.md | 55 ++ .../markdown/blog/apache_openmeetings_2_2_0.md | 26 + .../markdown/blog/apache_openmeetings_3_0_3.md | 34 + .../blog/apache_openmeetings_inside_teambox.md | 15 + .../blog/apache_openmeetings_moodle_plugin_1.md | 28 + .../blog/demo_video_about_upcoming_atlassian.md | 18 + .../markdown/blog/google_summer_of_code_2012.md | 58 ++ .../jira_integration_apache_openmeetings_demo.md | 23 + .../markdown/blog/openmeetings-3-2-1-available.md | 29 + .../markdown/blog/openmeetings-3-3-0-released.md | 34 + .../markdown/blog/openmeetings-5-0-0-release.md | 40 ++ .../markdown/blog/openmeetings-v6-0-0-security.md | 52 ++ .../markdown/blog/openmeetings-v6-1-0-webrtc.md | 32 + .../markdown/blog/openmeetings-v6-2-0-openapi.md | 58 ++ .../markdown/blog/openmeetings-v6-3-0-fixes.md | 32 + .../markdown/blog/openmeetings_3_1_1_released.md | 26 + .../markdown/blog/openmeetings_3_1_2_released.md | 39 + .../markdown/blog/openmeetings_3_1_3_released.md | 28 + .../openmeetings_apachecon_presentation_slide.md | 46 ++ .../markdown/blog/openmeetings_on_the_road_to.md | 29 + .../src/site/xdoc/BuildInstructions.xml | 8 +- .../src/site/xdoc/CalDAVandGCal.xml | 2 +- .../src/site/xdoc/ConfluencePlugin.xml | 2 +- openmeetings-server/src/site/xdoc/DrupalPlugin.xml | 4 +- openmeetings-server/src/site/xdoc/IBMDB2Config.xml | 6 +- openmeetings-server/src/site/xdoc/JiraPlugin.xml | 2 +- openmeetings-server/src/site/xdoc/JoomlaPlugin.xml | 4 +- openmeetings-server/src/site/xdoc/MoodlePlugin.xml | 2 +- openmeetings-server/src/site/xdoc/NewsArchive.xml | 92 ++- openmeetings-server/src/site/xdoc/ReleaseGuide.xml | 7 +- .../src/site/xdoc/SugarCRMPlugin.xml | 9 +- openmeetings-server/src/site/xdoc/demo.xml | 8 - openmeetings-server/src/site/xdoc/downloads.xml | 30 +- openmeetings-server/src/site/xdoc/index.xml | 33 +- openmeetings-server/src/site/xdoc/installation.xml | 6 +- openmeetings-server/src/site/xdoc/security.xml | 132 ++-- openmeetings-service/pom.xml | 2 +- .../service/calendar/caldav/IcalUtils.java | 1 - .../calendar/caldav/handler/WebDAVSyncHandler.java | 6 +- .../mail/template/AbstractTemplatePage.html | 118 +++ ...emplatePanel.java => AbstractTemplatePage.java} | 31 +- .../mail/template/AbstractTemplatePanel.html | 27 - .../service/mail/template/FeedbackTemplate.html | 22 +- .../service/mail/template/FeedbackTemplate.java | 5 +- .../service/mail/template/InvitationTemplate.html | 29 +- .../service/mail/template/InvitationTemplate.java | 5 +- .../mail/template/RegisterUserTemplate.html | 28 +- .../mail/template/RegisterUserTemplate.java | 5 +- .../template/RequestContactConfirmTemplate.html | 12 +- .../template/RequestContactConfirmTemplate.java | 5 +- .../mail/template/RequestContactTemplate.html | 20 +- .../mail/template/RequestContactTemplate.java | 5 +- .../mail/template/ResetPasswordTemplate.html | 26 +- .../mail/template/ResetPasswordTemplate.java | 5 +- .../template/subject/SubjectEmailTemplate.java | 6 +- .../service/room/InvitationManager.java | 2 +- .../openmeetings/service/scheduler/CleanupJob.java | 16 +- .../service/scheduler/ReminderJob.java | 2 +- openmeetings-util/pom.xml | 2 +- .../apache/openmeetings/util/CalendarHelper.java | 2 +- .../org/apache/openmeetings/util/OmFileHelper.java | 2 +- .../apache/openmeetings/util/mail/IcalHandler.java | 2 +- .../openmeetings/util/site/BlogIndexGenerator.java | 118 +++ openmeetings-web/pom.xml | 115 +-- openmeetings-web/src/main/front/chat/package.json | 18 - openmeetings-web/src/main/front/main/package.json | 21 - openmeetings-web/src/main/front/package.json | 34 + openmeetings-web/src/main/front/room/package.json | 21 - .../src/main/front/settings/package.json | 22 - .../src/main/front/{chat/src => src/chat}/chat.js | 60 +- .../front/{chat/src => src/chat}/cssemoticons.js | 0 .../src/main/front/{chat/src => src/chat}/index.js | 0 .../src/main/front/src/css/_activities.scss | 36 + .../raw-admin.css => front/src/css/_admin.scss} | 80 +-- .../src/css/_calendar.scss} | 28 +- openmeetings-web/src/main/front/src/css/_chat.scss | 222 ++++++ .../src/main/front/src/css/_cssemoticons.scss | 132 ++++ .../src/main/front/src/css/_general.scss | 677 +++++++++++++++++ .../src/main/front/src/css/_install.scss | 44 ++ .../src/main/front/src/css/_interview.scss | 106 +++ openmeetings-web/src/main/front/src/css/_menu.scss | 62 ++ .../src/main/front/src/css/_nettest.scss | 76 ++ .../src/main/front/src/css/_polls.scss | 48 ++ .../src/css/_responsive.scss} | 34 +- openmeetings-web/src/main/front/src/css/_room.scss | 690 ++++++++++++++++++ .../src/main/front/src/css/_signin.scss | 32 + openmeetings-web/src/main/front/src/css/_tree.scss | 246 +++++++ .../src/css/_variables.scss} | 14 + openmeetings-web/src/main/front/src/css/_wb.scss | 387 ++++++++++ openmeetings-web/src/main/front/src/css/style.scss | 17 + .../src/main/front/{chat => }/src/index.js | 7 +- .../src/main/front/{main/src => src/main}/index.js | 15 +- .../main/front/{main/src => src/main}/omutils.js | 51 +- .../main/front/{main/src => src/main}/settings.js | 2 +- .../front/{room/src => src/room}/activities.js | 3 + .../src/main/front/{room/src => src/room}/index.js | 0 .../front/{room/src => src/room}/quick-poll.js | 2 + .../src/main/front/{room/src => src/room}/room.js | 8 +- .../main/front/{room/src => src/room}/sharer.js | 5 +- .../front/{room/src => src/room}/sip-dialer.js | 0 .../front/{room/src => src/room}/user-list-util.js | 0 .../main/front/{room/src => src/room}/user-list.js | 6 + .../front/{room/src => src/room}/user-settings.js | 3 + .../{room/src => src/room}/video-manager-util.js | 4 + .../front/{room/src => src/room}/video-manager.js | 12 +- .../src/main/front/{room/src => src/room}/video.js | 20 +- .../main/front/{room/src => src/room}/volume.js | 2 + .../{settings/src => src/settings}/WebRtcPeer.js | 26 +- .../front/{settings/src => src/settings}/index.js | 9 +- .../{settings/src => src/settings}/mic-level.js | 1 + .../{settings/src => src/settings}/ring-buffer.js | 0 .../{settings/src => src/settings}/settings.js | 10 +- .../{settings/src => src/settings}/video-util.js | 93 ++- .../src/main/front/{wb/src => src/wb}/index.js | 0 .../front/{wb/src => src/wb}/interview-area.js | 1 + .../main/front/{wb/src => src/wb}/wb-area-base.js | 0 .../src/main/front/{wb/src => src/wb}/wb-area.js | 1 + .../src/main/front/{wb/src => src/wb}/wb-player.js | 3 + .../src/main/front/{wb/src => src/wb}/wb-role.js | 0 .../front/{wb/src => src/wb}/wb-tool-apointer.js | 0 .../main/front/{wb/src => src/wb}/wb-tool-arrow.js | 0 .../main/front/{wb/src => src/wb}/wb-tool-base.js | 0 .../front/{wb/src => src/wb}/wb-tool-clipart.js | 0 .../front/{wb/src => src/wb}/wb-tool-ellipse.js | 0 .../main/front/{wb/src => src/wb}/wb-tool-line.js | 0 .../main/front/{wb/src => src/wb}/wb-tool-math.js | 0 .../main/front/{wb/src => src/wb}/wb-tool-paint.js | 2 + .../front/{wb/src => src/wb}/wb-tool-pointer.js | 0 .../main/front/{wb/src => src/wb}/wb-tool-rect.js | 0 .../front/{wb/src => src/wb}/wb-tool-shape-base.js | 0 .../main/front/{wb/src => src/wb}/wb-tool-shape.js | 2 + .../front/{wb/src => src/wb}/wb-tool-stat-math.js | 0 .../main/front/{wb/src => src/wb}/wb-tool-text.js | 2 + .../front/{wb/src => src/wb}/wb-tool-textbox.js | 0 .../main/front/{wb/src => src/wb}/wb-tool-uline.js | 0 .../main/front/{wb/src => src/wb}/wb-tool-util.js | 0 .../front/{wb/src => src/wb}/wb-tool-whiteout.js | 0 .../src/main/front/{wb/src => src/wb}/wb-tools.js | 5 +- .../src/main/front/{wb/src => src/wb}/wb-utils.js | 0 .../src/main/front/{wb/src => src/wb}/wb-zoom.js | 1 + .../src/main/front/{wb/src => src/wb}/wb.js | 1 + openmeetings-web/src/main/front/wb/package.json | 23 - .../src/main/front/webpack-css.common.js | 33 + openmeetings-web/src/main/front/webpack-css.dev.js | 21 + .../src/main/front/webpack-css.prod.js | 20 + openmeetings-web/src/main/front/webpack.common.js | 42 ++ openmeetings-web/src/main/front/webpack.dev.js | 12 + openmeetings-web/src/main/front/webpack.prod.js | 11 + .../openmeetings/web/admin/AdminActionsPanel.html | 2 +- .../openmeetings/web/admin/backup/BackupPanel.java | 3 - .../backup/BackupUploadResourceReference.java | 3 - .../web/admin/configurations/ConfigForm.java | 64 +- .../web/admin/configurations/ConfigsPanel.html | 2 +- .../web/admin/connection/ConnectionsPanel.java | 6 - .../openmeetings/web/admin/email/EmailPanel.html | 4 +- .../openmeetings/web/admin/extra/ExtraPanel.html | 2 +- .../openmeetings/web/admin/groups/GroupForm.java | 7 +- .../openmeetings/web/admin/groups/GroupsPanel.html | 2 +- .../openmeetings/web/admin/labels/LangForm.java | 16 +- .../openmeetings/web/admin/labels/LangPanel.html | 4 +- .../openmeetings/web/admin/labels/LangPanel.java | 2 +- .../openmeetings/web/admin/ldaps/LdapsPanel.html | 2 +- .../openmeetings/web/admin/oauth/OAuthPanel.html | 4 +- .../openmeetings/web/admin/rooms/RoomForm.java | 16 +- .../openmeetings/web/admin/rooms/RoomsPanel.html | 18 +- .../openmeetings/web/admin/users/UserForm.html | 4 +- .../openmeetings/web/admin/users/UserForm.java | 16 +- .../apache/openmeetings/web/app/Application.java | 3 +- .../web/app/Application_ar.properties.xml | 20 +- .../web/app/Application_de.properties.xml | 29 +- .../apache/openmeetings/web/app/OtpManager.java | 3 +- .../apache/openmeetings/web/app/UserManager.java | 1 + .../apache/openmeetings/web/app/WebSession.java | 2 +- .../openmeetings/web/common/FormActionsPanel.html | 2 +- .../openmeetings/web/common/FormActionsPanel.java | 2 +- .../openmeetings/web/common/GeneralUserForm.java | 16 +- .../openmeetings/web/common/HeaderPanel.html | 1 + .../openmeetings/web/common/LanguageDropDown.java | 16 +- .../apache/openmeetings/web/common/MainPanel.html | 12 +- .../apache/openmeetings/web/common/MainPanel.java | 9 +- .../web/common/OmAjaxClientInfoBehavior.java | 18 +- .../web/common/UploadableImagePanel.html | 2 +- .../web/common/UploadableImagePanel.java | 35 +- .../web/common/UploadableProfileImagePanel.java | 7 +- .../web/common/tree/FileTreePanel.html | 8 +- .../openmeetings/web/common/tree/FolderPanel.java | 2 +- .../openmeetings/web/common/upload/UploadForm.java | 2 +- .../apache/openmeetings/web/pages/BasePage.html | 56 +- .../apache/openmeetings/web/pages/BasePage.java | 13 +- .../apache/openmeetings/web/pages/HashPage.java | 44 +- .../openmeetings/web/pages/auth/SignInPage.java | 4 +- .../web/pages/install/InstallWizard$DbStep.html | 4 +- .../pages/install/InstallWizard$ParamsStep1.html | 4 +- .../pages/install/InstallWizard$ParamsStep2.html | 2 +- .../pages/install/InstallWizard$ParamsStep3.html | 2 +- .../pages/install/InstallWizard$ParamsStep4.html | 4 +- .../web/pages/install/InstallWizard.java | 30 +- .../apache/openmeetings/web/room/RoomPanel.html | 14 +- .../apache/openmeetings/web/room/RoomPanel.java | 11 +- .../openmeetings/web/room/VideoSettings.java | 17 +- .../web/room/activities/ActivitiesPanel.html | 10 +- .../openmeetings/web/room/menu/RoomMenuPanel.html | 18 +- .../web/room/poll/CreatePollDialog.java | 16 +- .../apache/openmeetings/web/room/raw-nettest.js | 34 +- .../openmeetings/web/room/sidebar/RoomSidebar.html | 36 +- .../openmeetings/web/room/sidebar/RoomSidebar.java | 3 - .../apache/openmeetings/web/room/wb/WbPanel.html | 14 +- .../apache/openmeetings/web/room/wb/WbPanel.java | 3 - .../openmeetings/web/user/MessageDialog.java | 3 - .../web/user/calendar/AppointmentDialog.java | 38 +- .../web/user/calendar/CalendarDialog.java | 3 - .../web/user/calendar/CalendarPanel.html | 2 +- .../web/user/calendar/CalendarPanel.java | 3 - .../apache/openmeetings/web/user/chat/Chat.html | 8 +- .../apache/openmeetings/web/user/chat/Chat.java | 6 +- .../web/user/dashboard/StartWidgetView.html | 42 +- .../web/user/profile/EditProfileForm.html | 4 +- .../web/user/profile/InvitationsPanel.html | 2 +- .../web/user/profile/MessagesContactsPanel.html | 2 +- .../web/user/profile/MessagesContactsPanel.java | 46 +- .../web/user/profile/UserProfilePanel.html | 4 +- .../user/record/RecordingResourceReference.java | 3 - .../openmeetings/web/user/record/VideoInfo.java | 3 - .../openmeetings/web/user/rooms/RoomListPanel.html | 2 +- .../openmeetings/web/util/CountryDropDown.java | 26 +- .../openmeetings/web/util/RoomTypeDropDown.java | 27 +- .../util/upload/BootstrapFileUploadBehavior.java | 9 +- .../src/main/webapp/WEB-INF/classes/hazelcast.xml | 2 +- .../src/main/webapp/css/raw-activities.css | 33 - openmeetings-web/src/main/webapp/css/raw-chat.css | 206 ------ .../src/main/webapp/css/raw-cssemoticons.css | 120 ---- .../src/main/webapp/css/raw-general-rtl.css | 176 ----- .../src/main/webapp/css/raw-general.css | 754 ------------------- openmeetings-web/src/main/webapp/css/raw-menu.css | 67 -- .../src/main/webapp/css/raw-nettest.css | 73 -- openmeetings-web/src/main/webapp/css/raw-room.css | 797 --------------------- openmeetings-web/src/main/webapp/css/raw-tree.css | 228 ------ openmeetings-web/src/main/webapp/css/raw-wb.css | 374 ---------- .../TestAuth.java => db/dao/TestMessageDao.java} | 44 +- .../openmeetings/invitiation/TestInvitation.java | 59 +- .../apache/openmeetings/userdata/TestLogin.java | 27 + .../openmeetings/webservice/TestFileService.java | 5 +- openmeetings-webservice/pom.xml | 2 +- .../openmeetings/webservice/InfoWebService.java | 2 +- .../openmeetings/webservice/RoomWebService.java | 3 - pom.xml | 257 +++---- 291 files changed, 5835 insertions(+), 4462 deletions(-) create mode 100644 .asf.yaml create mode 100644 openmeetings-server/src/site/markdown/blog/apache_openmeetings_2_0_incubating.md create mode 100644 openmeetings-server/src/site/markdown/blog/apache_openmeetings_2_1_11.md create mode 100644 openmeetings-server/src/site/markdown/blog/apache_openmeetings_2_1_12.md create mode 100644 openmeetings-server/src/site/markdown/blog/apache_openmeetings_2_2_0.md create mode 100644 openmeetings-server/src/site/markdown/blog/apache_openmeetings_3_0_3.md create mode 100644 openmeetings-server/src/site/markdown/blog/apache_openmeetings_inside_teambox.md create mode 100644 openmeetings-server/src/site/markdown/blog/apache_openmeetings_moodle_plugin_1.md create mode 100644 openmeetings-server/src/site/markdown/blog/demo_video_about_upcoming_atlassian.md create mode 100644 openmeetings-server/src/site/markdown/blog/google_summer_of_code_2012.md create mode 100644 openmeetings-server/src/site/markdown/blog/jira_integration_apache_openmeetings_demo.md create mode 100644 openmeetings-server/src/site/markdown/blog/openmeetings-3-2-1-available.md create mode 100644 openmeetings-server/src/site/markdown/blog/openmeetings-3-3-0-released.md create mode 100644 openmeetings-server/src/site/markdown/blog/openmeetings-5-0-0-release.md create mode 100644 openmeetings-server/src/site/markdown/blog/openmeetings-v6-0-0-security.md create mode 100644 openmeetings-server/src/site/markdown/blog/openmeetings-v6-1-0-webrtc.md create mode 100644 openmeetings-server/src/site/markdown/blog/openmeetings-v6-2-0-openapi.md create mode 100644 openmeetings-server/src/site/markdown/blog/openmeetings-v6-3-0-fixes.md create mode 100644 openmeetings-server/src/site/markdown/blog/openmeetings_3_1_1_released.md create mode 100644 openmeetings-server/src/site/markdown/blog/openmeetings_3_1_2_released.md create mode 100644 openmeetings-server/src/site/markdown/blog/openmeetings_3_1_3_released.md create mode 100644 openmeetings-server/src/site/markdown/blog/openmeetings_apachecon_presentation_slide.md create mode 100644 openmeetings-server/src/site/markdown/blog/openmeetings_on_the_road_to.md create mode 100644 openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePage.html rename openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/{AbstractTemplatePanel.java => AbstractTemplatePage.java} (58%) delete mode 100644 openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.html create mode 100644 openmeetings-util/src/main/java/org/apache/openmeetings/util/site/BlogIndexGenerator.java delete mode 100644 openmeetings-web/src/main/front/chat/package.json delete mode 100644 openmeetings-web/src/main/front/main/package.json create mode 100644 openmeetings-web/src/main/front/package.json delete mode 100644 openmeetings-web/src/main/front/room/package.json delete mode 100644 openmeetings-web/src/main/front/settings/package.json rename openmeetings-web/src/main/front/{chat/src => src/chat}/chat.js (89%) rename openmeetings-web/src/main/front/{chat/src => src/chat}/cssemoticons.js (100%) copy openmeetings-web/src/main/front/{chat/src => src/chat}/index.js (100%) create mode 100644 openmeetings-web/src/main/front/src/css/_activities.scss rename openmeetings-web/src/main/{webapp/css/raw-admin.css => front/src/css/_admin.scss} (56%) rename openmeetings-web/src/main/{webapp/css/raw-calendar.css => front/src/css/_calendar.scss} (71%) create mode 100644 openmeetings-web/src/main/front/src/css/_chat.scss create mode 100644 openmeetings-web/src/main/front/src/css/_cssemoticons.scss create mode 100644 openmeetings-web/src/main/front/src/css/_general.scss create mode 100644 openmeetings-web/src/main/front/src/css/_install.scss create mode 100644 openmeetings-web/src/main/front/src/css/_interview.scss create mode 100644 openmeetings-web/src/main/front/src/css/_menu.scss create mode 100644 openmeetings-web/src/main/front/src/css/_nettest.scss create mode 100644 openmeetings-web/src/main/front/src/css/_polls.scss rename openmeetings-web/src/main/{webapp/css/raw-responsive.css => front/src/css/_responsive.scss} (81%) create mode 100644 openmeetings-web/src/main/front/src/css/_room.scss create mode 100644 openmeetings-web/src/main/front/src/css/_signin.scss create mode 100644 openmeetings-web/src/main/front/src/css/_tree.scss rename openmeetings-web/src/main/{webapp/css/raw-variables.css => front/src/css/_variables.scss} (85%) create mode 100644 openmeetings-web/src/main/front/src/css/_wb.scss create mode 100644 openmeetings-web/src/main/front/src/css/style.scss rename openmeetings-web/src/main/front/{chat => }/src/index.js (62%) rename openmeetings-web/src/main/front/{main/src => src/main}/index.js (89%) rename openmeetings-web/src/main/front/{main/src => src/main}/omutils.js (64%) rename openmeetings-web/src/main/front/{main/src => src/main}/settings.js (85%) rename openmeetings-web/src/main/front/{room/src => src/room}/activities.js (98%) rename openmeetings-web/src/main/front/{room/src => src/room}/index.js (100%) rename openmeetings-web/src/main/front/{room/src => src/room}/quick-poll.js (95%) rename openmeetings-web/src/main/front/{room/src => src/room}/room.js (95%) rename openmeetings-web/src/main/front/{room/src => src/room}/sharer.js (95%) rename openmeetings-web/src/main/front/{room/src => src/room}/sip-dialer.js (100%) rename openmeetings-web/src/main/front/{room/src => src/room}/user-list-util.js (100%) rename openmeetings-web/src/main/front/{room/src => src/room}/user-list.js (96%) rename openmeetings-web/src/main/front/{room/src => src/room}/user-settings.js (93%) rename openmeetings-web/src/main/front/{room/src => src/room}/video-manager-util.js (92%) rename openmeetings-web/src/main/front/{room/src => src/room}/video-manager.js (93%) rename openmeetings-web/src/main/front/{room/src => src/room}/video.js (96%) rename openmeetings-web/src/main/front/{room/src => src/room}/volume.js (98%) rename openmeetings-web/src/main/front/{settings/src => src/settings}/WebRtcPeer.js (97%) rename openmeetings-web/src/main/front/{settings/src => src/settings}/index.js (60%) rename openmeetings-web/src/main/front/{settings/src => src/settings}/mic-level.js (98%) rename openmeetings-web/src/main/front/{settings/src => src/settings}/ring-buffer.js (100%) rename openmeetings-web/src/main/front/{settings/src => src/settings}/settings.js (97%) rename openmeetings-web/src/main/front/{settings/src => src/settings}/video-util.js (81%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/index.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/interview-area.js (98%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-area-base.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-area.js (99%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-player.js (98%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-role.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-apointer.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-arrow.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-base.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-clipart.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-ellipse.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-line.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-math.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-paint.js (93%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-pointer.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-rect.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-shape-base.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-shape.js (96%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-stat-math.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-text.js (98%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-textbox.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-uline.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-util.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tool-whiteout.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-tools.js (99%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-utils.js (100%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb-zoom.js (99%) rename openmeetings-web/src/main/front/{wb/src => src/wb}/wb.js (99%) delete mode 100644 openmeetings-web/src/main/front/wb/package.json create mode 100644 openmeetings-web/src/main/front/webpack-css.common.js create mode 100644 openmeetings-web/src/main/front/webpack-css.dev.js create mode 100644 openmeetings-web/src/main/front/webpack-css.prod.js create mode 100644 openmeetings-web/src/main/front/webpack.common.js create mode 100644 openmeetings-web/src/main/front/webpack.dev.js create mode 100644 openmeetings-web/src/main/front/webpack.prod.js delete mode 100644 openmeetings-web/src/main/webapp/css/raw-activities.css delete mode 100644 openmeetings-web/src/main/webapp/css/raw-chat.css delete mode 100644 openmeetings-web/src/main/webapp/css/raw-cssemoticons.css delete mode 100644 openmeetings-web/src/main/webapp/css/raw-general-rtl.css delete mode 100644 openmeetings-web/src/main/webapp/css/raw-general.css delete mode 100644 openmeetings-web/src/main/webapp/css/raw-menu.css delete mode 100644 openmeetings-web/src/main/webapp/css/raw-nettest.css delete mode 100644 openmeetings-web/src/main/webapp/css/raw-room.css delete mode 100644 openmeetings-web/src/main/webapp/css/raw-tree.css delete mode 100644 openmeetings-web/src/main/webapp/css/raw-wb.css copy openmeetings-web/src/test/java/org/apache/openmeetings/{userdata/TestAuth.java => db/dao/TestMessageDao.java} (53%)