LPS-58659 Captcha image does not show up in login portlet

build-common.xml

@@ -12,6 +12,10 @@
 		<path location="${project.dir.native}" />
 	</pathconvert>
 
+	<pathconvert pathsep="/" property="project.dir.unix">
+		<path location="${project.dir.native}" />
+	</pathconvert>
+
 	<property name="sdk.dir" value="${project.dir}/tools/sdk" />
 
 	<property name="test.properties" value="com/liferay/portal/tools/dependencies/portal-tools.properties" />

build-test.xml

@@ -4554,16 +4554,6 @@ module.framework.properties.osgi.console=11312</echo>
 			<format pattern="yyyy-MM-dd" property="current.date" timezone="GMT" />
 		</tstamp>
 
-		<local name="project.dir.unix" />
-
-		<propertyregex
-			global="true"
-			input="${project.dir}"
-			property="project.dir.unix"
-			regexp="\\"
-			replace="/"
-		/>
-
 		<echo append="true" file="${test.ext.properties.file}">
 			component.names=${component.names}
 			ignore.errors.file.name=${project.dir.unix}/portal-web/test-ignorable-error-lines.xml

definitions/liferay-look-and-feel_7_0_0.dtd

@@ -130,7 +130,7 @@ the user.
 The root-path value sets the location of the root path for the theme. For
 example, the root path for the Classic theme is "/classic". This
 means you can find the files for the Classic theme in
-/modules/frontend/frontend-themes-web/src/META-INF/resources/classic.
+/modules/frontend/frontend-theme-classic/src/META-INF/resources/classic.
 
 For convenience, the root-path attribute can be referenced in the rest of the
 theme element as ${root-path}.
@@ -143,7 +143,7 @@ The default value is "/".
 The templates-path value sets the location of the templates path for the theme.
 For example, the templates path for the Classic theme is "/classic/templates".
 This means you can find the JSP or VM templates for the Classic theme in
-/modules/frontend/frontend-themes-web/src/META-INF/resources/classic/templates.
+/modules/frontend/frontend-theme-classic/src/META-INF/resources/classic/templates.
 
 For convenience, the templates-path attribute can be referenced in the rest of
 the theme element as ${templates-path}.
@@ -156,7 +156,7 @@ The default value is "${root-path}/templates".
 The css-path value sets the location of the css path for the theme. For example,
 the css path for the Classic theme is "/classic/css". This means you can find
 css for the Classic theme in
-/modules/frontend/frontend-themes-web/src/META-INF/resources/classic/css.
+/modules/frontend/frontend-theme-classic/src/META-INF/resources/classic/css.
 
 For convenience, the css-path attribute can be referenced in the rest of the
 theme element as ${css-path}.
@@ -169,7 +169,7 @@ The default value is "${root-path}/css".
 The images-path value sets the location of the images path for the theme. For
 example, the images path for the Classic theme is "/classic/images". This means
 you can find images for the Classic theme in
-/modules/frontend/frontend-themes-web/src/META-INF/resources/classic/images.
+/modules/frontend/frontend-theme-classic/src/META-INF/resources/classic/images.
 
 For convenience, the images-path attribute can be referenced in the rest of the
 theme element as ${images-path}.
@@ -182,7 +182,7 @@ The default value is "${root-path}/images".
 The javascript-path value sets the location of the JavaScript path for the
 theme. For example, the JavaScript path for the Classic theme is "/classic/js".
 This means you can find JavaScript for the Classic theme in
-/modules/frontend/frontend-themes-web/src/META-INF/resources/classic/js.
+/modules/frontend/frontend-theme-classic/src/META-INF/resources/classic/js.
 
 For convenience, the javascript-path attribute can be referenced in the rest of
 the theme element as ${javascript-path}.

git-commit-plugins

@@ -1 +1 @@
-01baf13bf18f816857068b1b1e197a0433775312
+4ce352ac260c7d50eaaaa7c40a7f6cb3a7bea1af

modules/.gitignore

@@ -1,18 +1,5 @@
 /*/*/*/*/*/*/*/*/npm-debug.log
