LPS-56048 Fix imports and include paths

abdonpijpelink · Aug 5, 2015 · 0e6b040 · 0e6b040
1 parent 2261395
commit 0e6b040
Show file tree

Hide file tree

Showing 45 changed files with 220 additions and 107 deletions.
diff --git a/...essage-boards/message-boards-web/src/META-INF/resources/message_boards/asset/abstract.jsp b/...essage-boards/message-boards-web/src/META-INF/resources/message_boards/asset/abstract.jsp
@@ -14,7 +14,7 @@
  */
 --%>
 
-<%@ include file="/META-INF/resources/message_boards/init.jsp" %>
+<%@ include file="/message_boards/init.jsp" %>
 
 <%
 int abstractLength = GetterUtil.getInteger(request.getAttribute(WebKeys.ASSET_ENTRY_ABSTRACT_LENGTH), AssetUtil.ASSET_ENTRY_ABSTRACT_LENGTH);

diff --git a/...ge-boards/message-boards-web/src/META-INF/resources/message_boards/asset/full_content.jsp b/...ge-boards/message-boards-web/src/META-INF/resources/message_boards/asset/full_content.jsp
@@ -14,7 +14,7 @@
  */
 --%>
 
-<%@ include file="/META-INF/resources/message_boards/init.jsp" %>
+<%@ include file="/message_boards/init.jsp" %>
 
 <%
 MBMessage message = (MBMessage)request.getAttribute(WebKeys.MESSAGE_BOARDS_MESSAGE);
@@ -31,7 +31,7 @@ request.setAttribute("edit-message.jsp-showRecentPosts", Boolean.FALSE);
 request.setAttribute("edit_message.jsp-thread", message.getThread());
 %>
 
-<liferay-util:include page="/html/portlet/message_boards/view_thread_message.jsp" />
+<liferay-util:include page="/message_boards/view_thread_message.jsp" servletContext="<%= application %>" />
 
 <c:if test="<%= assetRenderer != null %>">
 	<div class="asset-more">

diff --git a/...ssage-boards/message-boards-web/src/META-INF/resources/message_boards/ban_user_action.jsp b/...ssage-boards/message-boards-web/src/META-INF/resources/message_boards/ban_user_action.jsp
@@ -14,7 +14,7 @@
  */
 --%>
 
-<%@ include file="/META-INF/resources/message_boards/init.jsp" %>
+<%@ include file="/message_boards/init.jsp" %>
 
 <%
 ResultRow row = (ResultRow)request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW);

diff --git a/...ssage-boards/message-boards-web/src/META-INF/resources/message_boards/category_action.jsp b/...ssage-boards/message-boards-web/src/META-INF/resources/message_boards/category_action.jsp
@@ -14,7 +14,7 @@
  */
 --%>
 
-<%@ include file="/META-INF/resources/message_boards/init.jsp" %>
+<%@ include file="/message_boards/init.jsp" %>
 
 <%
 ResultRow row = (ResultRow)request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW);

diff --git a/...age-boards/message-boards-web/src/META-INF/resources/message_boards/category_columns.jspf b/...age-boards/message-boards-web/src/META-INF/resources/message_boards/category_columns.jspf
@@ -84,4 +84,4 @@
 	value="<%= String.valueOf(categoryDisplay.getSubcategoriesMessagesCount(curCategory)) %>"
 />
 
-<%@ include file="/META-INF/resources/message_boards/category_columns_action.jspf" %>
+<%@ include file="/message_boards/category_columns_action.jspf" %>
diff --git a/...rds/message-boards-web/src/META-INF/resources/message_boards/category_columns_action.jspf b/...rds/message-boards-web/src/META-INF/resources/message_boards/category_columns_action.jspf
@@ -17,5 +17,5 @@
 <liferay-ui:search-container-column-jsp
 	align="right"
 	cssClass="entry-action"
-	path="/html/portlet/message_boards/category_action.jsp"
+	path="/message_boards/category_action.jsp"
 />
