From 8d4d45ff49aba651abb1e50942c3045683a0a8c1 Mon Sep 17 00:00:00 2001 From: "michael.bradford@liferay.com" Date: Wed, 18 Mar 2015 14:00:13 -0700 Subject: [PATCH 01/41] LPS-54480 - Migrate all JavaScript from portal-web to the new frontend-js-web module --- .../src/META-INF/resources}/html/js/barebone.jsp | 0 .../resources}/html/js/editor/alloyeditor.jsp | 0 .../buttons/button_image_selector.js | 0 .../META-INF/resources}/html/js/editor/bbcode.jsp | 0 .../META-INF/resources}/html/js/editor/ckeditor.jsp | 0 .../resources}/html/js/editor/ckeditor_bbcode.jsp | 0 .../resources}/html/js/editor/ckeditor_creole.jsp | 0 .../html/js/editor/ckeditor_diffs/ckconfig-ext.jsp | 0 .../html/js/editor/ckeditor_diffs/ckconfig.jsp | 0 .../editor/ckeditor_diffs/ckconfig_bbcode-ext.jsp | 0 .../js/editor/ckeditor_diffs/ckconfig_bbcode.jsp | 0 .../editor/ckeditor_diffs/ckconfig_creole-ext.jsp | 0 .../js/editor/ckeditor_diffs/ckconfig_creole.jsp | 0 .../html/js/editor/ckeditor_diffs/main.js | 0 .../ckeditor_diffs/plugins/a11yhelpbtn/plugin.js | 0 .../ckeditor_diffs/plugins/ajaxsave/assets/save.png | Bin .../ckeditor_diffs/plugins/ajaxsave/plugin.js | 0 .../plugins/autocomplete/autocomplete.js | 0 .../ckeditor_diffs/plugins/autocomplete/plugin.js | 0 .../plugins/bbcode/bbcode_data_processor.js | 0 .../ckeditor_diffs/plugins/bbcode/bbcode_parser.js | 0 .../ckeditor_diffs/plugins/bbcode/bbcode_utils.js | 0 .../ckeditor_diffs/plugins/bbcode/converter.js | 0 .../editor/ckeditor_diffs/plugins/bbcode/lexer.js | 0 .../editor/ckeditor_diffs/plugins/bbcode/parser.js | 0 .../editor/ckeditor_diffs/plugins/bbcode/plugin.js | 0 .../plugins/creole/creole_data_processor.js | 0 .../ckeditor_diffs/plugins/creole/creole_parser.js | 0 .../editor/ckeditor_diffs/plugins/creole/plugin.js | 0 .../ckeditor_diffs/plugins/lfrpopup/plugin.js | 0 .../ckeditor_diffs/plugins/media/dialogs/audio.js | 0 .../ckeditor_diffs/plugins/media/dialogs/video.js | 0 .../plugins/media/icons/icon_audio.png | Bin .../plugins/media/icons/icon_video.png | Bin .../plugins/media/icons/placeholder_audio.png | Bin .../plugins/media/icons/placeholder_video.png | Bin .../editor/ckeditor_diffs/plugins/media/plugin.js | 0 .../plugins/restore/assets/restore.png | Bin .../editor/ckeditor_diffs/plugins/restore/plugin.js | 0 .../ckeditor_diffs/plugins/wikilink/dialogs/link.js | 0 .../ckeditor_diffs/plugins/wikilink/plugin.js | 0 .../resources}/html/js/editor/ckeditor_init.jsp | 0 .../META-INF/resources}/html/js/editor/simple.jsp | 0 .../html/js/editor/tiny_mce_diffs/langs/ar.js | 0 .../html/js/editor/tiny_mce_diffs/langs/bg_BG.js | 0 .../html/js/editor/tiny_mce_diffs/langs/ca.js | 0 .../html/js/editor/tiny_mce_diffs/langs/cs.js | 0 .../html/js/editor/tiny_mce_diffs/langs/de.js | 0 .../html/js/editor/tiny_mce_diffs/langs/el.js | 0 .../html/js/editor/tiny_mce_diffs/langs/en_CA.js | 0 .../html/js/editor/tiny_mce_diffs/langs/en_GB.js | 0 .../html/js/editor/tiny_mce_diffs/langs/es.js | 0 .../html/js/editor/tiny_mce_diffs/langs/et.js | 0 .../html/js/editor/tiny_mce_diffs/langs/eu.js | 0 .../html/js/editor/tiny_mce_diffs/langs/fa.js | 0 .../html/js/editor/tiny_mce_diffs/langs/fi.js | 0 .../html/js/editor/tiny_mce_diffs/langs/fr_FR.js | 0 .../html/js/editor/tiny_mce_diffs/langs/gl.js | 0 .../html/js/editor/tiny_mce_diffs/langs/he_IL.js | 0 .../html/js/editor/tiny_mce_diffs/langs/hr.js | 0 .../html/js/editor/tiny_mce_diffs/langs/hu_HU.js | 0 .../html/js/editor/tiny_mce_diffs/langs/id.js | 0 .../html/js/editor/tiny_mce_diffs/langs/it.js | 0 .../html/js/editor/tiny_mce_diffs/langs/ja.js | 0 .../html/js/editor/tiny_mce_diffs/langs/ko_KR.js | 0 .../html/js/editor/tiny_mce_diffs/langs/lt.js | 0 .../html/js/editor/tiny_mce_diffs/langs/nb_NO.js | 0 .../html/js/editor/tiny_mce_diffs/langs/nl.js | 0 .../html/js/editor/tiny_mce_diffs/langs/pl.js | 0 .../html/js/editor/tiny_mce_diffs/langs/pt_BR.js | 0 .../html/js/editor/tiny_mce_diffs/langs/pt_PT.js | 0 .../html/js/editor/tiny_mce_diffs/langs/ro.js | 0 .../html/js/editor/tiny_mce_diffs/langs/ru.js | 0 .../html/js/editor/tiny_mce_diffs/langs/sk.js | 0 .../html/js/editor/tiny_mce_diffs/langs/sl_SI.js | 0 .../html/js/editor/tiny_mce_diffs/langs/sr.js | 0 .../html/js/editor/tiny_mce_diffs/langs/sv_SE.js | 0 .../html/js/editor/tiny_mce_diffs/langs/tr_TR.js | 0 .../html/js/editor/tiny_mce_diffs/langs/uk.js | 0 .../html/js/editor/tiny_mce_diffs/langs/vi.js | 0 .../html/js/editor/tiny_mce_diffs/langs/zh_CN.js | 0 .../html/js/editor/tiny_mce_diffs/langs/zh_TW.js | 0 .../META-INF/resources}/html/js/editor/tinymce.jsp | 0 .../resources}/html/js/editor/tinymce_simple.jsp | 0 .../resources}/html/js/editor/tinymcesimple.jsp | 0 .../src/META-INF/resources}/html/js/everything.jsp | 0 .../src/META-INF/resources}/html/js/jquery/fm.js | 0 .../src/META-INF/resources}/html/js/jquery/form.js | 0 .../META-INF/resources}/html/js/jquery/jquery.js | 0 .../META-INF/resources}/html/js/liferay/address.js | 0 .../resources}/html/js/liferay/alloyeditor.js | 0 .../html/js/liferay/alloyeditor_source.js | 0 .../resources}/html/js/liferay/app_view_move.js | 0 .../html/js/liferay/app_view_move_touch.js | 0 .../resources}/html/js/liferay/app_view_select.js | 0 .../html/js/liferay/asset_categories_selector.js | 0 .../html/js/liferay/asset_tags_selector.js | 0 .../resources}/html/js/liferay/aui_sandbox.js | 0 .../resources}/html/js/liferay/auto_fields.js | 0 .../html/js/liferay/autocomplete_input.js | 0 .../js/liferay/autocomplete_input_caretindex.js | 0 .../js/liferay/autocomplete_input_caretindex_sel.js | 0 .../js/liferay/autocomplete_input_caretoffset.js | 0 .../liferay/autocomplete_input_caretoffset_sel.js | 0 .../html/js/liferay/autocomplete_textarea.js | 0 .../html/js/liferay/available_languages.jsp | 0 .../resources}/html/js/liferay/browser_selectors.js | 0 .../resources}/html/js/liferay/cover_cropper.js | 0 .../resources}/html/js/liferay/crop_region.js | 0 .../META-INF/resources}/html/js/liferay/ddm_form.js | 0 .../resources}/html/js/liferay/dependency.js | 0 .../resources}/html/js/liferay/deprecated.js | 0 .../html/js/liferay/diff_version_comparator.js | 0 .../META-INF/resources}/html/js/liferay/dockbar.js | 0 .../html/js/liferay/dockbar_add_application.js | 0 .../resources}/html/js/liferay/dockbar_add_base.js | 0 .../html/js/liferay/dockbar_add_content.js | 0 .../js/liferay/dockbar_add_content_drag_drop.js | 0 .../html/js/liferay/dockbar_add_content_preview.js | 0 .../html/js/liferay/dockbar_add_content_search.js | 0 .../resources}/html/js/liferay/dockbar_add_page.js | 0 .../html/js/liferay/dockbar_add_page_search.js | 0 .../js/liferay/dockbar_add_page_template_search.js | 0 .../html/js/liferay/dockbar_device_preview.js | 0 .../html/js/liferay/dockbar_keyboard_interaction.js | 0 .../html/js/liferay/dockbar_portlet_dd.js | 0 .../resources}/html/js/liferay/dockbar_underlay.js | 0 .../resources}/html/js/liferay/dynamic_select.js | 0 .../html/js/liferay/editor_image_uploader.js | 0 .../META-INF/resources}/html/js/liferay/events.js | 0 .../src/META-INF/resources}/html/js/liferay/form.js | 0 .../resources}/html/js/liferay/form_placeholders.js | 0 .../html/js/liferay/fullscreen_source_editor.js | 0 .../META-INF/resources}/html/js/liferay/history.js | 0 .../resources}/html/js/liferay/history_html5.js | 0 .../resources}/html/js/liferay/history_manager.js | 0 .../resources}/html/js/liferay/hudcrumbs.js | 0 .../src/META-INF/resources}/html/js/liferay/icon.js | 0 .../resources}/html/js/liferay/image_selector.js | 0 .../html/js/liferay/inline_editor_base.js | 0 .../resources}/html/js/liferay/input_localized.js | 0 .../resources}/html/js/liferay/input_move_boxes.js | 0 .../html/js/liferay/input_move_boxes_touch.js | 0 .../META-INF/resources}/html/js/liferay/language.js | 0 .../META-INF/resources}/html/js/liferay/layout.js | 0 .../resources}/html/js/liferay/layout_column.js | 0 .../js/liferay/layout_customization_settings.js | 0 .../resources}/html/js/liferay/layout_exporter.js | 0 .../resources}/html/js/liferay/layout_freeform.js | 0 .../resources}/html/js/liferay/layouts_tree.js | 0 .../layouts_tree_check_content_display_page.js | 0 .../html/js/liferay/layouts_tree_node_task.js | 0 .../html/js/liferay/layouts_tree_selectable.js | 0 .../html/js/liferay/layouts_tree_state.js | 0 .../META-INF/resources}/html/js/liferay/liferay.js | 0 .../resources}/html/js/liferay/list_view.js | 0 .../resources}/html/js/liferay/logo_editor.js | 0 .../resources}/html/js/liferay/logo_selector.js | 0 .../resources}/html/js/liferay/look_and_feel.js | 0 .../META-INF/resources}/html/js/liferay/map_base.js | 0 .../resources}/html/js/liferay/map_google.js | 0 .../resources}/html/js/liferay/map_openstreet.js | 0 .../src/META-INF/resources}/html/js/liferay/menu.js | 0 .../resources}/html/js/liferay/menu_filter.js | 0 .../resources}/html/js/liferay/menu_toggle.js | 0 .../META-INF/resources}/html/js/liferay/message.js | 0 .../META-INF/resources}/html/js/liferay/modules.js | 0 .../resources}/html/js/liferay/navigation.js | 0 .../html/js/liferay/navigation_interaction.js | 0 .../html/js/liferay/navigation_interaction_touch.js | 0 .../resources}/html/js/liferay/navigation_touch.js | 0 .../src/META-INF/resources}/html/js/liferay/node.js | 0 .../META-INF/resources}/html/js/liferay/notice.js | 0 .../resources}/html/js/liferay/pagination.js | 0 .../resources}/html/js/liferay/panel_search.js | 0 .../META-INF/resources}/html/js/liferay/poller.js | 0 .../META-INF/resources}/html/js/liferay/portal.js | 0 .../META-INF/resources}/html/js/liferay/portlet.js | 0 .../resources}/html/js/liferay/portlet_base.js | 0 .../resources}/html/js/liferay/portlet_sharing.js | 0 .../resources}/html/js/liferay/portlet_url.js | 0 .../META-INF/resources}/html/js/liferay/preview.js | 0 .../META-INF/resources}/html/js/liferay/progress.js | 0 .../META-INF/resources}/html/js/liferay/ratings.js | 0 .../resources}/html/js/liferay/resize_rtl.js | 0 .../resources}/html/js/liferay/restore_entry.js | 0 .../resources}/html/js/liferay/search_container.js | 0 .../resources}/html/js/liferay/search_filter.js | 0 .../html/js/liferay/service_datasource.js | 0 .../META-INF/resources}/html/js/liferay/session.js | 0 .../resources}/html/js/liferay/sign_in_modal.js | 0 .../resources}/html/js/liferay/social_bookmarks.js | 0 .../resources}/html/js/liferay/source_editor.js | 0 .../resources}/html/js/liferay/storage_formatter.js | 0 .../META-INF/resources}/html/js/liferay/store.js | 0 .../META-INF/resources}/html/js/liferay/surface.js | 0 .../resources}/html/js/liferay/surface_app.js | 0 .../html/js/liferay/toggler_interaction.js | 0 .../html/js/liferay/toggler_key_filter.js | 0 .../resources}/html/js/liferay/token_list.js | 0 .../html/js/liferay/translation_manager.js | 0 .../resources}/html/js/liferay/undo_manager.js | 0 .../META-INF/resources}/html/js/liferay/upload.js | 0 .../src/META-INF/resources}/html/js/liferay/util.js | 0 .../resources}/html/js/liferay/util_window.js | 0 .../META-INF/resources}/html/js/liferay/widget.js | 0 .../html/js/liferay/widget_size_animation_plugin.js | 0 .../resources}/html/js/liferay/widget_zindex.js | 0 .../META-INF/resources}/html/js/liferay/workflow.js | 0 .../resources}/html/js/liferay/xml_formatter.js | 0 .../META-INF/resources}/html/js/lodash/lodash.js | 0 .../src/META-INF/resources}/html/js/lodash/util.js | 0 .../META-INF/resources}/html/js/misc/swfobject.js | 0 .../resources}/html/js/misc/swfupload/swfupload.js | 0 .../html/js/misc/swfupload/swfupload_f10.swf | Bin .../html/js/misc/swfupload/swfupload_f8.swf | Bin .../html/js/misc/swfupload/swfupload_f9.swf | Bin .../html/js/misc/video_player/mpw_player.swf | Bin .../META-INF/resources}/html/js/misc/xp_progress.js | 0 219 files changed, 0 insertions(+), 0 deletions(-) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/barebone.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/alloyeditor.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/alloyeditor_diffs/buttons/button_image_selector.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/bbcode.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_bbcode.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_creole.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/ckconfig-ext.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/ckconfig.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/ckconfig_bbcode-ext.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/ckconfig_bbcode.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/ckconfig_creole-ext.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/ckconfig_creole.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/main.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/a11yhelpbtn/plugin.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/ajaxsave/assets/save.png (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/ajaxsave/plugin.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/autocomplete/autocomplete.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/autocomplete/plugin.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/bbcode/bbcode_data_processor.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/bbcode/bbcode_parser.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/bbcode/bbcode_utils.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/bbcode/converter.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/bbcode/lexer.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/bbcode/parser.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/bbcode/plugin.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/creole/creole_data_processor.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/creole/creole_parser.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/creole/plugin.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/lfrpopup/plugin.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/media/dialogs/audio.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/media/dialogs/video.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/media/icons/icon_audio.png (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/media/icons/icon_video.png (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/media/icons/placeholder_audio.png (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/media/icons/placeholder_video.png (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/media/plugin.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/restore/assets/restore.png (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/restore/plugin.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/wikilink/dialogs/link.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_diffs/plugins/wikilink/plugin.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/ckeditor_init.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/simple.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/ar.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/bg_BG.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/ca.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/cs.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/de.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/el.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/en_CA.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/en_GB.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/es.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/et.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/eu.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/fa.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/fi.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/fr_FR.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/gl.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/he_IL.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/hr.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/hu_HU.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/id.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/it.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/ja.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/ko_KR.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/lt.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/nb_NO.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/nl.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/pl.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/pt_BR.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/pt_PT.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/ro.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/ru.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/sk.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/sl_SI.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/sr.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/sv_SE.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/tr_TR.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/uk.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/vi.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/zh_CN.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tiny_mce_diffs/langs/zh_TW.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tinymce.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tinymce_simple.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/editor/tinymcesimple.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/everything.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/jquery/fm.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/jquery/form.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/jquery/jquery.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/address.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/alloyeditor.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/alloyeditor_source.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/app_view_move.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/app_view_move_touch.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/app_view_select.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/asset_categories_selector.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/asset_tags_selector.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/aui_sandbox.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/auto_fields.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/autocomplete_input.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/autocomplete_input_caretindex.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/autocomplete_input_caretindex_sel.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/autocomplete_input_caretoffset.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/autocomplete_input_caretoffset_sel.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/autocomplete_textarea.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/available_languages.jsp (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/browser_selectors.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/cover_cropper.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/crop_region.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/ddm_form.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/dependency.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/deprecated.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/diff_version_comparator.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/dockbar.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/dockbar_add_application.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/dockbar_add_base.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/dockbar_add_content.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/dockbar_add_content_drag_drop.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/dockbar_add_content_preview.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/dockbar_add_content_search.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/dockbar_add_page.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/dockbar_add_page_search.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/dockbar_add_page_template_search.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/dockbar_device_preview.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/dockbar_keyboard_interaction.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/dockbar_portlet_dd.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/dockbar_underlay.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/dynamic_select.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/editor_image_uploader.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/events.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/form.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/form_placeholders.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/fullscreen_source_editor.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/history.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/history_html5.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/history_manager.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/hudcrumbs.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/icon.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/image_selector.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/inline_editor_base.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/input_localized.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/input_move_boxes.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/input_move_boxes_touch.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/language.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/layout.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/layout_column.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/layout_customization_settings.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/layout_exporter.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/layout_freeform.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/layouts_tree.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/layouts_tree_check_content_display_page.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/layouts_tree_node_task.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/layouts_tree_selectable.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/layouts_tree_state.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/liferay.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/list_view.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/logo_editor.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/logo_selector.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/look_and_feel.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/map_base.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/map_google.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/map_openstreet.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/menu.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/menu_filter.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/menu_toggle.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/message.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/modules.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/navigation.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/navigation_interaction.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/navigation_interaction_touch.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/navigation_touch.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/node.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/notice.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/pagination.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/panel_search.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/poller.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/portal.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/portlet.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/portlet_base.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/portlet_sharing.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/portlet_url.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/preview.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/progress.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/ratings.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/resize_rtl.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/restore_entry.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/search_container.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/search_filter.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/service_datasource.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/session.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/sign_in_modal.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/social_bookmarks.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/source_editor.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/storage_formatter.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/store.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/surface.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/surface_app.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/toggler_interaction.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/toggler_key_filter.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/token_list.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/translation_manager.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/undo_manager.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/upload.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/util.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/util_window.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/widget.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/widget_size_animation_plugin.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/widget_zindex.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/workflow.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/liferay/xml_formatter.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/lodash/lodash.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/lodash/util.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/misc/swfobject.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/misc/swfupload/swfupload.js (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/misc/swfupload/swfupload_f10.swf (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/misc/swfupload/swfupload_f8.swf (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/misc/swfupload/swfupload_f9.swf (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/misc/video_player/mpw_player.swf (100%) rename {portal-web/docroot => modules/frontend/frontend-js-web/src/META-INF/resources}/html/js/misc/xp_progress.js (100%) diff --git a/portal-web/docroot/html/js/barebone.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/barebone.jsp similarity index 100% rename from portal-web/docroot/html/js/barebone.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/barebone.jsp diff --git a/portal-web/docroot/html/js/editor/alloyeditor.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/alloyeditor.jsp similarity index 100% rename from portal-web/docroot/html/js/editor/alloyeditor.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/alloyeditor.jsp diff --git a/portal-web/docroot/html/js/editor/alloyeditor_diffs/buttons/button_image_selector.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/alloyeditor_diffs/buttons/button_image_selector.js similarity index 100% rename from portal-web/docroot/html/js/editor/alloyeditor_diffs/buttons/button_image_selector.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/alloyeditor_diffs/buttons/button_image_selector.js diff --git a/portal-web/docroot/html/js/editor/bbcode.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/bbcode.jsp similarity index 100% rename from portal-web/docroot/html/js/editor/bbcode.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/bbcode.jsp diff --git a/portal-web/docroot/html/js/editor/ckeditor.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor.jsp similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor.jsp diff --git a/portal-web/docroot/html/js/editor/ckeditor_bbcode.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_bbcode.jsp similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_bbcode.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_bbcode.jsp diff --git a/portal-web/docroot/html/js/editor/ckeditor_creole.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_creole.jsp similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_creole.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_creole.jsp diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/ckconfig-ext.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/ckconfig-ext.jsp similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/ckconfig-ext.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/ckconfig-ext.jsp diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/ckconfig.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/ckconfig.jsp similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/ckconfig.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/ckconfig.jsp diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/ckconfig_bbcode-ext.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/ckconfig_bbcode-ext.jsp similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/ckconfig_bbcode-ext.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/ckconfig_bbcode-ext.jsp diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/ckconfig_bbcode.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/ckconfig_bbcode.jsp similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/ckconfig_bbcode.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/ckconfig_bbcode.jsp diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/ckconfig_creole-ext.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/ckconfig_creole-ext.jsp similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/ckconfig_creole-ext.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/ckconfig_creole-ext.jsp diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/ckconfig_creole.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/ckconfig_creole.jsp similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/ckconfig_creole.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/ckconfig_creole.jsp diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/main.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/main.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/main.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/main.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/a11yhelpbtn/plugin.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/a11yhelpbtn/plugin.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/a11yhelpbtn/plugin.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/a11yhelpbtn/plugin.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/ajaxsave/assets/save.png b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/ajaxsave/assets/save.png similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/ajaxsave/assets/save.png rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/ajaxsave/assets/save.png diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/ajaxsave/plugin.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/ajaxsave/plugin.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/ajaxsave/plugin.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/ajaxsave/plugin.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/autocomplete/autocomplete.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/autocomplete/autocomplete.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/autocomplete/autocomplete.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/autocomplete/autocomplete.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/autocomplete/plugin.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/autocomplete/plugin.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/autocomplete/plugin.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/autocomplete/plugin.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/bbcode/bbcode_data_processor.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/bbcode/bbcode_data_processor.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/bbcode/bbcode_data_processor.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/bbcode/bbcode_data_processor.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/bbcode/bbcode_parser.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/bbcode/bbcode_parser.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/bbcode/bbcode_parser.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/bbcode/bbcode_parser.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/bbcode/bbcode_utils.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/bbcode/bbcode_utils.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/bbcode/bbcode_utils.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/bbcode/bbcode_utils.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/bbcode/converter.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/bbcode/converter.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/bbcode/converter.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/bbcode/converter.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/bbcode/lexer.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/bbcode/lexer.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/bbcode/lexer.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/bbcode/lexer.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/bbcode/parser.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/bbcode/parser.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/bbcode/parser.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/bbcode/parser.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/bbcode/plugin.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/bbcode/plugin.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/bbcode/plugin.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/bbcode/plugin.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/creole/creole_data_processor.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/creole/creole_data_processor.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/creole/creole_data_processor.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/creole/creole_data_processor.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/creole/creole_parser.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/creole/creole_parser.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/creole/creole_parser.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/creole/creole_parser.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/creole/plugin.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/creole/plugin.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/creole/plugin.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/creole/plugin.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/lfrpopup/plugin.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/lfrpopup/plugin.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/lfrpopup/plugin.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/lfrpopup/plugin.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/media/dialogs/audio.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/media/dialogs/audio.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/media/dialogs/audio.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/media/dialogs/audio.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/media/dialogs/video.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/media/dialogs/video.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/media/dialogs/video.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/media/dialogs/video.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/media/icons/icon_audio.png b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/media/icons/icon_audio.png similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/media/icons/icon_audio.png rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/media/icons/icon_audio.png diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/media/icons/icon_video.png b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/media/icons/icon_video.png similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/media/icons/icon_video.png rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/media/icons/icon_video.png diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/media/icons/placeholder_audio.png b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/media/icons/placeholder_audio.png similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/media/icons/placeholder_audio.png rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/media/icons/placeholder_audio.png diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/media/icons/placeholder_video.png b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/media/icons/placeholder_video.png similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/media/icons/placeholder_video.png rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/media/icons/placeholder_video.png diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/media/plugin.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/media/plugin.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/media/plugin.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/media/plugin.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/restore/assets/restore.png b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/restore/assets/restore.png similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/restore/assets/restore.png rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/restore/assets/restore.png diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/restore/plugin.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/restore/plugin.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/restore/plugin.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/restore/plugin.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/wikilink/dialogs/link.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/wikilink/dialogs/link.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/wikilink/dialogs/link.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/wikilink/dialogs/link.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/wikilink/plugin.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/wikilink/plugin.js similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_diffs/plugins/wikilink/plugin.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_diffs/plugins/wikilink/plugin.js diff --git a/portal-web/docroot/html/js/editor/ckeditor_init.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_init.jsp similarity index 100% rename from portal-web/docroot/html/js/editor/ckeditor_init.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_init.jsp diff --git a/portal-web/docroot/html/js/editor/simple.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/simple.jsp similarity index 100% rename from portal-web/docroot/html/js/editor/simple.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/simple.jsp diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/ar.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/ar.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/ar.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/ar.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/bg_BG.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/bg_BG.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/bg_BG.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/bg_BG.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/ca.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/ca.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/ca.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/ca.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/cs.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/cs.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/cs.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/cs.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/de.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/de.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/de.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/de.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/el.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/el.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/el.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/el.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/en_CA.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/en_CA.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/en_CA.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/en_CA.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/en_GB.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/en_GB.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/en_GB.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/en_GB.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/es.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/es.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/es.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/es.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/et.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/et.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/et.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/et.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/eu.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/eu.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/eu.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/eu.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/fa.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/fa.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/fa.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/fa.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/fi.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/fi.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/fi.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/fi.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/fr_FR.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/fr_FR.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/fr_FR.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/fr_FR.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/gl.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/gl.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/gl.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/gl.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/he_IL.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/he_IL.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/he_IL.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/he_IL.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/hr.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/hr.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/hr.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/hr.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/hu_HU.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/hu_HU.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/hu_HU.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/hu_HU.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/id.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/id.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/id.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/id.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/it.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/it.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/it.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/it.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/ja.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/ja.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/ja.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/ja.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/ko_KR.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/ko_KR.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/ko_KR.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/ko_KR.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/lt.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/lt.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/lt.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/lt.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/nb_NO.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/nb_NO.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/nb_NO.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/nb_NO.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/nl.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/nl.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/nl.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/nl.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/pl.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/pl.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/pl.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/pl.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/pt_BR.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/pt_BR.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/pt_BR.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/pt_BR.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/pt_PT.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/pt_PT.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/pt_PT.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/pt_PT.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/ro.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/ro.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/ro.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/ro.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/ru.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/ru.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/ru.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/ru.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/sk.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/sk.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/sk.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/sk.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/sl_SI.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/sl_SI.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/sl_SI.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/sl_SI.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/sr.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/sr.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/sr.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/sr.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/sv_SE.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/sv_SE.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/sv_SE.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/sv_SE.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/tr_TR.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/tr_TR.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/tr_TR.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/tr_TR.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/uk.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/uk.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/uk.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/uk.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/vi.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/vi.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/vi.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/vi.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/zh_CN.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/zh_CN.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/zh_CN.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/zh_CN.js diff --git a/portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/zh_TW.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/zh_TW.js similarity index 100% rename from portal-web/docroot/html/js/editor/tiny_mce_diffs/langs/zh_TW.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tiny_mce_diffs/langs/zh_TW.js diff --git a/portal-web/docroot/html/js/editor/tinymce.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce.jsp similarity index 100% rename from portal-web/docroot/html/js/editor/tinymce.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce.jsp diff --git a/portal-web/docroot/html/js/editor/tinymce_simple.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce_simple.jsp similarity index 100% rename from portal-web/docroot/html/js/editor/tinymce_simple.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce_simple.jsp diff --git a/portal-web/docroot/html/js/editor/tinymcesimple.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymcesimple.jsp similarity index 100% rename from portal-web/docroot/html/js/editor/tinymcesimple.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymcesimple.jsp diff --git a/portal-web/docroot/html/js/everything.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/everything.jsp similarity index 100% rename from portal-web/docroot/html/js/everything.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/everything.jsp diff --git a/portal-web/docroot/html/js/jquery/fm.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/jquery/fm.js similarity index 100% rename from portal-web/docroot/html/js/jquery/fm.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/jquery/fm.js diff --git a/portal-web/docroot/html/js/jquery/form.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/jquery/form.js similarity index 100% rename from portal-web/docroot/html/js/jquery/form.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/jquery/form.js diff --git a/portal-web/docroot/html/js/jquery/jquery.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/jquery/jquery.js similarity index 100% rename from portal-web/docroot/html/js/jquery/jquery.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/jquery/jquery.js diff --git a/portal-web/docroot/html/js/liferay/address.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/address.js similarity index 100% rename from portal-web/docroot/html/js/liferay/address.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/address.js diff --git a/portal-web/docroot/html/js/liferay/alloyeditor.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/alloyeditor.js similarity index 100% rename from portal-web/docroot/html/js/liferay/alloyeditor.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/alloyeditor.js diff --git a/portal-web/docroot/html/js/liferay/alloyeditor_source.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/alloyeditor_source.js similarity index 100% rename from portal-web/docroot/html/js/liferay/alloyeditor_source.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/alloyeditor_source.js diff --git a/portal-web/docroot/html/js/liferay/app_view_move.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/app_view_move.js similarity index 100% rename from portal-web/docroot/html/js/liferay/app_view_move.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/app_view_move.js diff --git a/portal-web/docroot/html/js/liferay/app_view_move_touch.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/app_view_move_touch.js similarity index 100% rename from portal-web/docroot/html/js/liferay/app_view_move_touch.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/app_view_move_touch.js diff --git a/portal-web/docroot/html/js/liferay/app_view_select.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/app_view_select.js similarity index 100% rename from portal-web/docroot/html/js/liferay/app_view_select.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/app_view_select.js diff --git a/portal-web/docroot/html/js/liferay/asset_categories_selector.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/asset_categories_selector.js similarity index 100% rename from portal-web/docroot/html/js/liferay/asset_categories_selector.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/asset_categories_selector.js diff --git a/portal-web/docroot/html/js/liferay/asset_tags_selector.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/asset_tags_selector.js similarity index 100% rename from portal-web/docroot/html/js/liferay/asset_tags_selector.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/asset_tags_selector.js diff --git a/portal-web/docroot/html/js/liferay/aui_sandbox.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/aui_sandbox.js similarity index 100% rename from portal-web/docroot/html/js/liferay/aui_sandbox.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/aui_sandbox.js diff --git a/portal-web/docroot/html/js/liferay/auto_fields.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/auto_fields.js similarity index 100% rename from portal-web/docroot/html/js/liferay/auto_fields.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/auto_fields.js diff --git a/portal-web/docroot/html/js/liferay/autocomplete_input.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/autocomplete_input.js similarity index 100% rename from portal-web/docroot/html/js/liferay/autocomplete_input.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/autocomplete_input.js diff --git a/portal-web/docroot/html/js/liferay/autocomplete_input_caretindex.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/autocomplete_input_caretindex.js similarity index 100% rename from portal-web/docroot/html/js/liferay/autocomplete_input_caretindex.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/autocomplete_input_caretindex.js diff --git a/portal-web/docroot/html/js/liferay/autocomplete_input_caretindex_sel.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/autocomplete_input_caretindex_sel.js similarity index 100% rename from portal-web/docroot/html/js/liferay/autocomplete_input_caretindex_sel.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/autocomplete_input_caretindex_sel.js diff --git a/portal-web/docroot/html/js/liferay/autocomplete_input_caretoffset.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/autocomplete_input_caretoffset.js similarity index 100% rename from portal-web/docroot/html/js/liferay/autocomplete_input_caretoffset.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/autocomplete_input_caretoffset.js diff --git a/portal-web/docroot/html/js/liferay/autocomplete_input_caretoffset_sel.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/autocomplete_input_caretoffset_sel.js similarity index 100% rename from portal-web/docroot/html/js/liferay/autocomplete_input_caretoffset_sel.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/autocomplete_input_caretoffset_sel.js diff --git a/portal-web/docroot/html/js/liferay/autocomplete_textarea.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/autocomplete_textarea.js similarity index 100% rename from portal-web/docroot/html/js/liferay/autocomplete_textarea.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/autocomplete_textarea.js diff --git a/portal-web/docroot/html/js/liferay/available_languages.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/available_languages.jsp similarity index 100% rename from portal-web/docroot/html/js/liferay/available_languages.jsp rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/available_languages.jsp diff --git a/portal-web/docroot/html/js/liferay/browser_selectors.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/browser_selectors.js similarity index 100% rename from portal-web/docroot/html/js/liferay/browser_selectors.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/browser_selectors.js diff --git a/portal-web/docroot/html/js/liferay/cover_cropper.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/cover_cropper.js similarity index 100% rename from portal-web/docroot/html/js/liferay/cover_cropper.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/cover_cropper.js diff --git a/portal-web/docroot/html/js/liferay/crop_region.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/crop_region.js similarity index 100% rename from portal-web/docroot/html/js/liferay/crop_region.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/crop_region.js diff --git a/portal-web/docroot/html/js/liferay/ddm_form.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/ddm_form.js similarity index 100% rename from portal-web/docroot/html/js/liferay/ddm_form.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/ddm_form.js diff --git a/portal-web/docroot/html/js/liferay/dependency.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dependency.js similarity index 100% rename from portal-web/docroot/html/js/liferay/dependency.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dependency.js diff --git a/portal-web/docroot/html/js/liferay/deprecated.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/deprecated.js similarity index 100% rename from portal-web/docroot/html/js/liferay/deprecated.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/deprecated.js diff --git a/portal-web/docroot/html/js/liferay/diff_version_comparator.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/diff_version_comparator.js similarity index 100% rename from portal-web/docroot/html/js/liferay/diff_version_comparator.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/diff_version_comparator.js diff --git a/portal-web/docroot/html/js/liferay/dockbar.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar.js similarity index 100% rename from portal-web/docroot/html/js/liferay/dockbar.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar.js diff --git a/portal-web/docroot/html/js/liferay/dockbar_add_application.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_application.js similarity index 100% rename from portal-web/docroot/html/js/liferay/dockbar_add_application.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_application.js diff --git a/portal-web/docroot/html/js/liferay/dockbar_add_base.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_base.js similarity index 100% rename from portal-web/docroot/html/js/liferay/dockbar_add_base.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_base.js diff --git a/portal-web/docroot/html/js/liferay/dockbar_add_content.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_content.js similarity index 100% rename from portal-web/docroot/html/js/liferay/dockbar_add_content.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_content.js diff --git a/portal-web/docroot/html/js/liferay/dockbar_add_content_drag_drop.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_content_drag_drop.js similarity index 100% rename from portal-web/docroot/html/js/liferay/dockbar_add_content_drag_drop.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_content_drag_drop.js diff --git a/portal-web/docroot/html/js/liferay/dockbar_add_content_preview.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_content_preview.js similarity index 100% rename from portal-web/docroot/html/js/liferay/dockbar_add_content_preview.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_content_preview.js diff --git a/portal-web/docroot/html/js/liferay/dockbar_add_content_search.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_content_search.js similarity index 100% rename from portal-web/docroot/html/js/liferay/dockbar_add_content_search.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_content_search.js diff --git a/portal-web/docroot/html/js/liferay/dockbar_add_page.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_page.js similarity index 100% rename from portal-web/docroot/html/js/liferay/dockbar_add_page.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_page.js diff --git a/portal-web/docroot/html/js/liferay/dockbar_add_page_search.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_page_search.js similarity index 100% rename from portal-web/docroot/html/js/liferay/dockbar_add_page_search.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_page_search.js diff --git a/portal-web/docroot/html/js/liferay/dockbar_add_page_template_search.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_page_template_search.js similarity index 100% rename from portal-web/docroot/html/js/liferay/dockbar_add_page_template_search.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_add_page_template_search.js diff --git a/portal-web/docroot/html/js/liferay/dockbar_device_preview.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_device_preview.js similarity index 100% rename from portal-web/docroot/html/js/liferay/dockbar_device_preview.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_device_preview.js diff --git a/portal-web/docroot/html/js/liferay/dockbar_keyboard_interaction.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_keyboard_interaction.js similarity index 100% rename from portal-web/docroot/html/js/liferay/dockbar_keyboard_interaction.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_keyboard_interaction.js diff --git a/portal-web/docroot/html/js/liferay/dockbar_portlet_dd.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_portlet_dd.js similarity index 100% rename from portal-web/docroot/html/js/liferay/dockbar_portlet_dd.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_portlet_dd.js diff --git a/portal-web/docroot/html/js/liferay/dockbar_underlay.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_underlay.js similarity index 100% rename from portal-web/docroot/html/js/liferay/dockbar_underlay.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dockbar_underlay.js diff --git a/portal-web/docroot/html/js/liferay/dynamic_select.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dynamic_select.js similarity index 100% rename from portal-web/docroot/html/js/liferay/dynamic_select.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/dynamic_select.js diff --git a/portal-web/docroot/html/js/liferay/editor_image_uploader.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/editor_image_uploader.js similarity index 100% rename from portal-web/docroot/html/js/liferay/editor_image_uploader.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/editor_image_uploader.js diff --git a/portal-web/docroot/html/js/liferay/events.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/events.js similarity index 100% rename from portal-web/docroot/html/js/liferay/events.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/events.js diff --git a/portal-web/docroot/html/js/liferay/form.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/form.js similarity index 100% rename from portal-web/docroot/html/js/liferay/form.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/form.js diff --git a/portal-web/docroot/html/js/liferay/form_placeholders.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/form_placeholders.js similarity index 100% rename from portal-web/docroot/html/js/liferay/form_placeholders.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/form_placeholders.js diff --git a/portal-web/docroot/html/js/liferay/fullscreen_source_editor.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/fullscreen_source_editor.js similarity index 100% rename from portal-web/docroot/html/js/liferay/fullscreen_source_editor.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/fullscreen_source_editor.js diff --git a/portal-web/docroot/html/js/liferay/history.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/history.js similarity index 100% rename from portal-web/docroot/html/js/liferay/history.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/history.js diff --git a/portal-web/docroot/html/js/liferay/history_html5.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/history_html5.js similarity index 100% rename from portal-web/docroot/html/js/liferay/history_html5.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/history_html5.js diff --git a/portal-web/docroot/html/js/liferay/history_manager.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/history_manager.js similarity index 100% rename from portal-web/docroot/html/js/liferay/history_manager.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/history_manager.js diff --git a/portal-web/docroot/html/js/liferay/hudcrumbs.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/hudcrumbs.js similarity index 100% rename from portal-web/docroot/html/js/liferay/hudcrumbs.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/hudcrumbs.js diff --git a/portal-web/docroot/html/js/liferay/icon.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/icon.js similarity index 100% rename from portal-web/docroot/html/js/liferay/icon.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/icon.js diff --git a/portal-web/docroot/html/js/liferay/image_selector.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/image_selector.js similarity index 100% rename from portal-web/docroot/html/js/liferay/image_selector.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/image_selector.js diff --git a/portal-web/docroot/html/js/liferay/inline_editor_base.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/inline_editor_base.js similarity index 100% rename from portal-web/docroot/html/js/liferay/inline_editor_base.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/inline_editor_base.js diff --git a/portal-web/docroot/html/js/liferay/input_localized.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/input_localized.js similarity index 100% rename from portal-web/docroot/html/js/liferay/input_localized.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/input_localized.js diff --git a/portal-web/docroot/html/js/liferay/input_move_boxes.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/input_move_boxes.js similarity index 100% rename from portal-web/docroot/html/js/liferay/input_move_boxes.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/input_move_boxes.js diff --git a/portal-web/docroot/html/js/liferay/input_move_boxes_touch.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/input_move_boxes_touch.js similarity index 100% rename from portal-web/docroot/html/js/liferay/input_move_boxes_touch.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/input_move_boxes_touch.js diff --git a/portal-web/docroot/html/js/liferay/language.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/language.js similarity index 100% rename from portal-web/docroot/html/js/liferay/language.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/language.js diff --git a/portal-web/docroot/html/js/liferay/layout.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layout.js similarity index 100% rename from portal-web/docroot/html/js/liferay/layout.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layout.js diff --git a/portal-web/docroot/html/js/liferay/layout_column.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layout_column.js similarity index 100% rename from portal-web/docroot/html/js/liferay/layout_column.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layout_column.js diff --git a/portal-web/docroot/html/js/liferay/layout_customization_settings.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layout_customization_settings.js similarity index 100% rename from portal-web/docroot/html/js/liferay/layout_customization_settings.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layout_customization_settings.js diff --git a/portal-web/docroot/html/js/liferay/layout_exporter.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layout_exporter.js similarity index 100% rename from portal-web/docroot/html/js/liferay/layout_exporter.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layout_exporter.js diff --git a/portal-web/docroot/html/js/liferay/layout_freeform.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layout_freeform.js similarity index 100% rename from portal-web/docroot/html/js/liferay/layout_freeform.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layout_freeform.js diff --git a/portal-web/docroot/html/js/liferay/layouts_tree.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layouts_tree.js similarity index 100% rename from portal-web/docroot/html/js/liferay/layouts_tree.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layouts_tree.js diff --git a/portal-web/docroot/html/js/liferay/layouts_tree_check_content_display_page.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layouts_tree_check_content_display_page.js similarity index 100% rename from portal-web/docroot/html/js/liferay/layouts_tree_check_content_display_page.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layouts_tree_check_content_display_page.js diff --git a/portal-web/docroot/html/js/liferay/layouts_tree_node_task.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layouts_tree_node_task.js similarity index 100% rename from portal-web/docroot/html/js/liferay/layouts_tree_node_task.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layouts_tree_node_task.js diff --git a/portal-web/docroot/html/js/liferay/layouts_tree_selectable.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layouts_tree_selectable.js similarity index 100% rename from portal-web/docroot/html/js/liferay/layouts_tree_selectable.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layouts_tree_selectable.js diff --git a/portal-web/docroot/html/js/liferay/layouts_tree_state.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layouts_tree_state.js similarity index 100% rename from portal-web/docroot/html/js/liferay/layouts_tree_state.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/layouts_tree_state.js diff --git a/portal-web/docroot/html/js/liferay/liferay.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/liferay.js similarity index 100% rename from portal-web/docroot/html/js/liferay/liferay.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/liferay.js diff --git a/portal-web/docroot/html/js/liferay/list_view.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/list_view.js similarity index 100% rename from portal-web/docroot/html/js/liferay/list_view.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/list_view.js diff --git a/portal-web/docroot/html/js/liferay/logo_editor.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/logo_editor.js similarity index 100% rename from portal-web/docroot/html/js/liferay/logo_editor.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/logo_editor.js diff --git a/portal-web/docroot/html/js/liferay/logo_selector.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/logo_selector.js similarity index 100% rename from portal-web/docroot/html/js/liferay/logo_selector.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/logo_selector.js diff --git a/portal-web/docroot/html/js/liferay/look_and_feel.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/look_and_feel.js similarity index 100% rename from portal-web/docroot/html/js/liferay/look_and_feel.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/look_and_feel.js diff --git a/portal-web/docroot/html/js/liferay/map_base.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/map_base.js similarity index 100% rename from portal-web/docroot/html/js/liferay/map_base.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/map_base.js diff --git a/portal-web/docroot/html/js/liferay/map_google.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/map_google.js similarity index 100% rename from portal-web/docroot/html/js/liferay/map_google.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/map_google.js diff --git a/portal-web/docroot/html/js/liferay/map_openstreet.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/map_openstreet.js similarity index 100% rename from portal-web/docroot/html/js/liferay/map_openstreet.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/map_openstreet.js diff --git a/portal-web/docroot/html/js/liferay/menu.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/menu.js similarity index 100% rename from portal-web/docroot/html/js/liferay/menu.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/menu.js diff --git a/portal-web/docroot/html/js/liferay/menu_filter.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/menu_filter.js similarity index 100% rename from portal-web/docroot/html/js/liferay/menu_filter.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/menu_filter.js diff --git a/portal-web/docroot/html/js/liferay/menu_toggle.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/menu_toggle.js similarity index 100% rename from portal-web/docroot/html/js/liferay/menu_toggle.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/menu_toggle.js diff --git a/portal-web/docroot/html/js/liferay/message.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/message.js similarity index 100% rename from portal-web/docroot/html/js/liferay/message.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/message.js diff --git a/portal-web/docroot/html/js/liferay/modules.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/modules.js similarity index 100% rename from portal-web/docroot/html/js/liferay/modules.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/modules.js diff --git a/portal-web/docroot/html/js/liferay/navigation.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/navigation.js similarity index 100% rename from portal-web/docroot/html/js/liferay/navigation.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/navigation.js diff --git a/portal-web/docroot/html/js/liferay/navigation_interaction.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/navigation_interaction.js similarity index 100% rename from portal-web/docroot/html/js/liferay/navigation_interaction.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/navigation_interaction.js diff --git a/portal-web/docroot/html/js/liferay/navigation_interaction_touch.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/navigation_interaction_touch.js similarity index 100% rename from portal-web/docroot/html/js/liferay/navigation_interaction_touch.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/navigation_interaction_touch.js diff --git a/portal-web/docroot/html/js/liferay/navigation_touch.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/navigation_touch.js similarity index 100% rename from portal-web/docroot/html/js/liferay/navigation_touch.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/navigation_touch.js diff --git a/portal-web/docroot/html/js/liferay/node.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/node.js similarity index 100% rename from portal-web/docroot/html/js/liferay/node.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/node.js diff --git a/portal-web/docroot/html/js/liferay/notice.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/notice.js similarity index 100% rename from portal-web/docroot/html/js/liferay/notice.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/notice.js diff --git a/portal-web/docroot/html/js/liferay/pagination.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/pagination.js similarity index 100% rename from portal-web/docroot/html/js/liferay/pagination.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/pagination.js diff --git a/portal-web/docroot/html/js/liferay/panel_search.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/panel_search.js similarity index 100% rename from portal-web/docroot/html/js/liferay/panel_search.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/panel_search.js diff --git a/portal-web/docroot/html/js/liferay/poller.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/poller.js similarity index 100% rename from portal-web/docroot/html/js/liferay/poller.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/poller.js diff --git a/portal-web/docroot/html/js/liferay/portal.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/portal.js similarity index 100% rename from portal-web/docroot/html/js/liferay/portal.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/portal.js diff --git a/portal-web/docroot/html/js/liferay/portlet.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/portlet.js similarity index 100% rename from portal-web/docroot/html/js/liferay/portlet.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/portlet.js diff --git a/portal-web/docroot/html/js/liferay/portlet_base.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/portlet_base.js similarity index 100% rename from portal-web/docroot/html/js/liferay/portlet_base.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/portlet_base.js diff --git a/portal-web/docroot/html/js/liferay/portlet_sharing.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/portlet_sharing.js similarity index 100% rename from portal-web/docroot/html/js/liferay/portlet_sharing.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/portlet_sharing.js diff --git a/portal-web/docroot/html/js/liferay/portlet_url.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/portlet_url.js similarity index 100% rename from portal-web/docroot/html/js/liferay/portlet_url.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/portlet_url.js diff --git a/portal-web/docroot/html/js/liferay/preview.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/preview.js similarity index 100% rename from portal-web/docroot/html/js/liferay/preview.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/preview.js diff --git a/portal-web/docroot/html/js/liferay/progress.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/progress.js similarity index 100% rename from portal-web/docroot/html/js/liferay/progress.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/progress.js diff --git a/portal-web/docroot/html/js/liferay/ratings.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/ratings.js similarity index 100% rename from portal-web/docroot/html/js/liferay/ratings.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/ratings.js diff --git a/portal-web/docroot/html/js/liferay/resize_rtl.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/resize_rtl.js similarity index 100% rename from portal-web/docroot/html/js/liferay/resize_rtl.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/resize_rtl.js diff --git a/portal-web/docroot/html/js/liferay/restore_entry.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/restore_entry.js similarity index 100% rename from portal-web/docroot/html/js/liferay/restore_entry.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/restore_entry.js diff --git a/portal-web/docroot/html/js/liferay/search_container.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/search_container.js similarity index 100% rename from portal-web/docroot/html/js/liferay/search_container.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/search_container.js diff --git a/portal-web/docroot/html/js/liferay/search_filter.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/search_filter.js similarity index 100% rename from portal-web/docroot/html/js/liferay/search_filter.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/search_filter.js diff --git a/portal-web/docroot/html/js/liferay/service_datasource.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/service_datasource.js similarity index 100% rename from portal-web/docroot/html/js/liferay/service_datasource.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/service_datasource.js diff --git a/portal-web/docroot/html/js/liferay/session.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/session.js similarity index 100% rename from portal-web/docroot/html/js/liferay/session.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/session.js diff --git a/portal-web/docroot/html/js/liferay/sign_in_modal.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/sign_in_modal.js similarity index 100% rename from portal-web/docroot/html/js/liferay/sign_in_modal.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/sign_in_modal.js diff --git a/portal-web/docroot/html/js/liferay/social_bookmarks.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/social_bookmarks.js similarity index 100% rename from portal-web/docroot/html/js/liferay/social_bookmarks.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/social_bookmarks.js diff --git a/portal-web/docroot/html/js/liferay/source_editor.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/source_editor.js similarity index 100% rename from portal-web/docroot/html/js/liferay/source_editor.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/source_editor.js diff --git a/portal-web/docroot/html/js/liferay/storage_formatter.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/storage_formatter.js similarity index 100% rename from portal-web/docroot/html/js/liferay/storage_formatter.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/storage_formatter.js diff --git a/portal-web/docroot/html/js/liferay/store.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/store.js similarity index 100% rename from portal-web/docroot/html/js/liferay/store.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/store.js diff --git a/portal-web/docroot/html/js/liferay/surface.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/surface.js similarity index 100% rename from portal-web/docroot/html/js/liferay/surface.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/surface.js diff --git a/portal-web/docroot/html/js/liferay/surface_app.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/surface_app.js similarity index 100% rename from portal-web/docroot/html/js/liferay/surface_app.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/surface_app.js diff --git a/portal-web/docroot/html/js/liferay/toggler_interaction.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/toggler_interaction.js similarity index 100% rename from portal-web/docroot/html/js/liferay/toggler_interaction.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/toggler_interaction.js diff --git a/portal-web/docroot/html/js/liferay/toggler_key_filter.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/toggler_key_filter.js similarity index 100% rename from portal-web/docroot/html/js/liferay/toggler_key_filter.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/toggler_key_filter.js diff --git a/portal-web/docroot/html/js/liferay/token_list.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/token_list.js similarity index 100% rename from portal-web/docroot/html/js/liferay/token_list.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/token_list.js diff --git a/portal-web/docroot/html/js/liferay/translation_manager.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/translation_manager.js similarity index 100% rename from portal-web/docroot/html/js/liferay/translation_manager.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/translation_manager.js diff --git a/portal-web/docroot/html/js/liferay/undo_manager.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/undo_manager.js similarity index 100% rename from portal-web/docroot/html/js/liferay/undo_manager.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/undo_manager.js diff --git a/portal-web/docroot/html/js/liferay/upload.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/upload.js similarity index 100% rename from portal-web/docroot/html/js/liferay/upload.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/upload.js diff --git a/portal-web/docroot/html/js/liferay/util.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/util.js similarity index 100% rename from portal-web/docroot/html/js/liferay/util.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/util.js diff --git a/portal-web/docroot/html/js/liferay/util_window.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/util_window.js similarity index 100% rename from portal-web/docroot/html/js/liferay/util_window.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/util_window.js diff --git a/portal-web/docroot/html/js/liferay/widget.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/widget.js similarity index 100% rename from portal-web/docroot/html/js/liferay/widget.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/widget.js diff --git a/portal-web/docroot/html/js/liferay/widget_size_animation_plugin.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/widget_size_animation_plugin.js similarity index 100% rename from portal-web/docroot/html/js/liferay/widget_size_animation_plugin.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/widget_size_animation_plugin.js diff --git a/portal-web/docroot/html/js/liferay/widget_zindex.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/widget_zindex.js similarity index 100% rename from portal-web/docroot/html/js/liferay/widget_zindex.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/widget_zindex.js diff --git a/portal-web/docroot/html/js/liferay/workflow.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/workflow.js similarity index 100% rename from portal-web/docroot/html/js/liferay/workflow.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/workflow.js diff --git a/portal-web/docroot/html/js/liferay/xml_formatter.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/xml_formatter.js similarity index 100% rename from portal-web/docroot/html/js/liferay/xml_formatter.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/liferay/xml_formatter.js diff --git a/portal-web/docroot/html/js/lodash/lodash.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/lodash/lodash.js similarity index 100% rename from portal-web/docroot/html/js/lodash/lodash.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/lodash/lodash.js diff --git a/portal-web/docroot/html/js/lodash/util.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/lodash/util.js similarity index 100% rename from portal-web/docroot/html/js/lodash/util.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/lodash/util.js diff --git a/portal-web/docroot/html/js/misc/swfobject.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/misc/swfobject.js similarity index 100% rename from portal-web/docroot/html/js/misc/swfobject.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/misc/swfobject.js diff --git a/portal-web/docroot/html/js/misc/swfupload/swfupload.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/misc/swfupload/swfupload.js similarity index 100% rename from portal-web/docroot/html/js/misc/swfupload/swfupload.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/misc/swfupload/swfupload.js diff --git a/portal-web/docroot/html/js/misc/swfupload/swfupload_f10.swf b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/misc/swfupload/swfupload_f10.swf similarity index 100% rename from portal-web/docroot/html/js/misc/swfupload/swfupload_f10.swf rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/misc/swfupload/swfupload_f10.swf diff --git a/portal-web/docroot/html/js/misc/swfupload/swfupload_f8.swf b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/misc/swfupload/swfupload_f8.swf similarity index 100% rename from portal-web/docroot/html/js/misc/swfupload/swfupload_f8.swf rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/misc/swfupload/swfupload_f8.swf diff --git a/portal-web/docroot/html/js/misc/swfupload/swfupload_f9.swf b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/misc/swfupload/swfupload_f9.swf similarity index 100% rename from portal-web/docroot/html/js/misc/swfupload/swfupload_f9.swf rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/misc/swfupload/swfupload_f9.swf diff --git a/portal-web/docroot/html/js/misc/video_player/mpw_player.swf b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/misc/video_player/mpw_player.swf similarity index 100% rename from portal-web/docroot/html/js/misc/video_player/mpw_player.swf rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/misc/video_player/mpw_player.swf diff --git a/portal-web/docroot/html/js/misc/xp_progress.js b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/misc/xp_progress.js similarity index 100% rename from portal-web/docroot/html/js/misc/xp_progress.js rename to modules/frontend/frontend-js-web/src/META-INF/resources/html/js/misc/xp_progress.js From 10ba88736ce6f1b20180ef487f6b05aeb668c467 Mon Sep 17 00:00:00 2001 From: "michael.bradford@liferay.com" Date: Wed, 18 Mar 2015 13:58:12 -0700 Subject: [PATCH 02/41] LPS-54480 - Create portal-front-end/front-end-web OSGI module --- modules/frontend/frontend-js-web/.classpath | 23 +++++ modules/frontend/frontend-js-web/.project | 16 ++++ modules/frontend/frontend-js-web/bnd.bnd | 89 +++++++++++++++++++ modules/frontend/frontend-js-web/build.gradle | 0 modules/frontend/frontend-js-web/build.xml | 8 ++ modules/frontend/frontend-js-web/ivy.xml | 23 +++++ 6 files changed, 159 insertions(+) create mode 100644 modules/frontend/frontend-js-web/.classpath create mode 100644 modules/frontend/frontend-js-web/.project create mode 100644 modules/frontend/frontend-js-web/bnd.bnd create mode 100644 modules/frontend/frontend-js-web/build.gradle create mode 100644 modules/frontend/frontend-js-web/build.xml create mode 100644 modules/frontend/frontend-js-web/ivy.xml diff --git a/modules/frontend/frontend-js-web/.classpath b/modules/frontend/frontend-js-web/.classpath new file mode 100644 index 00000000000000..3fbf8eec37623a --- /dev/null +++ b/modules/frontend/frontend-js-web/.classpath @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/frontend/frontend-js-web/.project b/modules/frontend/frontend-js-web/.project new file mode 100644 index 00000000000000..62221bd462d82e --- /dev/null +++ b/modules/frontend/frontend-js-web/.project @@ -0,0 +1,16 @@ + + + + frontend-js-web-master + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.jdt.core.javanature + + \ No newline at end of file diff --git a/modules/frontend/frontend-js-web/bnd.bnd b/modules/frontend/frontend-js-web/bnd.bnd new file mode 100644 index 00000000000000..3674055bd6e8e6 --- /dev/null +++ b/modules/frontend/frontend-js-web/bnd.bnd @@ -0,0 +1,89 @@ +Bundle-Name: Liferay Front End JS Web +Bundle-SymbolicName: com.liferay.frontend.js.web +Bundle-Version: 1.0.0 +Import-Package:\ + com.liferay.portal,\ + com.liferay.portal.kernel.bean,\ + com.liferay.portal.kernel.cal,\ + com.liferay.portal.kernel.captcha,\ + com.liferay.portal.kernel.configuration,\ + com.liferay.portal.kernel.dao.orm,\ + com.liferay.portal.kernel.dao.search,\ + com.liferay.portal.kernel.exception,\ + com.liferay.portal.kernel.json,\ + com.liferay.portal.kernel.language,\ + com.liferay.portal.kernel.lar,\ + com.liferay.portal.kernel.log,\ + com.liferay.portal.kernel.messaging,\ + com.liferay.portal.kernel.plugin,\ + com.liferay.portal.kernel.portlet,\ + com.liferay.portal.kernel.repository.model,\ + com.liferay.portal.kernel.search,\ + com.liferay.portal.kernel.servlet,\ + com.liferay.portal.kernel.servlet.taglib.ui,\ + com.liferay.portal.kernel.settings,\ + com.liferay.portal.kernel.staging,\ + com.liferay.portal.kernel.template,\ + com.liferay.portal.kernel.upload,\ + com.liferay.portal.kernel.util,\ + com.liferay.portal.kernel.web,\ + com.liferay.portal.kernel.workflow,\ + com.liferay.portal.kernel.xuggler,\ + com.liferay.portal.layoutconfiguration.util,\ + com.liferay.portal.model,\ + com.liferay.portal.model.impl,\ + com.liferay.portal.plugin,\ + com.liferay.portal.portletfilerepository,\ + com.liferay.portal.security.auth,\ + com.liferay.portal.security.permission,\ + com.liferay.portal.security.sso,\ + com.liferay.portal.service,\ + com.liferay.portal.service.permission,\ + com.liferay.portal.struts,\ + com.liferay.portal.theme,\ + com.liferay.portal.upload,\ + com.liferay.portal.util,\ + com.liferay.portal.util.comparator,\ + com.liferay.portal.webserver,\ + com.liferay.portlet,\ + com.liferay.portlet.asset,\ + com.liferay.portlet.asset.model,\ + com.liferay.portlet.asset.service,\ + com.liferay.portlet.asset.service.persistence,\ + com.liferay.portlet.asset.util,\ + com.liferay.portlet.blogs.model,\ + com.liferay.portlet.documentlibrary,\ + com.liferay.portlet.documentlibrary.antivirus,\ + com.liferay.portlet.documentlibrary.model,\ + com.liferay.portlet.documentlibrary.service,\ + com.liferay.portlet.documentlibrary.util,\ + com.liferay.portlet.dynamicdatamapping,\ + com.liferay.portlet.dynamicdatamapping.model,\ + com.liferay.portlet.dynamicdatamapping.service.permission,\ + com.liferay.portlet.dynamicdatamapping.storage,\ + com.liferay.portlet.expando.model,\ + com.liferay.portlet.journal,\ + com.liferay.portlet.journal.model,\ + com.liferay.portlet.journal.service,\ + com.liferay.portlet.journal.util,\ + com.liferay.portlet.messageboards.model,\ + com.liferay.portlet.messageboards.service,\ + com.liferay.portlet.messageboards.util,\ + com.liferay.portlet.ratings,\ + com.liferay.portlet.ratings.transformer,\ + com.liferay.portlet.rolesadmin.util,\ + com.liferay.portlet.trash.model,\ + com.liferay.portlet.trash.util,\ + com.liferay.portlet.usergroupsadmin.search,\ + com.liferay.portlet.usersadmin.util,\ + * +Include-Resource:\ + classes,\ + META-INF/resources=src/META-INF/resources,\ + META-INF/resources/html/js=tmp,\ + @../../../util-java/util-java.jar!/com/liferay/util/Encryptor.class,\ + @../../../util-java/util-java.jar!/com/liferay/util/EncryptorException.class + +Web-ContextPath: /frontend-js-web + +-donotcopy: (\.touch|.*_diffs.*) \ No newline at end of file diff --git a/modules/frontend/frontend-js-web/build.gradle b/modules/frontend/frontend-js-web/build.gradle new file mode 100644 index 00000000000000..e69de29bb2d1d6 diff --git a/modules/frontend/frontend-js-web/build.xml b/modules/frontend/frontend-js-web/build.xml new file mode 100644 index 00000000000000..0caf771792b002 --- /dev/null +++ b/modules/frontend/frontend-js-web/build.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/modules/frontend/frontend-js-web/ivy.xml b/modules/frontend/frontend-js-web/ivy.xml new file mode 100644 index 00000000000000..d6b985c7b6f9ab --- /dev/null +++ b/modules/frontend/frontend-js-web/ivy.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file From 7eed66c2d0614e3bfae8a0d3b6d42d2eb9e99b34 Mon Sep 17 00:00:00 2001 From: "michael.bradford@liferay.com" Date: Wed, 8 Apr 2015 17:03:45 -0700 Subject: [PATCH 03/41] LPS-54480 - update editor jsps to include editor/init.jsp --- .../src/META-INF/resources/html/js/editor/alloyeditor.jsp | 2 +- .../src/META-INF/resources/html/js/editor/bbcode.jsp | 2 +- .../src/META-INF/resources/html/js/editor/ckeditor.jsp | 2 +- .../src/META-INF/resources/html/js/editor/simple.jsp | 2 +- .../src/META-INF/resources/html/js/editor/tinymce.jsp | 2 +- .../src/META-INF/resources/html/js/editor/tinymce_simple.jsp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/alloyeditor.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/alloyeditor.jsp index c54b4f6dd7f1ef..d40e4550cc8808 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/alloyeditor.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/alloyeditor.jsp @@ -14,7 +14,7 @@ */ --%> -<%@ include file="/html/taglib/init.jsp" %> +<%@ include file="init.jsp" %> <% String portletId = portletDisplay.getRootPortletId(); diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/bbcode.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/bbcode.jsp index ac8da7a1b32f0a..7b08f1c5e40422 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/bbcode.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/bbcode.jsp @@ -14,7 +14,7 @@ */ --%> -<%@ include file="/html/taglib/init.jsp" %> +<%@ include file="init.jsp" %> <% String cssClass = GetterUtil.getString((String)request.getAttribute("liferay-ui:input-editor:cssClass")); diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor.jsp index 558dca5c9699f8..0e1abb6844b860 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor.jsp @@ -14,7 +14,7 @@ */ --%> -<%@ include file="/html/taglib/init.jsp" %> +<%@ include file="init.jsp" %> <% LiferayPortletResponse liferayPortletResponse = (LiferayPortletResponse)portletResponse; diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/simple.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/simple.jsp index d1585d27b389dc..d4f89b5e29a1ab 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/simple.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/simple.jsp @@ -14,7 +14,7 @@ */ --%> -<%@ include file="/html/taglib/init.jsp" %> +<%@ include file="init.jsp" %> <% String portletId = portletDisplay.getRootPortletId(); diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce.jsp index 34aa252daecc7f..ed3d107d5b00c9 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce.jsp @@ -14,7 +14,7 @@ */ --%> -<%@ include file="/html/taglib/init.jsp" %> +<%@ include file="init.jsp" %> <% String portletId = portletDisplay.getRootPortletId(); diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce_simple.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce_simple.jsp index 5ba16855a2fe31..ba6c87fd057100 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce_simple.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce_simple.jsp @@ -14,7 +14,7 @@ */ --%> -<%@ include file="/html/taglib/init.jsp" %> +<%@ include file="init.jsp" %> <% String portletId = portletDisplay.getRootPortletId(); From 445dc5c8943584caebcc41eb899bec73f5e5ece1 Mon Sep 17 00:00:00 2001 From: "michael.bradford@liferay.com" Date: Wed, 8 Apr 2015 17:05:12 -0700 Subject: [PATCH 04/41] LPS-54480 - update internal references to editor jsps --- .../src/META-INF/resources/html/js/editor/ckeditor.jsp | 2 +- .../META-INF/resources/html/js/editor/ckeditor_bbcode.jsp | 8 +++++++- .../META-INF/resources/html/js/editor/ckeditor_creole.jsp | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor.jsp index 0e1abb6844b860..6ab2e482d2f88a 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor.jsp @@ -463,7 +463,7 @@ if (inlineEdit && Validator.isNotNull(inlineEditSaveURL)) { CKEDITOR.<%= inlineEdit ? "inline" : "replace" %>( '<%= name %>', { - customConfig: '<%= PortalUtil.getPathContext() %>/html/js/editor/ckeditor/<%= HtmlUtil.escapeJS(ckEditorConfigFileName) %>?p_p_id=<%= HttpUtil.encodeURL(portletId) %>&p_main_path=<%= HttpUtil.encodeURL(mainPath) %>&contentsLanguageId=<%= HttpUtil.encodeURL(contentsLanguageId) %>&colorSchemeCssClass=<%= HttpUtil.encodeURL(themeDisplay.getColorScheme().getCssClass()) %>&cssClasses=<%= HttpUtil.encodeURL(cssClasses) %>&cssPath=<%= HttpUtil.encodeURL(themeDisplay.getPathThemeCss()) %>&doAsGroupId=<%= HttpUtil.encodeURL(String.valueOf(doAsGroupId)) %>&doAsUserId=<%= HttpUtil.encodeURL(doAsUserId) %>&imagesPath=<%= HttpUtil.encodeURL(themeDisplay.getPathThemeImages()) %>&inlineEdit=<%= inlineEdit %><%= configParams %>&languageId=<%= HttpUtil.encodeURL(LocaleUtil.toLanguageId(locale)) %>&name=<%= name %>&resizable=<%= resizable %>&showSource=<%= showSource %>', + customConfig: '<%= themeDisplay.getPathJavaScript() %>/editor/ckeditor/<%= HtmlUtil.escapeJS(ckEditorConfigFileName) %>?p_p_id=<%= HttpUtil.encodeURL(portletId) %>&p_main_path=<%= HttpUtil.encodeURL(mainPath) %>&contentsLanguageId=<%= HttpUtil.encodeURL(contentsLanguageId) %>&colorSchemeCssClass=<%= HttpUtil.encodeURL(themeDisplay.getColorScheme().getCssClass()) %>&cssClasses=<%= HttpUtil.encodeURL(cssClasses) %>&cssPath=<%= HttpUtil.encodeURL(themeDisplay.getPathThemeCss()) %>&doAsGroupId=<%= HttpUtil.encodeURL(String.valueOf(doAsGroupId)) %>&doAsUserId=<%= HttpUtil.encodeURL(doAsUserId) %>&imagesPath=<%= HttpUtil.encodeURL(themeDisplay.getPathThemeImages()) %>&inlineEdit=<%= inlineEdit %><%= configParams %>&languageId=<%= HttpUtil.encodeURL(LocaleUtil.toLanguageId(locale)) %>&name=<%= name %>&resizable=<%= resizable %>&showSource=<%= showSource %>', filebrowserBrowseUrl: filebrowserBrowseUrl, filebrowserFlashBrowseUrl: filebrowserFlashBrowseUrl, filebrowserImageBrowseLinkUrl: filebrowserImageBrowseLinkUrl, diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_bbcode.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_bbcode.jsp index 2350174ada89eb..c8537ae0d920f6 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_bbcode.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_bbcode.jsp @@ -16,6 +16,12 @@ <%@ taglib uri="http://liferay.com/tld/util" prefix="liferay-util" %> - +<%@ page import="com.liferay.portal.kernel.web.PortalWebResourcesUtil" %> + +<% + String ckeditorPath = PortalWebResourcesUtil.getContextPath() + "/html/js/editor/ckeditor.jsp"; +%> + + \ No newline at end of file diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_creole.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_creole.jsp index bfa092401c6e29..b084b99dc00858 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_creole.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_creole.jsp @@ -16,7 +16,13 @@ <%@ taglib uri="http://liferay.com/tld/util" prefix="liferay-util" %> - +<%@ page import="com.liferay.portal.kernel.web.PortalWebResourcesUtil" %> + +<% + String ckeditorPath = PortalWebResourcesUtil.getContextPath() + "/html/js/editor/ckeditor.jsp"; +%> + + \ No newline at end of file From 82913ac7b864e7672ee04c95c885a50240c3d592 Mon Sep 17 00:00:00 2001 From: "michael.bradford@liferay.com" Date: Wed, 8 Apr 2015 16:20:23 -0700 Subject: [PATCH 05/41] LPS-54480 - create custom init.jsp for editors --- .../resources/html/js/editor/init.jsp | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/init.jsp diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/init.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/init.jsp new file mode 100644 index 00000000000000..814eaf0138fd75 --- /dev/null +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/init.jsp @@ -0,0 +1,85 @@ +<%-- +/** + * Copyright (c) 2000-present Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. + */ +--%> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> + +<%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %> +<%@ taglib uri="http://liferay.com/tld/portlet" prefix="liferay-portlet" %> +<%@ taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %> +<%@ taglib uri="http://liferay.com/tld/util" prefix="liferay-util" %> + +<%@ page import="com.liferay.portal.kernel.json.JSONObject" %><%@ +page import="com.liferay.portal.kernel.language.LanguageUtil" %><%@ +page import="com.liferay.portal.kernel.portlet.LiferayPortletRequest" %><%@ +page import="com.liferay.portal.kernel.portlet.LiferayPortletResponse" %><%@ +page import="com.liferay.portal.kernel.portlet.LiferayWindowState" %><%@ +page import="com.liferay.portal.kernel.servlet.ServletContextUtil" %><%@ +page import="com.liferay.portal.kernel.util.GetterUtil" %><%@ +page import="com.liferay.portal.kernel.util.HtmlUtil" %><%@ +page import="com.liferay.portal.kernel.util.HttpUtil" %><%@ +page import="com.liferay.portal.kernel.util.JavaConstants" %><%@ +page import="com.liferay.portal.kernel.util.LocaleUtil" %><%@ +page import="com.liferay.portal.kernel.util.ParamUtil" %><%@ +page import="com.liferay.portal.kernel.util.SetUtil" %><%@ +page import="com.liferay.portal.kernel.util.StringBundler" %><%@ +page import="com.liferay.portal.kernel.util.StringPool" %><%@ +page import="com.liferay.portal.kernel.util.TextFormatter" %><%@ +page import="com.liferay.portal.kernel.util.UnicodeFormatter" %><%@ +page import="com.liferay.portal.kernel.util.Validator" %><%@ +page import="com.liferay.portal.kernel.web.PortalWebResourcesUtil" %><%@ +page import="com.liferay.portal.theme.ThemeDisplay" %><%@ +page import="com.liferay.portal.util.PortalUtil" %><%@ +page import="com.liferay.portal.util.PortletKeys" %><%@ +page import="com.liferay.portal.util.SessionClicks" %><%@ +page import="com.liferay.portlet.PortletURLUtil" %><%@ +page import="com.liferay.util.Encryptor" %> + +<%@ page import="java.util.Locale" %><%@ +page import="java.util.Map" %><%@ +page import="java.util.Set" %> + +<%@ page import="javax.portlet.PortletURL" %><%@ +page import="javax.portlet.PortletRequest" %><%@ +page import="javax.portlet.PortletResponse" %> + + + +<% +PortletRequest portletRequest = (PortletRequest)request.getAttribute(JavaConstants.JAVAX_PORTLET_REQUEST); + +PortletResponse portletResponse = (PortletResponse)request.getAttribute(JavaConstants.JAVAX_PORTLET_RESPONSE); + +String namespace = StringPool.BLANK; + +boolean auiFormUseNamespace = GetterUtil.getBoolean((String)request.getAttribute("aui:form:useNamespace"), true); + +if ((portletResponse != null) && auiFormUseNamespace) { + namespace = GetterUtil.getString(request.getAttribute("aui:form:portletNamespace"), portletResponse.getNamespace()); +} + +String currentURL = null; + +if ((portletRequest != null) && (portletResponse != null)) { + PortletURL currentURLObj = PortletURLUtil.getCurrent(PortalUtil.getLiferayPortletRequest(portletRequest), PortalUtil.getLiferayPortletResponse(portletResponse)); + + currentURL = currentURLObj.toString(); +} +else { + currentURL = PortalUtil.getCurrentURL(request); +} +%> \ No newline at end of file From 72363e782728f9be2d5b1646182365339834dcf2 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 14 Apr 2015 15:02:40 -0700 Subject: [PATCH 06/41] LPS-54480 copy portal-web/build.xml over here, blind copy --- modules/frontend/frontend-js-web/build.xml | 1250 +++++++++++++++++++- 1 file changed, 1245 insertions(+), 5 deletions(-) diff --git a/modules/frontend/frontend-js-web/build.xml b/modules/frontend/frontend-js-web/build.xml index 0caf771792b002..0d3c45de678165 100644 --- a/modules/frontend/frontend-js-web/build.xml +++ b/modules/frontend/frontend-js-web/build.xml @@ -1,8 +1,1248 @@ - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${alloy.file} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${alloyeditor.file} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${creole_parser.content} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${build-css.output} + + + + + Sass to CSS Builder generated exceptions. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please set "test.class". + + + + + + + + + + + + + + + + + + + + + + + + + ${ide.js.content} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${jspc.output} + + + + + JSPs failed to compile. + + + + + + + + + + + + + + + + + + + + + + + + + + + +The following JSPs may be too large for some application servers. See LPS-27841 +for more information. + +${oversize.files.jsp} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +. + +Please set the property "jdk.6.home" in build.properties. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${jspc_error.content} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From bb196d91a3d52042aa683cbf72423c005628d156 Mon Sep 17 00:00:00 2001 From: "michael.bradford@liferay.com" Date: Wed, 11 Mar 2015 16:06:11 -0700 Subject: [PATCH 07/41] LPS-54480 - Migrate JS build.xml tasks to bundle, but split build-alloy into build-alloy-themes to remain in portal-web/build.xml --- modules/frontend/frontend-js-web/build.xml | 1002 ++------------------ portal-web/build.xml | 420 +------- 2 files changed, 119 insertions(+), 1303 deletions(-) diff --git a/modules/frontend/frontend-js-web/build.xml b/modules/frontend/frontend-js-web/build.xml index 0d3c45de678165..74830c8f86c112 100644 --- a/modules/frontend/frontend-js-web/build.xml +++ b/modules/frontend/frontend-js-web/build.xml @@ -1,59 +1,25 @@ + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + @@ -65,27 +31,25 @@ - - - - + + ${alloy.file} - + - - + + - + - - - - - - - - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -254,114 +141,50 @@ - + ${alloyeditor.file} - + - - + + - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - + + @@ -369,17 +192,17 @@ - - + + - + @@ -387,11 +210,11 @@ - + - ${creole_parser.content} + ${creole_parser.content} - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - ${build-css.output} - - - - - Sass to CSS Builder generated exceptions. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Please set "test.class". - - - - - - - - - - - - - - - - - - - - - - - - - ${ide.js.content} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -759,490 +355,34 @@ - - + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${jspc.output} - - - - - JSPs failed to compile. - - - - - - - - - - - - - - - - - - - - - - - - - - - -The following JSPs may be too large for some application servers. See LPS-27841 -for more information. - -${oversize.files.jsp} - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - -. - -Please set the property "jdk.6.home" in build.properties. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${jspc_error.content} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/portal-web/build.xml b/portal-web/build.xml index 0d3c45de678165..7290dacf0013aa 100644 --- a/portal-web/build.xml +++ b/portal-web/build.xml @@ -7,12 +7,9 @@ - - - - - + + @@ -49,133 +46,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - ${alloy.file} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -240,47 +111,66 @@ - - + + - + - + + + - + - - - ${alloyeditor.file} + + + - + - - - + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - + @@ -347,187 +237,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${creole_parser.content} - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -681,7 +390,7 @@ ${ide.js.content} - + @@ -755,35 +464,6 @@ /> - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -823,10 +503,6 @@ - - - - From 1503b87e63c42fb06b322a4581147b32e7a44d4d Mon Sep 17 00:00:00 2001 From: peterfellwock Date: Tue, 10 Mar 2015 22:46:13 -0700 Subject: [PATCH 08/41] LPS-54480 - Create Registry to handle resource bundle --- .../js/web/DefaultPortalWebResources.java | 64 +++++++++++++++++++ .../portal/kernel/web/PortalWebResources.java | 30 +++++++++ .../kernel/web/PortalWebResourcesUtil.java | 58 +++++++++++++++++ 3 files changed, 152 insertions(+) create mode 100644 modules/frontend/frontend-js-web/src/com/liferay/frontend/js/web/DefaultPortalWebResources.java create mode 100644 portal-service/src/com/liferay/portal/kernel/web/PortalWebResources.java create mode 100644 portal-service/src/com/liferay/portal/kernel/web/PortalWebResourcesUtil.java diff --git a/modules/frontend/frontend-js-web/src/com/liferay/frontend/js/web/DefaultPortalWebResources.java b/modules/frontend/frontend-js-web/src/com/liferay/frontend/js/web/DefaultPortalWebResources.java new file mode 100644 index 00000000000000..fbe38fd2305a5e --- /dev/null +++ b/modules/frontend/frontend-js-web/src/com/liferay/frontend/js/web/DefaultPortalWebResources.java @@ -0,0 +1,64 @@ +/** + * Copyright (c) 2000-present Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. + */ + +package com.liferay.frontend.js.web; + +import com.liferay.portal.kernel.web.PortalWebResources; + +import javax.servlet.ServletContext; + +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.osgi.service.component.annotations.Reference; + +/** + * @author Peter Fellwock + */ +@Component(immediate = true, service = PortalWebResources.class) +public class DefaultPortalWebResources implements PortalWebResources { + + @Override + public String getContextPath() { + return _servletContext.getContextPath(); + } + + @Override + public ServletContext getServletContext() { + return _servletContext; + } + + @Override + public long getLastModified() { + return _bundle.getLastModified(); + } + + @Activate + protected void activate(BundleContext bundleContext) { + _bundle = bundleContext.getBundle(); + } + + @Reference( + target = "(osgi.web.symbolicname=com.liferay.frontend.js.web)" + ) + protected void setServletContext(ServletContext servletContext) { + _servletContext = servletContext; + } + + private Bundle _bundle; + private ServletContext _servletContext; + + +} \ No newline at end of file diff --git a/portal-service/src/com/liferay/portal/kernel/web/PortalWebResources.java b/portal-service/src/com/liferay/portal/kernel/web/PortalWebResources.java new file mode 100644 index 00000000000000..d080d46a248956 --- /dev/null +++ b/portal-service/src/com/liferay/portal/kernel/web/PortalWebResources.java @@ -0,0 +1,30 @@ +/** + * Copyright (c) 2000-present Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. + */ + +package com.liferay.portal.kernel.web; + +import javax.servlet.ServletContext; + +/** + * @author Peter Fellwock + */ +public interface PortalWebResources { + + public String getContextPath(); + + public long getLastModified(); + + public ServletContext getServletContext(); + +} \ No newline at end of file diff --git a/portal-service/src/com/liferay/portal/kernel/web/PortalWebResourcesUtil.java b/portal-service/src/com/liferay/portal/kernel/web/PortalWebResourcesUtil.java new file mode 100644 index 00000000000000..977faaf57c4d83 --- /dev/null +++ b/portal-service/src/com/liferay/portal/kernel/web/PortalWebResourcesUtil.java @@ -0,0 +1,58 @@ +/** + * Copyright (c) 2000-present Liferay, Inc. All rights reserved. + * + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. + * + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. + */ + +package com.liferay.portal.kernel.web; + +import javax.servlet.ServletContext; + +import com.liferay.registry.Registry; +import com.liferay.registry.RegistryUtil; +import com.liferay.registry.ServiceTracker; + +/** + * @author Peter Fellwock + */ +public class PortalWebResourcesUtil { + + public static String getContextPath() { + return getPortalWebResources().getContextPath(); + } + + public static long getLastModified() { + return getPortalWebResources().getLastModified(); + } + + public static PortalWebResources getPortalWebResources() { + return _instance._serviceTracker.getService(); + } + + public static ServletContext getServletContext() { + return getPortalWebResources().getServletContext(); + } + + private PortalWebResourcesUtil() { + Registry registry = RegistryUtil.getRegistry(); + + _serviceTracker = registry.trackServices(PortalWebResources.class); + + _serviceTracker.open(); + } + + private static final PortalWebResourcesUtil _instance = + new PortalWebResourcesUtil(); + + private final ServiceTracker + _serviceTracker; + +} \ No newline at end of file From 201007c1b1f0cc24e8e8e465a34e613764ce40d7 Mon Sep 17 00:00:00 2001 From: peterfellwock Date: Wed, 11 Mar 2015 00:05:44 -0700 Subject: [PATCH 09/41] LPS-54480 - force ThemeUtil to use OSGI Registry --- .../src/com/liferay/portal/events/ServicePreAction.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portal-impl/src/com/liferay/portal/events/ServicePreAction.java b/portal-impl/src/com/liferay/portal/events/ServicePreAction.java index 86405182037ca9..e6f81de1966a3d 100644 --- a/portal-impl/src/com/liferay/portal/events/ServicePreAction.java +++ b/portal-impl/src/com/liferay/portal/events/ServicePreAction.java @@ -46,6 +46,7 @@ import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.UnicodeProperties; import com.liferay.portal.kernel.util.Validator; +import com.liferay.portal.kernel.web.PortalWebResourcesUtil; import com.liferay.portal.model.ColorScheme; import com.liferay.portal.model.Company; import com.liferay.portal.model.Group; @@ -818,7 +819,8 @@ else if (group.isLayoutPrototype()) { themeDisplay.setPathFriendlyURLPrivateUser(friendlyURLPrivateUserPath); themeDisplay.setPathFriendlyURLPublic(friendlyURLPublicPath); themeDisplay.setPathImage(imagePath); - themeDisplay.setPathJavaScript(contextPath.concat("/html/js")); + themeDisplay.setPathJavaScript( + PortalWebResourcesUtil.getContextPath().concat("/html/js")); themeDisplay.setPathMain(mainPath); themeDisplay.setPathSound(contextPath.concat("/html/sound")); themeDisplay.setPermissionChecker(permissionChecker); From 856a9489f0dec9a8703a93606db00ddd40631c72 Mon Sep 17 00:00:00 2001 From: "michael.bradford@liferay.com" Date: Thu, 12 Mar 2015 10:21:07 -0700 Subject: [PATCH 10/41] LPS-54480 - change where InputEditorTag looks for editor JSPs --- util-taglib/src/com/liferay/taglib/ui/InputEditorTag.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/util-taglib/src/com/liferay/taglib/ui/InputEditorTag.java b/util-taglib/src/com/liferay/taglib/ui/InputEditorTag.java index 035cc4a40675a6..f731cc8b7e6807 100644 --- a/util-taglib/src/com/liferay/taglib/ui/InputEditorTag.java +++ b/util-taglib/src/com/liferay/taglib/ui/InputEditorTag.java @@ -282,7 +282,11 @@ protected String getPage() { } protected String getPage(String editorName) { - return "/html/js/editor/" + editorName + ".jsp"; + ThemeDisplay themeDisplay = (ThemeDisplay)request.getAttribute( + WebKeys.THEME_DISPLAY); + + return themeDisplay.getPathJavaScript() + "/editor/" + + editorName + ".jsp"; } @Override From 4a096fe407170220c83f8e2a3f79a82f990b13e7 Mon Sep 17 00:00:00 2001 From: "michael.bradford@liferay.com" Date: Wed, 11 Mar 2015 13:30:21 -0700 Subject: [PATCH 11/41] LPS-54480 - update Liferay.AUI.getJavaScriptRootPath method to point to new JS path --- portal-web/docroot/html/common/themes/top_js.jspf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal-web/docroot/html/common/themes/top_js.jspf b/portal-web/docroot/html/common/themes/top_js.jspf index 7a530bab563452..f3059a199eb0ac 100644 --- a/portal-web/docroot/html/common/themes/top_js.jspf +++ b/portal-web/docroot/html/common/themes/top_js.jspf @@ -289,7 +289,7 @@ return filter; }, getJavaScriptRootPath: function() { - return '<%= themeDisplay.getPathContext() %>/html/js'; + return '<%= themeDisplay.getPathJavaScript() %>'; }, getLangPath: function() { return '<%= PortalUtil.getStaticResourceURL(request, "aui_lang.jsp", javaScriptLastModified) %>'; From fc0ddd5dd00d5c491153013c2b79d8a247a7aa75 Mon Sep 17 00:00:00 2001 From: "michael.bradford@liferay.com" Date: Wed, 18 Mar 2015 12:22:40 -0700 Subject: [PATCH 12/41] LPS-54480 - Exclude editor css from being parsed --- .../src/com/liferay/portal/tools/SassToCssBuilder.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/portal-impl/src/com/liferay/portal/tools/SassToCssBuilder.java b/portal-impl/src/com/liferay/portal/tools/SassToCssBuilder.java index 341baa6436226b..bed16702b4d659 100644 --- a/portal-impl/src/com/liferay/portal/tools/SassToCssBuilder.java +++ b/portal-impl/src/com/liferay/portal/tools/SassToCssBuilder.java @@ -160,7 +160,9 @@ private void _collectSassFiles( new String[] { "**\\_diffs\\**", "**\\.sass-cache*\\**", "**\\.sass_cache_*\\**", "**\\_sass_cache_*\\**", - "**\\_styled\\**", "**\\_unstyled\\**" + "**\\_styled\\**", "**\\_unstyled\\**", + "**\\tiny_mce\\**", "**\\ckeditor\\**", + "**\\alloyeditor\\**" }); directoryScanner.setIncludes(new String[] {"**\\*.css"}); From dabcacbdd413018e7e627909fb2e984fbb58dcf4 Mon Sep 17 00:00:00 2001 From: peterfellwock Date: Mon, 23 Mar 2015 14:00:18 -0700 Subject: [PATCH 13/41] LPS-54480 - Remove unnecessary check for rootPath --- .../portal/servlet/filters/aggregate/ServletPaths.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/ServletPaths.java b/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/ServletPaths.java index 2ea5043e0ff769..044bf1b467d4ae 100644 --- a/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/ServletPaths.java +++ b/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/ServletPaths.java @@ -16,7 +16,6 @@ import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; -import com.liferay.portal.kernel.servlet.ServletContextUtil; import com.liferay.portal.kernel.util.CharPool; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.StringUtil; @@ -65,13 +64,6 @@ public ServletPaths(ServletContext servletContext, String resourcePath) } _servletContext = servletContext; - - String rootPath = ServletContextUtil.getRootPath(_servletContext); - - if (resourcePath.startsWith(rootPath)) { - resourcePath = resourcePath.substring(rootPath.length()); - } - _resourcePath = resourcePath; } From 69360568eb6c15fff44a3b43ce0a4369e7b20028 Mon Sep 17 00:00:00 2001 From: peterfellwock Date: Mon, 23 Mar 2015 14:01:33 -0700 Subject: [PATCH 14/41] LPS-54480 - Filter requires servletContext from bundle to Aggregate js --- .../filters/aggregate/AggregateFilter.java | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java b/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java index 61483da8b8f930..7b9faeea95b95b 100644 --- a/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java +++ b/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java @@ -35,6 +35,7 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Validator; +import com.liferay.portal.kernel.web.PortalWebResourcesUtil; import com.liferay.portal.minifier.MinifierUtil; import com.liferay.portal.servlet.filters.IgnoreModuleRequestFilter; import com.liferay.portal.servlet.filters.dynamiccss.DynamicCSSUtil; @@ -260,7 +261,10 @@ protected Object getBundleContent( String bundleDirName = PropsUtil.get( PropsKeys.JAVASCRIPT_BUNDLE_DIR, new Filter(bundleId)); - URL bundleDirURL = _servletContext.getResource(bundleDirName); + ServletContext resourceServeletContext = + PortalWebResourcesUtil.getServletContext(); + + URL bundleDirURL = resourceServeletContext.getResource(bundleDirName); if (bundleDirURL == null) { return null; @@ -276,7 +280,7 @@ protected Object getBundleContent( boolean staleCache = false; for (String fileName : fileNames) { - URL resourceURL = _servletContext.getResource( + URL resourceURL = resourceServeletContext.getResource( bundleDirName.concat(StringPool.SLASH).concat(fileName)); if (resourceURL == null) { @@ -312,7 +316,8 @@ protected Object getBundleContent( } else { content = aggregateJavaScript( - new ServletPaths(_servletContext, bundleDirName), fileNames); + new ServletPaths(resourceServeletContext, bundleDirName), + fileNames); } response.setContentType(ContentTypes.TEXT_JAVASCRIPT); @@ -513,6 +518,20 @@ protected String getJavaScriptContent(URL resourceURL) throws IOException { return getJavaScriptContent(resourceURL.toString(), content); } + @Override + protected boolean isModuleRequest(HttpServletRequest request) { + String requestURI = request.getRequestURI(); + + String frontEndContextPath = PortalWebResourcesUtil.getContextPath(); + + if(requestURI.startsWith(frontEndContextPath)){ + return false; + } + + return super.isModuleRequest(request); + } + + @Override protected void processFilter( HttpServletRequest request, HttpServletResponse response, From 3d7cff21475f4b9d13d5f46667993d02e461fc95 Mon Sep 17 00:00:00 2001 From: peterfellwock Date: Mon, 23 Mar 2015 15:15:41 -0700 Subject: [PATCH 15/41] LPS-54480 - Based on path always return front-end files as available --- util-taglib/src/com/liferay/taglib/FileAvailabilityUtil.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/util-taglib/src/com/liferay/taglib/FileAvailabilityUtil.java b/util-taglib/src/com/liferay/taglib/FileAvailabilityUtil.java index d749a03246f1ab..05f10c129f7f63 100644 --- a/util-taglib/src/com/liferay/taglib/FileAvailabilityUtil.java +++ b/util-taglib/src/com/liferay/taglib/FileAvailabilityUtil.java @@ -16,6 +16,7 @@ import com.liferay.portal.kernel.util.CharPool; import com.liferay.portal.kernel.util.Validator; +import com.liferay.portal.kernel.web.PortalWebResourcesUtil; import java.net.URL; @@ -43,6 +44,10 @@ public static boolean isAvailable( return true; } + if (path.startsWith(PortalWebResourcesUtil.getContextPath())) { + return true; + } + Map availabilities = _getAvailabilities( servletContext); From 1402f6e4563fef2b67f541af0af12cff20c9acf7 Mon Sep 17 00:00:00 2001 From: peterfellwock Date: Mon, 23 Mar 2015 16:05:53 -0700 Subject: [PATCH 16/41] LPS-54480 - updated last modified on js includes --- .../src/META-INF/resources/html/js/editor/alloyeditor.jsp | 2 +- .../src/META-INF/resources/html/js/editor/tinymce.jsp | 2 +- portal-web/docroot/html/common/init.jsp | 1 + portal-web/docroot/html/common/themes/top_js.jspf | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/alloyeditor.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/alloyeditor.jsp index d40e4550cc8808..a20fe4c81e46a9 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/alloyeditor.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/alloyeditor.jsp @@ -74,7 +74,7 @@ boolean skipEditorLoading = GetterUtil.getBoolean((String)request.getAttribute(" " rel="stylesheet" type="text/css" /> <% - long javaScriptLastModified = ServletContextUtil.getLastModified(application, "/html/js/", true); + long javaScriptLastModified = PortalWebResourcesUtil.getLastModified(); %> diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce.jsp index ed3d107d5b00c9..fd6329e4a0cae9 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce.jsp @@ -59,7 +59,7 @@ String toolbarSet = (String)request.getAttribute("liferay-ui:input-editor:toolba <% - long javaScriptLastModified = ServletContextUtil.getLastModified(application, "/html/js/", true); + long javaScriptLastModified = PortalWebResourcesUtil.getLastModified(); %> diff --git a/portal-web/docroot/html/common/init.jsp b/portal-web/docroot/html/common/init.jsp index f089dcbdbb388d..df6a5db20a4b87 100644 --- a/portal-web/docroot/html/common/init.jsp +++ b/portal-web/docroot/html/common/init.jsp @@ -155,6 +155,7 @@ page import="com.liferay.portal.kernel.util.Tuple" %><%@ page import="com.liferay.portal.kernel.util.UnicodeFormatter" %><%@ page import="com.liferay.portal.kernel.util.UnicodeProperties" %><%@ page import="com.liferay.portal.kernel.util.Validator" %><%@ +page import="com.liferay.portal.kernel.web.PortalWebResourcesUtil" %><%@ page import="com.liferay.portal.kernel.workflow.WorkflowConstants" %><%@ page import="com.liferay.portal.kernel.workflow.WorkflowDefinition" %><%@ page import="com.liferay.portal.kernel.workflow.WorkflowDefinitionManagerUtil" %><%@ diff --git a/portal-web/docroot/html/common/themes/top_js.jspf b/portal-web/docroot/html/common/themes/top_js.jspf index f3059a199eb0ac..63358e7cf3edd6 100644 --- a/portal-web/docroot/html/common/themes/top_js.jspf +++ b/portal-web/docroot/html/common/themes/top_js.jspf @@ -262,7 +262,7 @@ Liferay.AUI = { <% - long javaScriptLastModified = ServletContextUtil.getLastModified(application, "/html/js/", true); + long javaScriptLastModified = PortalWebResourcesUtil.getLastModified(); %> getAvailableLangPath: function() { From 8520775dc7fc8c03c3aae6dd5c07879609523048 Mon Sep 17 00:00:00 2001 From: Raymond Auge Date: Thu, 26 Mar 2015 22:01:31 -0400 Subject: [PATCH 17/41] LPS-54480 SEMVER --- portal-service/src/com/liferay/portal/kernel/web/packageinfo | 1 + 1 file changed, 1 insertion(+) create mode 100644 portal-service/src/com/liferay/portal/kernel/web/packageinfo diff --git a/portal-service/src/com/liferay/portal/kernel/web/packageinfo b/portal-service/src/com/liferay/portal/kernel/web/packageinfo new file mode 100644 index 00000000000000..e470f7cd31c815 --- /dev/null +++ b/portal-service/src/com/liferay/portal/kernel/web/packageinfo @@ -0,0 +1 @@ +version 7.0.0 \ No newline at end of file From 8c2e111ef29cdeb89263be8c90715b9d2a77c809 Mon Sep 17 00:00:00 2001 From: "michael.bradford@liferay.com" Date: Wed, 11 Mar 2015 17:35:31 -0700 Subject: [PATCH 18/41] LPS-54480 - remove old JS paths from gitignore --- .gitignore | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.gitignore b/.gitignore index 4c9635040cd9a5..1858e14a949cfd 100644 --- a/.gitignore +++ b/.gitignore @@ -161,13 +161,6 @@ cobertura.ser /portal-web/docroot/html/icons/_sprite.* -/portal-web/docroot/html/js/aui - -/portal-web/docroot/html/js/editor/alloyeditor -/portal-web/docroot/html/js/editor/ckeditor -/portal-web/docroot/html/js/editor/codepress -/portal-web/docroot/html/js/editor/tiny_mce - /portal-web/docroot/html/themes/_unstyled/css/aui /portal-web/docroot/html/themes/_unstyled/images/aui From 3ee3a386fd8154e9acce3615df42ba398a622ed2 Mon Sep 17 00:00:00 2001 From: Raymond Auge Date: Tue, 14 Apr 2015 12:17:01 -0400 Subject: [PATCH 19/41] LPS-54480 re-add ignores --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 1858e14a949cfd..4c9635040cd9a5 100644 --- a/.gitignore +++ b/.gitignore @@ -161,6 +161,13 @@ cobertura.ser /portal-web/docroot/html/icons/_sprite.* +/portal-web/docroot/html/js/aui + +/portal-web/docroot/html/js/editor/alloyeditor +/portal-web/docroot/html/js/editor/ckeditor +/portal-web/docroot/html/js/editor/codepress +/portal-web/docroot/html/js/editor/tiny_mce + /portal-web/docroot/html/themes/_unstyled/css/aui /portal-web/docroot/html/themes/_unstyled/images/aui From aa77efff4f83a3e6c264fc68c91f4dc042328e8a Mon Sep 17 00:00:00 2001 From: Raymond Auge Date: Tue, 14 Apr 2015 12:21:50 -0400 Subject: [PATCH 20/41] LPS-54480 SF manual --- .../src/META-INF/resources/html/js/editor/alloyeditor.jsp | 2 +- .../src/META-INF/resources/html/js/editor/bbcode.jsp | 2 +- .../src/META-INF/resources/html/js/editor/ckeditor.jsp | 2 +- .../src/META-INF/resources/html/js/editor/simple.jsp | 2 +- .../src/META-INF/resources/html/js/editor/tinymce.jsp | 2 +- .../src/META-INF/resources/html/js/editor/tinymce_simple.jsp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/alloyeditor.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/alloyeditor.jsp index a20fe4c81e46a9..8ae6fc09cfcd83 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/alloyeditor.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/alloyeditor.jsp @@ -14,7 +14,7 @@ */ --%> -<%@ include file="init.jsp" %> +<%@ include file="/html/js/editor/init.jsp" %> <% String portletId = portletDisplay.getRootPortletId(); diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/bbcode.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/bbcode.jsp index 7b08f1c5e40422..ce7c9e1bccc6dd 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/bbcode.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/bbcode.jsp @@ -14,7 +14,7 @@ */ --%> -<%@ include file="init.jsp" %> +<%@ include file="/html/js/editor/init.jsp" %> <% String cssClass = GetterUtil.getString((String)request.getAttribute("liferay-ui:input-editor:cssClass")); diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor.jsp index 6ab2e482d2f88a..5401bcd6727139 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor.jsp @@ -14,7 +14,7 @@ */ --%> -<%@ include file="init.jsp" %> +<%@ include file="/html/js/editor/init.jsp" %> <% LiferayPortletResponse liferayPortletResponse = (LiferayPortletResponse)portletResponse; diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/simple.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/simple.jsp index d4f89b5e29a1ab..e67d9334cc0c38 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/simple.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/simple.jsp @@ -14,7 +14,7 @@ */ --%> -<%@ include file="init.jsp" %> +<%@ include file="/html/js/editor/init.jsp" %> <% String portletId = portletDisplay.getRootPortletId(); diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce.jsp index fd6329e4a0cae9..475beb7fb063b8 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce.jsp @@ -14,7 +14,7 @@ */ --%> -<%@ include file="init.jsp" %> +<%@ include file="/html/js/editor/init.jsp" %> <% String portletId = portletDisplay.getRootPortletId(); diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce_simple.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce_simple.jsp index ba6c87fd057100..8245c52a839fac 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce_simple.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/tinymce_simple.jsp @@ -14,7 +14,7 @@ */ --%> -<%@ include file="init.jsp" %> +<%@ include file="/html/js/editor/init.jsp" %> <% String portletId = portletDisplay.getRootPortletId(); From 6e1f6208516d54d2c285d5919655ba2eec80e374 Mon Sep 17 00:00:00 2001 From: Raymond Auge Date: Tue, 14 Apr 2015 12:24:21 -0400 Subject: [PATCH 21/41] LPS-54480 sort --- portal-web/build.xml | 58 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/portal-web/build.xml b/portal-web/build.xml index 7290dacf0013aa..9a40ebacd8e2a1 100644 --- a/portal-web/build.xml +++ b/portal-web/build.xml @@ -111,6 +111,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -173,35 +202,6 @@ /> - - - - - - - - - - - - - - - - - - - - - - - - - - From d8e9ff42ba11484f160fdd48f9d1fc9bdef14f31 Mon Sep 17 00:00:00 2001 From: "michael.bradford@liferay.com" Date: Tue, 14 Apr 2015 10:49:13 -0700 Subject: [PATCH 22/41] LPS-54480 - adjust ServletPathsTest.testConstructor test now that ServletPaths does not strip the root path --- .../portal/servlet/filters/aggregate/ServletPathsTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/portal-impl/test/unit/com/liferay/portal/servlet/filters/aggregate/ServletPathsTest.java b/portal-impl/test/unit/com/liferay/portal/servlet/filters/aggregate/ServletPathsTest.java index 0ba46eec5db83a..282280da2e33ad 100644 --- a/portal-impl/test/unit/com/liferay/portal/servlet/filters/aggregate/ServletPathsTest.java +++ b/portal-impl/test/unit/com/liferay/portal/servlet/filters/aggregate/ServletPathsTest.java @@ -91,10 +91,8 @@ public void testConstructor() throws MalformedURLException { ServletContext servletContext = _prepareServletContext( new MockServletContext()); - String rootPath = ServletContextUtil.getRootPath(servletContext); - ServletPaths servletPaths = new ServletPaths( - servletContext, rootPath + "/test1/test2/"); + servletContext, "/test1/test2/"); Assert.assertEquals("/test1/test2/", servletPaths.getResourcePath()); From 22ce024cfb35dd25b89d2605d0bf1de947e1f5d6 Mon Sep 17 00:00:00 2001 From: "michael.bradford@liferay.com" Date: Tue, 14 Apr 2015 11:40:50 -0700 Subject: [PATCH 23/41] LPS-54480 - SF --- modules/frontend/frontend-js-web/build.xml | 2 +- .../src/META-INF/resources/html/js/editor/init.jsp | 8 +++----- .../frontend/js/web/DefaultPortalWebResources.java | 11 +++++------ .../servlet/filters/aggregate/AggregateFilter.java | 5 ++--- .../com/liferay/portal/tools/SassToCssBuilder.java | 5 ++--- .../portal/kernel/web/PortalWebResourcesUtil.java | 4 ++-- portal-web/docroot/html/common/init.jsp | 1 - 7 files changed, 15 insertions(+), 21 deletions(-) diff --git a/modules/frontend/frontend-js-web/build.xml b/modules/frontend/frontend-js-web/build.xml index 74830c8f86c112..da6911ee6aba76 100644 --- a/modules/frontend/frontend-js-web/build.xml +++ b/modules/frontend/frontend-js-web/build.xml @@ -385,4 +385,4 @@ module.dir="${basedir}" /> - + \ No newline at end of file diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/init.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/init.jsp index 814eaf0138fd75..2d5822ca556801 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/init.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/init.jsp @@ -25,7 +25,6 @@ <%@ page import="com.liferay.portal.kernel.json.JSONObject" %><%@ page import="com.liferay.portal.kernel.language.LanguageUtil" %><%@ -page import="com.liferay.portal.kernel.portlet.LiferayPortletRequest" %><%@ page import="com.liferay.portal.kernel.portlet.LiferayPortletResponse" %><%@ page import="com.liferay.portal.kernel.portlet.LiferayWindowState" %><%@ page import="com.liferay.portal.kernel.servlet.ServletContextUtil" %><%@ @@ -42,7 +41,6 @@ page import="com.liferay.portal.kernel.util.TextFormatter" %><%@ page import="com.liferay.portal.kernel.util.UnicodeFormatter" %><%@ page import="com.liferay.portal.kernel.util.Validator" %><%@ page import="com.liferay.portal.kernel.web.PortalWebResourcesUtil" %><%@ -page import="com.liferay.portal.theme.ThemeDisplay" %><%@ page import="com.liferay.portal.util.PortalUtil" %><%@ page import="com.liferay.portal.util.PortletKeys" %><%@ page import="com.liferay.portal.util.SessionClicks" %><%@ @@ -53,9 +51,9 @@ page import="com.liferay.util.Encryptor" %> page import="java.util.Map" %><%@ page import="java.util.Set" %> -<%@ page import="javax.portlet.PortletURL" %><%@ -page import="javax.portlet.PortletRequest" %><%@ -page import="javax.portlet.PortletResponse" %> +<%@ page import="javax.portlet.PortletRequest" %><%@ +page import="javax.portlet.PortletResponse" %><%@ +page import="javax.portlet.PortletURL" %> diff --git a/modules/frontend/frontend-js-web/src/com/liferay/frontend/js/web/DefaultPortalWebResources.java b/modules/frontend/frontend-js-web/src/com/liferay/frontend/js/web/DefaultPortalWebResources.java index fbe38fd2305a5e..fa348b3123d522 100644 --- a/modules/frontend/frontend-js-web/src/com/liferay/frontend/js/web/DefaultPortalWebResources.java +++ b/modules/frontend/frontend-js-web/src/com/liferay/frontend/js/web/DefaultPortalWebResources.java @@ -34,17 +34,17 @@ public class DefaultPortalWebResources implements PortalWebResources { public String getContextPath() { return _servletContext.getContextPath(); } - - @Override - public ServletContext getServletContext() { - return _servletContext; - } @Override public long getLastModified() { return _bundle.getLastModified(); } + @Override + public ServletContext getServletContext() { + return _servletContext; + } + @Activate protected void activate(BundleContext bundleContext) { _bundle = bundleContext.getBundle(); @@ -60,5 +60,4 @@ protected void setServletContext(ServletContext servletContext) { private Bundle _bundle; private ServletContext _servletContext; - } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java b/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java index 7b9faeea95b95b..966492948c0eb6 100644 --- a/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java +++ b/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java @@ -262,7 +262,7 @@ protected Object getBundleContent( PropsKeys.JAVASCRIPT_BUNDLE_DIR, new Filter(bundleId)); ServletContext resourceServeletContext = - PortalWebResourcesUtil.getServletContext(); + PortalWebResourcesUtil.getServletContext(); URL bundleDirURL = resourceServeletContext.getResource(bundleDirName); @@ -524,14 +524,13 @@ protected boolean isModuleRequest(HttpServletRequest request) { String frontEndContextPath = PortalWebResourcesUtil.getContextPath(); - if(requestURI.startsWith(frontEndContextPath)){ + if (requestURI.startsWith(frontEndContextPath)) { return false; } return super.isModuleRequest(request); } - @Override protected void processFilter( HttpServletRequest request, HttpServletResponse response, diff --git a/portal-impl/src/com/liferay/portal/tools/SassToCssBuilder.java b/portal-impl/src/com/liferay/portal/tools/SassToCssBuilder.java index bed16702b4d659..510b399bdae6b0 100644 --- a/portal-impl/src/com/liferay/portal/tools/SassToCssBuilder.java +++ b/portal-impl/src/com/liferay/portal/tools/SassToCssBuilder.java @@ -160,9 +160,8 @@ private void _collectSassFiles( new String[] { "**\\_diffs\\**", "**\\.sass-cache*\\**", "**\\.sass_cache_*\\**", "**\\_sass_cache_*\\**", - "**\\_styled\\**", "**\\_unstyled\\**", - "**\\tiny_mce\\**", "**\\ckeditor\\**", - "**\\alloyeditor\\**" + "**\\_styled\\**", "**\\_unstyled\\**", "**\\tiny_mce\\**", + "**\\ckeditor\\**", "**\\alloyeditor\\**" }); directoryScanner.setIncludes(new String[] {"**\\*.css"}); diff --git a/portal-service/src/com/liferay/portal/kernel/web/PortalWebResourcesUtil.java b/portal-service/src/com/liferay/portal/kernel/web/PortalWebResourcesUtil.java index 977faaf57c4d83..075b44d3f83e62 100644 --- a/portal-service/src/com/liferay/portal/kernel/web/PortalWebResourcesUtil.java +++ b/portal-service/src/com/liferay/portal/kernel/web/PortalWebResourcesUtil.java @@ -14,12 +14,12 @@ package com.liferay.portal.kernel.web; -import javax.servlet.ServletContext; - import com.liferay.registry.Registry; import com.liferay.registry.RegistryUtil; import com.liferay.registry.ServiceTracker; +import javax.servlet.ServletContext; + /** * @author Peter Fellwock */ diff --git a/portal-web/docroot/html/common/init.jsp b/portal-web/docroot/html/common/init.jsp index df6a5db20a4b87..a96f01fda6ee32 100644 --- a/portal-web/docroot/html/common/init.jsp +++ b/portal-web/docroot/html/common/init.jsp @@ -98,7 +98,6 @@ page import="com.liferay.portal.kernel.servlet.BufferCacheServletResponse" %><%@ page import="com.liferay.portal.kernel.servlet.MultiSessionMessages" %><%@ page import="com.liferay.portal.kernel.servlet.PortalMessages" %><%@ page import="com.liferay.portal.kernel.servlet.ServletContextPool" %><%@ -page import="com.liferay.portal.kernel.servlet.ServletContextUtil" %><%@ page import="com.liferay.portal.kernel.servlet.SessionErrors" %><%@ page import="com.liferay.portal.kernel.servlet.SessionMessages" %><%@ page import="com.liferay.portal.kernel.servlet.taglib.ui.MenuItem" %><%@ From 99b3073cb0573aaa21ebe09fb1fec026cc8829a5 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 14 Apr 2015 14:45:19 -0700 Subject: [PATCH 24/41] LPS-54480 Typo --- .../portal/servlet/filters/aggregate/AggregateFilter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java b/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java index 966492948c0eb6..ca45438e25fd1a 100644 --- a/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java +++ b/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java @@ -261,10 +261,10 @@ protected Object getBundleContent( String bundleDirName = PropsUtil.get( PropsKeys.JAVASCRIPT_BUNDLE_DIR, new Filter(bundleId)); - ServletContext resourceServeletContext = + ServletContext resourceServletContext = PortalWebResourcesUtil.getServletContext(); - URL bundleDirURL = resourceServeletContext.getResource(bundleDirName); + URL bundleDirURL = resourceServletContext.getResource(bundleDirName); if (bundleDirURL == null) { return null; @@ -280,7 +280,7 @@ protected Object getBundleContent( boolean staleCache = false; for (String fileName : fileNames) { - URL resourceURL = resourceServeletContext.getResource( + URL resourceURL = resourceServletContext.getResource( bundleDirName.concat(StringPool.SLASH).concat(fileName)); if (resourceURL == null) { @@ -316,7 +316,7 @@ protected Object getBundleContent( } else { content = aggregateJavaScript( - new ServletPaths(resourceServeletContext, bundleDirName), + new ServletPaths(resourceServletContext, bundleDirName), fileNames); } From 7ff13a6e792f144eabbc6a269412394379e0ebd8 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 14 Apr 2015 14:47:59 -0700 Subject: [PATCH 25/41] LPS-54480 tmp is better --- portal-impl/src/com/liferay/portal/tools/SassToCssBuilder.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/portal-impl/src/com/liferay/portal/tools/SassToCssBuilder.java b/portal-impl/src/com/liferay/portal/tools/SassToCssBuilder.java index 510b399bdae6b0..fc1e554ec2baae 100644 --- a/portal-impl/src/com/liferay/portal/tools/SassToCssBuilder.java +++ b/portal-impl/src/com/liferay/portal/tools/SassToCssBuilder.java @@ -160,8 +160,7 @@ private void _collectSassFiles( new String[] { "**\\_diffs\\**", "**\\.sass-cache*\\**", "**\\.sass_cache_*\\**", "**\\_sass_cache_*\\**", - "**\\_styled\\**", "**\\_unstyled\\**", "**\\tiny_mce\\**", - "**\\ckeditor\\**", "**\\alloyeditor\\**" + "**\\_styled\\**", "**\\_unstyled\\**", "**\\tmp\\**" }); directoryScanner.setIncludes(new String[] {"**\\*.css"}); From 853e3319d130f4cd4565e102d4027e64a06fbec9 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 14 Apr 2015 14:48:51 -0700 Subject: [PATCH 26/41] LPS-54480 SF --- .../META-INF/resources/html/js/editor/ckeditor_bbcode.jsp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_bbcode.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_bbcode.jsp index c8537ae0d920f6..6ecb20b8e7716c 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_bbcode.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_bbcode.jsp @@ -18,10 +18,6 @@ <%@ page import="com.liferay.portal.kernel.web.PortalWebResourcesUtil" %> -<% - String ckeditorPath = PortalWebResourcesUtil.getContextPath() + "/html/js/editor/ckeditor.jsp"; -%> - - + \ No newline at end of file From 79ba1d503b7d3c54e4c47fbaf7a3c4b032a12ea4 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 14 Apr 2015 14:49:08 -0700 Subject: [PATCH 27/41] LPS-54480 SF --- .../META-INF/resources/html/js/editor/ckeditor_creole.jsp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_creole.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_creole.jsp index b084b99dc00858..5a6514da563621 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_creole.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_creole.jsp @@ -18,11 +18,7 @@ <%@ page import="com.liferay.portal.kernel.web.PortalWebResourcesUtil" %> -<% - String ckeditorPath = PortalWebResourcesUtil.getContextPath() + "/html/js/editor/ckeditor.jsp"; -%> - - + \ No newline at end of file From 2fc77955420864cb3884c2ce1d51c81a1dacb91a Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 14 Apr 2015 14:53:47 -0700 Subject: [PATCH 28/41] LPS-54480 SF --- modules/frontend/frontend-js-web/bnd.bnd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/frontend/frontend-js-web/bnd.bnd b/modules/frontend/frontend-js-web/bnd.bnd index 3674055bd6e8e6..857d2cdcc89dd3 100644 --- a/modules/frontend/frontend-js-web/bnd.bnd +++ b/modules/frontend/frontend-js-web/bnd.bnd @@ -1,4 +1,4 @@ -Bundle-Name: Liferay Front End JS Web +Bundle-Name: Liferay Frontend JS Web Bundle-SymbolicName: com.liferay.frontend.js.web Bundle-Version: 1.0.0 Import-Package:\ From 3b2171018a67ca70a4a339974a92268cad7bda7d Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 14 Apr 2015 14:59:58 -0700 Subject: [PATCH 29/41] LPS-54480 SF --- modules/frontend/frontend-js-web/build.xml | 54 +++++++++++----------- portal-web/build.xml | 11 ++--- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/modules/frontend/frontend-js-web/build.xml b/modules/frontend/frontend-js-web/build.xml index da6911ee6aba76..70f20d9ae11d1b 100644 --- a/modules/frontend/frontend-js-web/build.xml +++ b/modules/frontend/frontend-js-web/build.xml @@ -8,9 +8,9 @@ - + - + @@ -19,7 +19,7 @@ - + @@ -31,7 +31,7 @@ @@ -44,7 +44,7 @@ ${alloy.file} - + @@ -129,7 +129,7 @@ - + @@ -141,7 +141,7 @@ @@ -150,21 +150,21 @@ ${alloyeditor.file} - + - + - + @@ -174,17 +174,17 @@ - + - + @@ -193,16 +193,16 @@ - + - + @@ -210,7 +210,7 @@ @@ -310,17 +310,17 @@ ]]> - ${creole_parser.content} + ${creole_parser.content} - + @@ -328,18 +328,18 @@ - + @@ -347,7 +347,7 @@ @@ -355,7 +355,7 @@ @@ -363,7 +363,7 @@ - + @@ -372,7 +372,7 @@ - + diff --git a/portal-web/build.xml b/portal-web/build.xml index 9a40ebacd8e2a1..9eedd0c93b589d 100644 --- a/portal-web/build.xml +++ b/portal-web/build.xml @@ -7,10 +7,9 @@ + - - @@ -140,7 +139,7 @@ - + @@ -151,7 +150,7 @@ - + @@ -163,7 +162,7 @@ @@ -390,7 +389,7 @@ ${ide.js.content} - + From 833a75aed801361875f3e0660fb612021d107a6d Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 14 Apr 2015 15:10:29 -0700 Subject: [PATCH 30/41] LPS-54480 SF --- modules/frontend/frontend-js-web/build.xml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/frontend/frontend-js-web/build.xml b/modules/frontend/frontend-js-web/build.xml index 70f20d9ae11d1b..64dfd6d770bd01 100644 --- a/modules/frontend/frontend-js-web/build.xml +++ b/modules/frontend/frontend-js-web/build.xml @@ -6,6 +6,7 @@ + @@ -15,9 +16,6 @@ - - - @@ -44,12 +42,12 @@ ${alloy.file} - + - - + + - + From 7b3de897fdbb6fc39f6e1f2fb21ad75893bb1b68 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 14 Apr 2015 15:11:24 -0700 Subject: [PATCH 31/41] LPS-54480 SF --- modules/frontend/frontend-js-web/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/frontend/frontend-js-web/build.xml b/modules/frontend/frontend-js-web/build.xml index 64dfd6d770bd01..49398c3021b4af 100644 --- a/modules/frontend/frontend-js-web/build.xml +++ b/modules/frontend/frontend-js-web/build.xml @@ -37,7 +37,7 @@ - + ${alloy.file} From ada3825ae3826d28b749b1009acbf9558323ec90 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 14 Apr 2015 15:12:19 -0700 Subject: [PATCH 32/41] LPS-54480 SF --- modules/frontend/frontend-js-web/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/frontend/frontend-js-web/build.xml b/modules/frontend/frontend-js-web/build.xml index 49398c3021b4af..efcf95bd244517 100644 --- a/modules/frontend/frontend-js-web/build.xml +++ b/modules/frontend/frontend-js-web/build.xml @@ -56,7 +56,7 @@ /> - + Date: Tue, 14 Apr 2015 15:12:46 -0700 Subject: [PATCH 33/41] LPS-54480 SF --- modules/frontend/frontend-js-web/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/frontend/frontend-js-web/build.xml b/modules/frontend/frontend-js-web/build.xml index efcf95bd244517..b3da2e42e85fee 100644 --- a/modules/frontend/frontend-js-web/build.xml +++ b/modules/frontend/frontend-js-web/build.xml @@ -83,7 +83,7 @@ - + Date: Tue, 14 Apr 2015 15:15:17 -0700 Subject: [PATCH 34/41] LPS-54480 SF --- modules/frontend/frontend-js-web/build.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/frontend/frontend-js-web/build.xml b/modules/frontend/frontend-js-web/build.xml index b3da2e42e85fee..06df701b698027 100644 --- a/modules/frontend/frontend-js-web/build.xml +++ b/modules/frontend/frontend-js-web/build.xml @@ -37,17 +37,20 @@ - ${alloy.file} - + + + + + - - + + - + From 034cb6588f4e05d963867049e4f78ebb86ed17df Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 14 Apr 2015 15:15:55 -0700 Subject: [PATCH 35/41] LPS-54480 SF --- modules/frontend/frontend-js-web/build.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/frontend/frontend-js-web/build.xml b/modules/frontend/frontend-js-web/build.xml index 06df701b698027..cdfe260060b44e 100644 --- a/modules/frontend/frontend-js-web/build.xml +++ b/modules/frontend/frontend-js-web/build.xml @@ -68,6 +68,7 @@ + @@ -82,6 +83,7 @@ + From 35572297c0ae7fe474e49c241a1e397ff3e862a9 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 14 Apr 2015 15:19:46 -0700 Subject: [PATCH 36/41] LPS-54480 Fix editor path --- modules/frontend/frontend-js-web/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/frontend/frontend-js-web/build.xml b/modules/frontend/frontend-js-web/build.xml index cdfe260060b44e..19d137a840475e 100644 --- a/modules/frontend/frontend-js-web/build.xml +++ b/modules/frontend/frontend-js-web/build.xml @@ -217,7 +217,7 @@ src="http://www.ivan.fomichev.name/2008/04/javascript-creole-10-wiki-markup-parser.html" /> - + - - ${creole_parser.content} - - From 2ed08b63c2a452783987258838182b24c54d9a7c Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 14 Apr 2015 15:29:35 -0700 Subject: [PATCH 38/41] LPS-54480 SF --- .../portal/servlet/filters/aggregate/AggregateFilter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java b/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java index ca45438e25fd1a..76c5d072a9d0b1 100644 --- a/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java +++ b/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java @@ -522,9 +522,9 @@ protected String getJavaScriptContent(URL resourceURL) throws IOException { protected boolean isModuleRequest(HttpServletRequest request) { String requestURI = request.getRequestURI(); - String frontEndContextPath = PortalWebResourcesUtil.getContextPath(); + String frontendContextPath = PortalWebResourcesUtil.getContextPath(); - if (requestURI.startsWith(frontEndContextPath)) { + if (requestURI.startsWith(frontendContextPath)) { return false; } From 9cd59becb76ad66ebcbe58329ff8fd5c923736c2 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 14 Apr 2015 15:37:00 -0700 Subject: [PATCH 39/41] LPS-54480 Not thrown --- .../portal/servlet/filters/aggregate/ServletPaths.java | 5 +---- .../portal/servlet/filters/aggregate/ServletPathsTest.java | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/ServletPaths.java b/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/ServletPaths.java index 044bf1b467d4ae..8e1271a6465ef9 100644 --- a/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/ServletPaths.java +++ b/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/ServletPaths.java @@ -23,7 +23,6 @@ import java.io.IOException; -import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; @@ -52,9 +51,7 @@ public static String getParentPath(String resourcePath) { return resourcePath; } - public ServletPaths(ServletContext servletContext, String resourcePath) - throws MalformedURLException { - + public ServletPaths(ServletContext servletContext, String resourcePath) { if (servletContext == null) { throw new NullPointerException("Servlet context is null"); } diff --git a/portal-impl/test/unit/com/liferay/portal/servlet/filters/aggregate/ServletPathsTest.java b/portal-impl/test/unit/com/liferay/portal/servlet/filters/aggregate/ServletPathsTest.java index 282280da2e33ad..97c90c55621670 100644 --- a/portal-impl/test/unit/com/liferay/portal/servlet/filters/aggregate/ServletPathsTest.java +++ b/portal-impl/test/unit/com/liferay/portal/servlet/filters/aggregate/ServletPathsTest.java @@ -69,7 +69,7 @@ public static void tearDownClass() { } @Test - public void testConstructor() throws MalformedURLException { + public void testConstructor() { try { new ServletPaths(null, null); @@ -102,7 +102,7 @@ public void testConstructor() throws MalformedURLException { } @Test - public void testDown() throws MalformedURLException { + public void testDown() { ServletContext servletContext = _prepareServletContext( new MockServletContext()); From 43238f816de8acac866692ea20d8f4b48424e378 Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 14 Apr 2015 15:40:15 -0700 Subject: [PATCH 40/41] LPS-54480 Move --- .../src/META-INF/resources/html/js/editor/ckeditor_bbcode.jsp | 2 +- .../src/META-INF/resources/html/js/editor/ckeditor_creole.jsp | 2 +- .../src/META-INF/resources/html/js/editor/init.jsp | 2 +- .../com/liferay/frontend/js/web/DefaultPortalWebResources.java | 2 +- portal-impl/src/com/liferay/portal/events/ServicePreAction.java | 2 +- .../portal/servlet/filters/aggregate/AggregateFilter.java | 2 +- .../portal/kernel/{web => servlet}/PortalWebResources.java | 2 +- .../portal/kernel/{web => servlet}/PortalWebResourcesUtil.java | 2 +- portal-service/src/com/liferay/portal/kernel/web/packageinfo | 1 - portal-web/docroot/html/common/init.jsp | 2 +- util-taglib/src/com/liferay/taglib/FileAvailabilityUtil.java | 2 +- 11 files changed, 10 insertions(+), 11 deletions(-) rename portal-service/src/com/liferay/portal/kernel/{web => servlet}/PortalWebResources.java (94%) rename portal-service/src/com/liferay/portal/kernel/{web => servlet}/PortalWebResourcesUtil.java (97%) delete mode 100644 portal-service/src/com/liferay/portal/kernel/web/packageinfo diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_bbcode.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_bbcode.jsp index 6ecb20b8e7716c..f6ed07077db047 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_bbcode.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_bbcode.jsp @@ -16,7 +16,7 @@ <%@ taglib uri="http://liferay.com/tld/util" prefix="liferay-util" %> -<%@ page import="com.liferay.portal.kernel.web.PortalWebResourcesUtil" %> +<%@ page import="com.liferay.portal.kernel.servlet.PortalWebResourcesUtil" %> diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_creole.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_creole.jsp index 5a6514da563621..7a4ee15f3ced77 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_creole.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/ckeditor_creole.jsp @@ -16,7 +16,7 @@ <%@ taglib uri="http://liferay.com/tld/util" prefix="liferay-util" %> -<%@ page import="com.liferay.portal.kernel.web.PortalWebResourcesUtil" %> +<%@ page import="com.liferay.portal.kernel.servlet.PortalWebResourcesUtil" %> diff --git a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/init.jsp b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/init.jsp index 2d5822ca556801..b01462ff0c9d27 100644 --- a/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/init.jsp +++ b/modules/frontend/frontend-js-web/src/META-INF/resources/html/js/editor/init.jsp @@ -27,6 +27,7 @@ page import="com.liferay.portal.kernel.language.LanguageUtil" %><%@ page import="com.liferay.portal.kernel.portlet.LiferayPortletResponse" %><%@ page import="com.liferay.portal.kernel.portlet.LiferayWindowState" %><%@ +page import="com.liferay.portal.kernel.servlet.PortalWebResourcesUtil" %><%@ page import="com.liferay.portal.kernel.servlet.ServletContextUtil" %><%@ page import="com.liferay.portal.kernel.util.GetterUtil" %><%@ page import="com.liferay.portal.kernel.util.HtmlUtil" %><%@ @@ -40,7 +41,6 @@ page import="com.liferay.portal.kernel.util.StringPool" %><%@ page import="com.liferay.portal.kernel.util.TextFormatter" %><%@ page import="com.liferay.portal.kernel.util.UnicodeFormatter" %><%@ page import="com.liferay.portal.kernel.util.Validator" %><%@ -page import="com.liferay.portal.kernel.web.PortalWebResourcesUtil" %><%@ page import="com.liferay.portal.util.PortalUtil" %><%@ page import="com.liferay.portal.util.PortletKeys" %><%@ page import="com.liferay.portal.util.SessionClicks" %><%@ diff --git a/modules/frontend/frontend-js-web/src/com/liferay/frontend/js/web/DefaultPortalWebResources.java b/modules/frontend/frontend-js-web/src/com/liferay/frontend/js/web/DefaultPortalWebResources.java index fa348b3123d522..8ded715ff985f5 100644 --- a/modules/frontend/frontend-js-web/src/com/liferay/frontend/js/web/DefaultPortalWebResources.java +++ b/modules/frontend/frontend-js-web/src/com/liferay/frontend/js/web/DefaultPortalWebResources.java @@ -14,7 +14,7 @@ package com.liferay.frontend.js.web; -import com.liferay.portal.kernel.web.PortalWebResources; +import com.liferay.portal.kernel.servlet.PortalWebResources; import javax.servlet.ServletContext; diff --git a/portal-impl/src/com/liferay/portal/events/ServicePreAction.java b/portal-impl/src/com/liferay/portal/events/ServicePreAction.java index e6f81de1966a3d..cf0c6036466a17 100644 --- a/portal-impl/src/com/liferay/portal/events/ServicePreAction.java +++ b/portal-impl/src/com/liferay/portal/events/ServicePreAction.java @@ -30,6 +30,7 @@ import com.liferay.portal.kernel.portlet.LiferayWindowState; import com.liferay.portal.kernel.servlet.BrowserSnifferUtil; import com.liferay.portal.kernel.servlet.HttpHeaders; +import com.liferay.portal.kernel.servlet.PortalWebResourcesUtil; import com.liferay.portal.kernel.servlet.SessionErrors; import com.liferay.portal.kernel.util.ColorSchemeFactoryUtil; import com.liferay.portal.kernel.util.CookieKeys; @@ -46,7 +47,6 @@ import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.UnicodeProperties; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.kernel.web.PortalWebResourcesUtil; import com.liferay.portal.model.ColorScheme; import com.liferay.portal.model.Company; import com.liferay.portal.model.Group; diff --git a/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java b/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java index 76c5d072a9d0b1..82cfd7cf8802d6 100644 --- a/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java +++ b/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java @@ -22,6 +22,7 @@ import com.liferay.portal.kernel.servlet.BrowserSniffer; import com.liferay.portal.kernel.servlet.BufferCacheServletResponse; import com.liferay.portal.kernel.servlet.HttpHeaders; +import com.liferay.portal.kernel.servlet.PortalWebResourcesUtil; import com.liferay.portal.kernel.servlet.ServletResponseUtil; import com.liferay.portal.kernel.util.ArrayUtil; import com.liferay.portal.kernel.util.CharPool; @@ -35,7 +36,6 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.kernel.web.PortalWebResourcesUtil; import com.liferay.portal.minifier.MinifierUtil; import com.liferay.portal.servlet.filters.IgnoreModuleRequestFilter; import com.liferay.portal.servlet.filters.dynamiccss.DynamicCSSUtil; diff --git a/portal-service/src/com/liferay/portal/kernel/web/PortalWebResources.java b/portal-service/src/com/liferay/portal/kernel/servlet/PortalWebResources.java similarity index 94% rename from portal-service/src/com/liferay/portal/kernel/web/PortalWebResources.java rename to portal-service/src/com/liferay/portal/kernel/servlet/PortalWebResources.java index d080d46a248956..4ffeab46487f4b 100644 --- a/portal-service/src/com/liferay/portal/kernel/web/PortalWebResources.java +++ b/portal-service/src/com/liferay/portal/kernel/servlet/PortalWebResources.java @@ -12,7 +12,7 @@ * details. */ -package com.liferay.portal.kernel.web; +package com.liferay.portal.kernel.servlet; import javax.servlet.ServletContext; diff --git a/portal-service/src/com/liferay/portal/kernel/web/PortalWebResourcesUtil.java b/portal-service/src/com/liferay/portal/kernel/servlet/PortalWebResourcesUtil.java similarity index 97% rename from portal-service/src/com/liferay/portal/kernel/web/PortalWebResourcesUtil.java rename to portal-service/src/com/liferay/portal/kernel/servlet/PortalWebResourcesUtil.java index 075b44d3f83e62..601862175e8dc1 100644 --- a/portal-service/src/com/liferay/portal/kernel/web/PortalWebResourcesUtil.java +++ b/portal-service/src/com/liferay/portal/kernel/servlet/PortalWebResourcesUtil.java @@ -12,7 +12,7 @@ * details. */ -package com.liferay.portal.kernel.web; +package com.liferay.portal.kernel.servlet; import com.liferay.registry.Registry; import com.liferay.registry.RegistryUtil; diff --git a/portal-service/src/com/liferay/portal/kernel/web/packageinfo b/portal-service/src/com/liferay/portal/kernel/web/packageinfo deleted file mode 100644 index e470f7cd31c815..00000000000000 --- a/portal-service/src/com/liferay/portal/kernel/web/packageinfo +++ /dev/null @@ -1 +0,0 @@ -version 7.0.0 \ No newline at end of file diff --git a/portal-web/docroot/html/common/init.jsp b/portal-web/docroot/html/common/init.jsp index a96f01fda6ee32..aab5dc126991fd 100644 --- a/portal-web/docroot/html/common/init.jsp +++ b/portal-web/docroot/html/common/init.jsp @@ -97,6 +97,7 @@ page import="com.liferay.portal.kernel.servlet.BrowserSnifferUtil" %><%@ page import="com.liferay.portal.kernel.servlet.BufferCacheServletResponse" %><%@ page import="com.liferay.portal.kernel.servlet.MultiSessionMessages" %><%@ page import="com.liferay.portal.kernel.servlet.PortalMessages" %><%@ +page import="com.liferay.portal.kernel.servlet.PortalWebResourcesUtil" %><%@ page import="com.liferay.portal.kernel.servlet.ServletContextPool" %><%@ page import="com.liferay.portal.kernel.servlet.SessionErrors" %><%@ page import="com.liferay.portal.kernel.servlet.SessionMessages" %><%@ @@ -154,7 +155,6 @@ page import="com.liferay.portal.kernel.util.Tuple" %><%@ page import="com.liferay.portal.kernel.util.UnicodeFormatter" %><%@ page import="com.liferay.portal.kernel.util.UnicodeProperties" %><%@ page import="com.liferay.portal.kernel.util.Validator" %><%@ -page import="com.liferay.portal.kernel.web.PortalWebResourcesUtil" %><%@ page import="com.liferay.portal.kernel.workflow.WorkflowConstants" %><%@ page import="com.liferay.portal.kernel.workflow.WorkflowDefinition" %><%@ page import="com.liferay.portal.kernel.workflow.WorkflowDefinitionManagerUtil" %><%@ diff --git a/util-taglib/src/com/liferay/taglib/FileAvailabilityUtil.java b/util-taglib/src/com/liferay/taglib/FileAvailabilityUtil.java index 05f10c129f7f63..931e34a67300d3 100644 --- a/util-taglib/src/com/liferay/taglib/FileAvailabilityUtil.java +++ b/util-taglib/src/com/liferay/taglib/FileAvailabilityUtil.java @@ -14,9 +14,9 @@ package com.liferay.taglib; +import com.liferay.portal.kernel.servlet.PortalWebResourcesUtil; import com.liferay.portal.kernel.util.CharPool; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.kernel.web.PortalWebResourcesUtil; import java.net.URL; From 87576b47447a03b1182c9988f3d14e947d00b6ae Mon Sep 17 00:00:00 2001 From: Brian Chan Date: Tue, 14 Apr 2015 15:44:53 -0700 Subject: [PATCH 41/41] LPS-54480 SF --- .../servlet/filters/aggregate/AggregateFilter.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java b/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java index 82cfd7cf8802d6..adec0c8f629140 100644 --- a/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java +++ b/portal-impl/src/com/liferay/portal/servlet/filters/aggregate/AggregateFilter.java @@ -261,10 +261,11 @@ protected Object getBundleContent( String bundleDirName = PropsUtil.get( PropsKeys.JAVASCRIPT_BUNDLE_DIR, new Filter(bundleId)); - ServletContext resourceServletContext = + ServletContext portalWebResourcesServletContext = PortalWebResourcesUtil.getServletContext(); - URL bundleDirURL = resourceServletContext.getResource(bundleDirName); + URL bundleDirURL = portalWebResourcesServletContext.getResource( + bundleDirName); if (bundleDirURL == null) { return null; @@ -280,7 +281,7 @@ protected Object getBundleContent( boolean staleCache = false; for (String fileName : fileNames) { - URL resourceURL = resourceServletContext.getResource( + URL resourceURL = portalWebResourcesServletContext.getResource( bundleDirName.concat(StringPool.SLASH).concat(fileName)); if (resourceURL == null) { @@ -316,7 +317,8 @@ protected Object getBundleContent( } else { content = aggregateJavaScript( - new ServletPaths(resourceServletContext, bundleDirName), + new ServletPaths( + portalWebResourcesServletContext, bundleDirName), fileNames); } @@ -522,9 +524,9 @@ protected String getJavaScriptContent(URL resourceURL) throws IOException { protected boolean isModuleRequest(HttpServletRequest request) { String requestURI = request.getRequestURI(); - String frontendContextPath = PortalWebResourcesUtil.getContextPath(); + String contextPath = PortalWebResourcesUtil.getContextPath(); - if (requestURI.startsWith(frontendContextPath)) { + if (requestURI.startsWith(contextPath)) { return false; }