-/*/*/*/*/*/_unstyled/css/aui
-/*/*/*/*/*/_unstyled/images/aui
-/*/*/*/*/*/admin/css
-/*/*/*/*/*/admin/images
-/*/*/*/*/*/admin/javascript
-/*/*/*/*/*/admin/js
-/*/*/*/*/*/admin/templates
-/*/*/*/*/*/classic/_diffs/css/alloy.css
-/*/*/*/*/*/classic/css
-/*/*/*/*/*/classic/images
-/*/*/*/*/*/classic/javascript
-/*/*/*/*/*/classic/js
-/*/*/*/*/*/classic/templates
-/*/*/*/*/*/favicon.ico
+/*/*/*/*/*/*/favicon.ico
 /*/*/*/*/*/genesis
 /*/*/*/*/*/portal/aui_deprecated.css
 /*/*/*/*/*/portal/bootstrap.css

modules/apps/application-list/application-list-api/src/com/liferay/application/list/constants/PanelCategoryKeys.java

@@ -14,40 +14,44 @@
 
 package com.liferay.application.list.constants;
 
+import com.liferay.portal.util.PortletCategoryKeys;
+
 /**
  * @author Adolfo Pérez
  */
 public interface PanelCategoryKeys {
 
 	public static final String CONTROL_PANEL = "control_panel";
 
-	public static final String CONTROL_PANEL_APPS = "control_panel.apps";
+	public static final String CONTROL_PANEL_APPS =
+		PortletCategoryKeys.CONTROL_PANEL_APPS;
 
 	public static final String CONTROL_PANEL_CONFIGURATION =
-		"control_panel.configuration";
+		PortletCategoryKeys.CONTROL_PANEL_CONFIGURATION;
 
-	public static final String CONTROL_PANEL_USERS = "control_panel.users";
+	public static final String CONTROL_PANEL_USERS =
+		PortletCategoryKeys.CONTROL_PANEL_USERS;
 
 	public static final String ROOT = "root";
 
 	public static final String SITE_ADMINISTRATION = "site_administration";
 
 	public static final String SITE_ADMINISTRATION_CONFIGURATION =
-		"site_administration.configuration";
+		PortletCategoryKeys.SITE_ADMINISTRATION_CONFIGURATION;
 
 	public static final String SITE_ADMINISTRATION_CONTENT =
-		"site_administration.content";
+		PortletCategoryKeys.SITE_ADMINISTRATION_CONTENT;
 
 	public static final String SITE_ADMINISTRATION_PAGES =
-		"site_administration.pages";
+		PortletCategoryKeys.SITE_ADMINISTRATION_PAGES;
 
 	public static final String SITE_ADMINISTRATION_PUBLISHING_TOOLS =
-		"site_administration.publishing_tools";
+		PortletCategoryKeys.SITE_ADMINISTRATION_PUBLISHING_TOOLS;
 
 	public static final String SITE_ADMINISTRATION_USERS =
-		"site_administration.users";
+		PortletCategoryKeys.SITE_ADMINISTRATION_USERS;
 
-	public static final String SITES = "sites";
+	public static final String SITES = PortletCategoryKeys.SITES;
 
 	public static final String SITES_ADMINISTRATION_MY_SITES =
 		"sites_administration.my_sites";
@@ -59,6 +63,7 @@ public interface PanelCategoryKeys {
 
 	public static final String USER = "user";
 
-	public static final String USER_MY_ACCOUNT = "user.my_account";
+	public static final String USER_MY_ACCOUNT =
+		PortletCategoryKeys.USER_MY_ACCOUNT;
 
 }

modules/apps/comment/comment-web/src/com/liferay/comment/web/portlet/CommentPortlet.java

@@ -27,7 +27,7 @@
 @Component(
 	immediate = true,
 	property = {
-		"com.liferay.portlet.display-category=hidden",
+		"com.liferay.portlet.display-category=category.hidden",
 		"com.liferay.portlet.icon=/icons/comment.png",
 		"javax.portlet.display-name=Comments",
 		"javax.portlet.expiration-cache=0",

modules/apps/document-library/document-library-item-selector-web/src/com/liferay/document/library/item/selector/web/display/context/DLItemSelectorViewDisplayContext.java

@@ -73,6 +73,8 @@ public PortletURL getPortletURL(
 		PortletURL portletURL = PortletURLUtil.clone(
 			_portletURL, liferayPortletResponse);
 
+		portletURL.setParameter(
+			"repositoryId", String.valueOf(getRepositoryId(request)));
 		portletURL.setParameter(
 			"folderId", String.valueOf(getFolderId(request)));
 		portletURL.setParameter(

modules/apps/dynamic-data-lists/dynamic-data-lists-api/src/com/liferay/dynamic/data/lists/util/comparator/DDLRecordIdComparator.java

@@ -0,0 +1,73 @@
+/**
+ * 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.dynamic.data.lists.util.comparator;
+
+import com.liferay.dynamic.data.lists.model.DDLRecord;
+import com.liferay.portal.kernel.util.OrderByComparator;
+
+/**
+ * @author Leonardo Barros
+ */
+public class DDLRecordIdComparator extends OrderByComparator<DDLRecord> {
+
+	public static final String ORDER_BY_ASC = "recordId ASC";
+
+	public static final String ORDER_BY_DESC = "recordId DESC";
+
+	public static final String[] ORDER_BY_FIELDS = {"recordId"};
+
+	public DDLRecordIdComparator() {
+		this(false);
+	}
+
+	public DDLRecordIdComparator(boolean ascending) {
+		_ascending = ascending;
+	}
+
+	@Override
+	public int compare(DDLRecord record1, DDLRecord record2) {
+		int value = Long.compare(record1.getRecordId(), record2.getRecordId());
+
+		if (_ascending) {
+			return value;
+		}
+		else {
+			return -value;
+		}
+	}
+
+	@Override
+	public String getOrderBy() {
+		if (_ascending) {
+			return ORDER_BY_ASC;
+		}
+		else {
+			return ORDER_BY_DESC;
+		}
+	}
+
+	@Override
+	public String[] getOrderByFields() {
+		return ORDER_BY_FIELDS;
+	}
+
+	@Override
+	public boolean isAscending() {
+		return _ascending;
+	}
+
+	private final boolean _ascending;
+
+}

portal-web/docroot/html/portlet/control_panel_home/init.jsp → modules/apps/dynamic-data-lists/dynamic-data-lists-api/src/com/liferay/dynamic/data/lists/util/comparator/DDLRecordModifiedDateComparator.java

@@ -1,4 +1,3 @@
-<%--
 /**
  * Copyright (c) 2000-present Liferay, Inc. All rights reserved.
  *
@@ -12,8 +11,24 @@
  * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  */
---%>
 
-<%@ include file="/html/portlet/init.jsp" %>
+package com.liferay.dynamic.data.lists.util.comparator;
 
-<%@ include file="/html/portlet/control_panel_home/init-ext.jsp" %>
+import com.liferay.dynamic.data.lists.model.DDLRecord;
+import com.liferay.portlet.exportimport.lar.StagedModelModifiedDateComparator;
+
+/**
+ * @author Leonardo Barros
+ */
+public class DDLRecordModifiedDateComparator
+	extends StagedModelModifiedDateComparator<DDLRecord> {
+
+	public DDLRecordModifiedDateComparator() {
+		this(false);
+	}
+
+	public DDLRecordModifiedDateComparator(boolean ascending) {
+		super(ascending);
+	}
+
+}

modules/apps/dynamic-data-lists/dynamic-data-lists-form-web/src/META-INF/resources/admin/init.jsp

@@ -27,14 +27,17 @@ taglib uri="http://liferay.com/tld/util" prefix="liferay-util" %>
 
 <%@ page import="com.liferay.dynamic.data.lists.exception.RecordSetNameException" %><%@
 page import="com.liferay.dynamic.data.lists.form.web.context.DDLFormAdminDisplayContext" %><%@
+page import="com.liferay.dynamic.data.lists.form.web.context.DDLFormViewRecordsDisplayContext" %><%@
 page import="com.liferay.dynamic.data.lists.form.web.search.RecordSetDisplayTerms" %><%@
 page import="com.liferay.dynamic.data.lists.form.web.search.RecordSetSearch" %><%@
 page import="com.liferay.dynamic.data.lists.form.web.util.DDLFormPortletUtil" %><%@
+page import="com.liferay.dynamic.data.lists.model.DDLRecord" %><%@
 page import="com.liferay.dynamic.data.lists.model.DDLRecordSet" %><%@
 page import="com.liferay.dynamic.data.mapping.exception.StructureDefinitionException" %><%@
 page import="com.liferay.dynamic.data.mapping.exception.StructureLayoutException" %><%@
 page import="com.liferay.dynamic.data.mapping.model.DDMStructure" %><%@
 page import="com.liferay.dynamic.data.mapping.model.DDMStructureVersion" %><%@
+page import="com.liferay.dynamic.data.mapping.storage.DDMFormValues" %><%@
 page import="com.liferay.portal.kernel.bean.BeanParamUtil" %><%@
 page import="com.liferay.portal.kernel.language.LanguageUtil" %><%@
 page import="com.liferay.portal.kernel.util.HtmlUtil" %><%@

modules/apps/dynamic-data-lists/dynamic-data-lists-form-web/src/META-INF/resources/admin/record_action.jsp

@@ -0,0 +1,37 @@
+<%--
+/**
+ * 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.
+ */
+--%>
+
+<%@ include file="/admin/init.jsp" %>
+
+<%
+ResultRow row = (ResultRow)request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW);
+
+DDLRecord record = (DDLRecord)row.getObject();
+%>
+
+<liferay-ui:icon-menu direction="left-side" icon="<%= StringPool.BLANK %>" markupView="lexicon" message="<%= StringPool.BLANK %>" showWhenSingleIcon="<%= true %>">
+	<c:if test="<%= ddlFormAdminDisplayContext.isShowDeleteRecordSetIcon(ddlFormAdminDisplayContext.getRecordSet()) %>">
+		<portlet:actionURL name="deleteRecord" var="deleteURL">
+			<portlet:param name="redirect" value="<%= currentURL %>" />
+			<portlet:param name="recordId" value="<%= String.valueOf(record.getRecordId()) %>" />
+		</portlet:actionURL>
+
+		<liferay-ui:icon
+			message="delete"
+			url="<%= deleteURL %>"
+		/>
+	</c:if>
+</liferay-ui:icon-menu>

modules/apps/dynamic-data-lists/dynamic-data-lists-form-web/src/META-INF/resources/admin/record_set_action.jsp

@@ -23,6 +23,20 @@ DDLRecordSet recordSet = (DDLRecordSet)row.getObject();
 %>
 
 <liferay-ui:icon-menu direction="down" icon="<%= StringPool.BLANK %>" markupView="lexicon" message="<%= StringPool.BLANK %>" showExpanded="<%= false %>" showWhenSingleIcon="<%= false %>">
+	<c:if test="<%= ddlFormAdminDisplayContext.isShowViewEntriesRecordSetIcon(recordSet) %>">
+		<portlet:renderURL var="viewEntriesURL">
+			<portlet:param name="mvcPath" value="/admin/view_records.jsp" />
+			<portlet:param name="redirect" value="<%= PortalUtil.getCurrentURL(request) %>" />
+			<portlet:param name="recordSetId" value="<%= String.valueOf(recordSet.getRecordSetId()) %>" />
+		</portlet:renderURL>
+
+		<liferay-ui:icon
+			iconCssClass="icon-view"
+			message="view-entries"
+			url="<%= viewEntriesURL %>"
+		/>
+	</c:if>
+
 	<c:if test="<%= ddlFormAdminDisplayContext.isShowEditRecordSetIcon(recordSet) %>">
 		<portlet:renderURL var="editURL">
 			<portlet:param name="mvcPath" value="/admin/edit_record_set.jsp" />