diff --git a/...ge-boards-web/src/META-INF/resources/message_boards/deleted_message_attachment_action.jsp b/...ge-boards-web/src/META-INF/resources/message_boards/deleted_message_attachment_action.jsp
@@ -14,7 +14,7 @@
  */
 --%>
 
-<%@ include file="/META-INF/resources/message_boards/init.jsp" %>
+<%@ include file="/message_boards/init.jsp" %>
 
 <%
 ResultRow row = (ResultRow)request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW);

diff --git a/...message-boards/message-boards-web/src/META-INF/resources/message_boards/edit_category.jsp b/...message-boards/message-boards-web/src/META-INF/resources/message_boards/edit_category.jsp
@@ -14,7 +14,7 @@
  */
 --%>
 
-<%@ include file="/META-INF/resources/message_boards/init.jsp" %>
+<%@ include file="/message_boards/init.jsp" %>
 
 <%
 String redirect = ParamUtil.getString(request, "redirect");
@@ -65,7 +65,7 @@ else {
 }
 %>
 
-<liferay-util:include page="/html/portlet/message_boards/top_links.jsp" />
+<liferay-util:include page="/message_boards/top_links.jsp" servletContext="<%= application %>" />
 
 <liferay-ui:header
 	backURL="<%= redirect %>"

diff --git a/.../message-boards/message-boards-web/src/META-INF/resources/message_boards/edit_message.jsp b/.../message-boards/message-boards-web/src/META-INF/resources/message_boards/edit_message.jsp
@@ -14,7 +14,7 @@
  */
 --%>
 
-<%@ include file="/META-INF/resources/message_boards/init.jsp" %>
+<%@ include file="/message_boards/init.jsp" %>
 
 <%
 String redirect = ParamUtil.getString(request, "redirect");
@@ -103,7 +103,7 @@ else {
 %>
 
 <c:if test="<%= Validator.isNull(referringPortletResource) %>">
-	<liferay-util:include page="/html/portlet/message_boards/top_links.jsp" />
+	<liferay-util:include page="/message_boards/top_links.jsp" servletContext="<%= application %>" />
 </c:if>
 
 <liferay-ui:header
@@ -150,7 +150,7 @@ else {
 	request.setAttribute("edit_message.jsp-thread", thread);
 	%>
 
-	<liferay-util:include page="/html/portlet/message_boards/view_thread_message.jsp" />
+	<liferay-util:include page="/message_boards/view_thread_message.jsp" servletContext="<%= application %>" />
 
 	<%
 	request.removeAttribute("edit_message.jsp-assetTagNames");
@@ -230,10 +230,10 @@ else {
 		<aui:field-wrapper label="body">
 			<c:choose>
 				<c:when test='<%= ((messageId != 0) && message.isFormatBBCode()) || ((messageId == 0) && messageFormat.equals("bbcode")) %>'>
-					<%@ include file="/META-INF/resources/message_boards/bbcode_editor.jspf" %>
+					<%@ include file="/message_boards/bbcode_editor.jspf" %>
 				</c:when>
 				<c:otherwise>
-					<%@ include file="/META-INF/resources/message_boards/html_editor.jspf" %>
+					<%@ include file="/message_boards/html_editor.jspf" %>
 				</c:otherwise>
 			</c:choose>
 			<aui:input name="body" type="hidden" />
@@ -506,7 +506,7 @@ else {
 		request.setAttribute("edit_message.jsp-thread", thread);
 		%>
 
-		<liferay-util:include page="/html/portlet/message_boards/view_thread_message.jsp" />
+		<liferay-util:include page="/message_boards/view_thread_message.jsp" servletContext="<%= application %>" />
 	</c:if>
 </aui:form>
 

diff --git a/...e-boards/message-boards-web/src/META-INF/resources/message_boards/edit_message_quick.jspf b/...e-boards/message-boards-web/src/META-INF/resources/message_boards/edit_message_quick.jspf
@@ -71,10 +71,10 @@ boolean splitThread = ParamUtil.getBoolean(request, "splitThread");
 		<aui:field-wrapper label="quick-reply">
 			<c:choose>
 				<c:when test='<%= messageFormat.equals("bbcode") %>'>
-					<%@ include file="/META-INF/resources/message_boards/bbcode_editor.jspf" %>
+					<%@ include file="/message_boards/bbcode_editor.jspf" %>
 				</c:when>
 				<c:otherwise>
-					<%@ include file="/META-INF/resources/message_boards/html_editor.jspf" %>
+					<%@ include file="/message_boards/html_editor.jspf" %>
 				</c:otherwise>
 			</c:choose>
 			<aui:input name="body" type="hidden" />

diff --git a/...es/apps/message-boards/message-boards-web/src/META-INF/resources/message_boards/error.jsp b/...es/apps/message-boards/message-boards-web/src/META-INF/resources/message_boards/error.jsp
@@ -14,7 +14,7 @@
  */
 --%>
 
-<%@ include file="/META-INF/resources/message_boards/init.jsp" %>
+<%@ include file="/message_boards/init.jsp" %>
 
 <liferay-ui:error-header />
 

diff --git a/...les/apps/message-boards/message-boards-web/src/META-INF/resources/message_boards/init.jsp b/...les/apps/message-boards/message-boards-web/src/META-INF/resources/message_boards/init.jsp
@@ -14,9 +14,92 @@
  */
 --%>
 
-<%@ include file="/html/portlet/init.jsp" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
-<%@ page import="com.liferay.portal.kernel.util.MimeTypesUtil" %><%@
+<%@ 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/security" prefix="liferay-security" %><%@
+taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %><%@
+taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui" %><%@
+taglib uri="http://liferay.com/tld/util" prefix="liferay-util" %>
+
+<%@ page import="com.liferay.portal.NoSuchUserException" %><%@
+page import="com.liferay.portal.kernel.bean.BeanParamUtil" %><%@
+page import="com.liferay.portal.kernel.bean.BeanPropertiesUtil" %><%@
+page import="com.liferay.portal.kernel.captcha.CaptchaConfigurationException" %><%@
+page import="com.liferay.portal.kernel.captcha.CaptchaMaxChallengesException" %><%@
+page import="com.liferay.portal.kernel.captcha.CaptchaTextException" %><%@
+page import="com.liferay.portal.kernel.dao.search.RowChecker" %><%@
+page import="com.liferay.portal.kernel.dao.search.SearchContainer" %><%@
+page import="com.liferay.portal.kernel.language.LanguageUtil" %><%@
+page import="com.liferay.portal.kernel.language.UnicodeLanguageUtil" %><%@
+page import="com.liferay.portal.kernel.log.Log" %><%@
+page import="com.liferay.portal.kernel.log.LogFactoryUtil" %><%@
+page import="com.liferay.portal.kernel.portlet.LiferayWindowState" %><%@
+page import="com.liferay.portal.kernel.repository.model.FileEntry" %><%@
+page import="com.liferay.portal.kernel.search.Hits" %><%@
+page import="com.liferay.portal.kernel.search.Indexer" %><%@
+page import="com.liferay.portal.kernel.search.IndexerRegistryUtil" %><%@
+page import="com.liferay.portal.kernel.search.SearchContext" %><%@
+page import="com.liferay.portal.kernel.search.SearchContextFactory" %><%@
+page import="com.liferay.portal.kernel.search.SearchResultUtil" %><%@
+page import="com.liferay.portal.kernel.search.Summary" %><%@
+page import="com.liferay.portal.kernel.upload.LiferayFileItemException" %><%@
+page import="com.liferay.portal.kernel.util.ArrayUtil" %><%@
+page import="com.liferay.portal.kernel.util.Constants" %><%@
+page import="com.liferay.portal.kernel.util.FastDateFormatFactoryUtil" %><%@
+page import="com.liferay.portal.kernel.util.GetterUtil" %><%@
+page import="com.liferay.portal.kernel.util.HtmlUtil" %><%@
+page import="com.liferay.portal.kernel.util.ListUtil" %><%@
+page import="com.liferay.portal.kernel.util.LocaleUtil" %><%@
+page import="com.liferay.portal.kernel.util.MathUtil" %><%@
+page import="com.liferay.portal.kernel.util.MimeTypesUtil" %><%@
+page import="com.liferay.portal.kernel.util.ParamUtil" %><%@
+page import="com.liferay.portal.kernel.util.PrefsPropsUtil" %><%@
+page import="com.liferay.portal.kernel.util.PropsKeys" %><%@
+page import="com.liferay.portal.kernel.util.PropsUtil" %><%@
+page import="com.liferay.portal.kernel.util.StringBundler" %><%@
+page import="com.liferay.portal.kernel.util.StringPool" %><%@
+page import="com.liferay.portal.kernel.util.StringUtil" %><%@
+page import="com.liferay.portal.kernel.util.TextFormatter" %><%@
+page import="com.liferay.portal.kernel.util.Validator" %><%@
+page import="com.liferay.portal.kernel.workflow.WorkflowConstants" %><%@
+page import="com.liferay.portal.model.ModelHintsConstants" %><%@
+page import="com.liferay.portal.model.User" %><%@
+page import="com.liferay.portal.model.UserConstants" %><%@
+page import="com.liferay.portal.portletfilerepository.PortletFileRepositoryUtil" %><%@
+page import="com.liferay.portal.security.permission.ActionKeys" %><%@
+page import="com.liferay.portal.security.permission.ResourceActionsUtil" %><%@
+page import="com.liferay.portal.service.ServiceContext" %><%@
+page import="com.liferay.portal.service.SubscriptionLocalServiceUtil" %><%@
+page import="com.liferay.portal.service.UserLocalServiceUtil" %><%@
+page import="com.liferay.portal.service.WorkflowDefinitionLinkLocalServiceUtil" %><%@
+page import="com.liferay.portal.theme.ThemeDisplay" %><%@
+page import="com.liferay.portal.upload.LiferayFileItem" %><%@
+page import="com.liferay.portal.util.Portal" %><%@
+page import="com.liferay.portal.util.PortalUtil" %><%@
+page import="com.liferay.portal.util.PortletKeys" %><%@
+page import="com.liferay.portal.util.PropsValues" %><%@
+page import="com.liferay.portal.util.WebKeys" %><%@
+page import="com.liferay.portlet.PortletURLFactoryUtil" %><%@
+page import="com.liferay.portlet.PortletURLUtil" %><%@
+page import="com.liferay.portlet.asset.AssetRendererFactoryRegistryUtil" %><%@
+page import="com.liferay.portlet.asset.model.AssetEntry" %><%@
+page import="com.liferay.portlet.asset.model.AssetRenderer" %><%@
+page import="com.liferay.portlet.asset.model.AssetRendererFactory" %><%@
+page import="com.liferay.portlet.asset.model.AssetTag" %><%@
+page import="com.liferay.portlet.asset.service.AssetEntryServiceUtil" %><%@
+page import="com.liferay.portlet.asset.service.AssetTagLocalServiceUtil" %><%@
+page import="com.liferay.portlet.asset.service.persistence.AssetEntryQuery" %><%@
+page import="com.liferay.portlet.asset.util.AssetUtil" %><%@
+page import="com.liferay.portlet.documentlibrary.DuplicateFileException" %><%@
+page import="com.liferay.portlet.documentlibrary.FileExtensionException" %><%@
+page import="com.liferay.portlet.documentlibrary.FileNameException" %><%@
+page import="com.liferay.portlet.documentlibrary.FileSizeException" %><%@
+page import="com.liferay.portlet.documentlibrary.antivirus.AntivirusScannerException" %><%@
+page import="com.liferay.portlet.documentlibrary.model.DLFileEntry" %><%@
 page import="com.liferay.portlet.messageboards.BannedUserException" %><%@
 page import="com.liferay.portlet.messageboards.CategoryNameException" %><%@
 page import="com.liferay.portlet.messageboards.LockedThreadException" %><%@
@@ -39,6 +122,7 @@ page import="com.liferay.portlet.messageboards.model.MBCategory" %><%@
 page import="com.liferay.portlet.messageboards.model.MBCategoryConstants" %><%@
 page import="com.liferay.portlet.messageboards.model.MBCategoryDisplay" %><%@
 page import="com.liferay.portlet.messageboards.model.MBMailingList" %><%@
+page import="com.liferay.portlet.messageboards.model.MBMessage" %><%@
 page import="com.liferay.portlet.messageboards.model.MBMessageConstants" %><%@
 page import="com.liferay.portlet.messageboards.model.MBMessageDisplay" %><%@
 page import="com.liferay.portlet.messageboards.model.MBStatsUser" %><%@
@@ -52,6 +136,7 @@ page import="com.liferay.portlet.messageboards.service.MBBanLocalServiceUtil" %>
 page import="com.liferay.portlet.messageboards.service.MBCategoryLocalServiceUtil" %><%@
 page import="com.liferay.portlet.messageboards.service.MBCategoryServiceUtil" %><%@
 page import="com.liferay.portlet.messageboards.service.MBMailingListLocalServiceUtil" %><%@
+page import="com.liferay.portlet.messageboards.service.MBMessageLocalServiceUtil" %><%@
 page import="com.liferay.portlet.messageboards.service.MBMessageServiceUtil" %><%@
 page import="com.liferay.portlet.messageboards.service.MBStatsUserLocalServiceUtil" %><%@
 page import="com.liferay.portlet.messageboards.service.MBThreadFlagLocalServiceUtil" %><%@
@@ -61,12 +146,43 @@ page import="com.liferay.portlet.messageboards.service.permission.MBCategoryPerm
 page import="com.liferay.portlet.messageboards.service.permission.MBMessagePermission" %><%@
 page import="com.liferay.portlet.messageboards.service.permission.MBPermission" %><%@
 page import="com.liferay.portlet.messageboards.util.MBMessageAttachmentsUtil" %><%@
+page import="com.liferay.portlet.messageboards.util.MBUtil" %><%@
 page import="com.liferay.portlet.messageboards.util.comparator.MessageCreateDateComparator" %><%@
 page import="com.liferay.portlet.ratings.model.RatingsStats" %><%@
 page import="com.liferay.portlet.ratings.service.RatingsStatsLocalServiceUtil" %><%@
-page import="com.liferay.portlet.trash.service.TrashEntryLocalServiceUtil" %>
+page import="com.liferay.portlet.trash.model.TrashEntry" %><%@
+page import="com.liferay.portlet.trash.service.TrashEntryLocalServiceUtil" %><%@
+page import="com.liferay.portlet.trash.util.TrashUtil" %><%@
+page import="com.liferay.taglib.search.ResultRow" %>
+
+<%@ page import="java.text.Format" %><%@
+page import="java.text.NumberFormat" %>
+
+<%@ page import="java.util.ArrayList" %><%@
+page import="java.util.Calendar" %><%@
+page import="java.util.Collections" %><%@
+page import="java.util.Date" %><%@
+page import="java.util.HashMap" %><%@
+page import="java.util.List" %><%@
+page import="java.util.Locale" %><%@
+page import="java.util.Map" %><%@
+page import="java.util.Set" %>
+
+<%@ page import="javax.portlet.PortletRequest" %><%@
+page import="javax.portlet.PortletURL" %><%@
+page import="javax.portlet.WindowState" %>
+
+<portlet:defineObjects />
+
+<liferay-theme:defineObjects />
 
 <%
+WindowState windowState = liferayPortletRequest.getWindowState();
+
+PortletURL currentURLObj = PortletURLUtil.getCurrent(liferayPortletRequest, liferayPortletResponse);
+
+String currentURL = currentURLObj.toString();
+
 String currentLanguageId = LanguageUtil.getLanguageId(request);
 Locale currentLocale = LocaleUtil.fromLanguageId(currentLanguageId);
 Locale defaultLocale = themeDisplay.getSiteDefaultLocale();
@@ -90,12 +206,12 @@ String rssDisplayStyle = mbGroupServiceSettings.getRSSDisplayStyle();
 String rssFeedType = mbGroupServiceSettings.getRSSFeedType();
 
 boolean categoriesPanelCollapsible = true;
-boolean categoriesPanelExtended = true;
+	boolean categoriesPanelExtended = true;
 boolean threadsPanelCollapsible = true;
-boolean threadsPanelExtended = true;
+	boolean threadsPanelExtended = true;
 
 boolean childrenMessagesTaggable = true;
-boolean includeFormTag = true;
+	boolean includeFormTag = true;
 boolean showSearch = true;
 
 Format dateFormatDate = FastDateFormatFactoryUtil.getDate(locale, timeZone);
@@ -104,4 +220,4 @@ Format dateFormatDateTime = FastDateFormatFactoryUtil.getDateTime(locale, timeZo
 NumberFormat numberFormat = NumberFormat.getNumberInstance(locale);
 %>
 
-<%@ include file="/META-INF/resources/message_boards/init-ext.jsp" %>
+<%@ include file="/message_boards/init-ext.jsp" %>
diff --git a/...ge-boards/message-boards-web/src/META-INF/resources/message_boards/last_post_question.jsp b/...ge-boards/message-boards-web/src/META-INF/resources/message_boards/last_post_question.jsp
@@ -14,7 +14,7 @@
  */
 --%>
 
-<%@ include file="/META-INF/resources/message_boards/init.jsp" %>
+<%@ include file="/message_boards/init.jsp" %>
 
 <%
 ResultRow row = (ResultRow)request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW);

diff --git a/...essage-boards/message-boards-web/src/META-INF/resources/message_boards/message_action.jsp b/...essage-boards/message-boards-web/src/META-INF/resources/message_boards/message_action.jsp
@@ -14,7 +14,7 @@
  */
 --%>
 
-<%@ include file="/META-INF/resources/message_boards/init.jsp" %>
+<%@ include file="/message_boards/init.jsp" %>
 
 <%
 ResultRow row = (ResultRow)request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW);

diff --git a/...rds/message-boards-web/src/META-INF/resources/message_boards/message_summary_question.jsp b/...rds/message-boards-web/src/META-INF/resources/message_boards/message_summary_question.jsp
@@ -14,7 +14,7 @@
  */
 --%>
 
-<%@ include file="/META-INF/resources/message_boards/init.jsp" %>
+<%@ include file="/message_boards/init.jsp" %>
 
 <%
 ResultRow row = (ResultRow)request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW);

diff --git a/...message-boards/message-boards-web/src/META-INF/resources/message_boards/move_category.jsp b/...message-boards/message-boards-web/src/META-INF/resources/message_boards/move_category.jsp
@@ -14,7 +14,7 @@
  */
 --%>
 
-<%@ include file="/META-INF/resources/message_boards/init.jsp" %>
+<%@ include file="/message_boards/init.jsp" %>
 
 <%
 String redirect = ParamUtil.getString(request, "redirect");

diff --git a/...s/message-boards/message-boards-web/src/META-INF/resources/message_boards/move_thread.jsp b/...s/message-boards/message-boards-web/src/META-INF/resources/message_boards/move_thread.jsp
@@ -14,7 +14,7 @@
  */
 --%>
 
-<%@ include file="/META-INF/resources/message_boards/init.jsp" %>
+<%@ include file="/message_boards/init.jsp" %>
 
 <%
 String redirect = ParamUtil.getString(request, "redirect");
@@ -77,7 +77,7 @@ boolean splitThread = false;
 			</aui:input>
 
 			<aui:field-wrapper label="body">
-				<%@ include file="/META-INF/resources/message_boards/bbcode_editor.jspf" %>
+				<%@ include file="/message_boards/bbcode_editor.jspf" %>
 
 				<aui:input name="body" type="hidden" />
 			</aui:field-wrapper>
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ @@
      */
     --%>
-    <%@ include file="/META-INF/resources/message_boards/init.jsp" %>
+    <%@ include file="/message_boards/init.jsp" %>
     <%
     int abstractLength = GetterUtil.getInteger(request.getAttribute(WebKeys.ASSET_ENTRY_ABSTRACT_LENGTH), AssetUtil.ASSET_ENTRY_ABSTRACT_LENGTH);
@@ Expand Down @@