LPS-78772 Auto SF

liferay · Mar 20, 2018 · 1baad11 · 1baad11
1 parent 165c1a0
commit 1baad11
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 20 deletions.
diff --git a/build-test.xml b/build-test.xml
@@ -1377,7 +1377,8 @@ sendPasswordCaptchaEnabled=&quot;false&quot;</echo>
 						replace="\\\\]"
 					/>
 
-					<replaceregexp file="portal-impl/src/portal-ext.properties"
+					<replaceregexp
+						file="portal-impl/src/portal-ext.properties"
 						flags="g"
 						match="${propertyName}=.*"
 						replace=""

diff --git a/build.xml b/build.xml
@@ -1238,7 +1238,8 @@ print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')
 
 	<target name="validate-xml">
 		<xmlvalidate failonerror="no">
-			<fileset dir="${project.dir}"
+			<fileset
+				dir="${project.dir}"
 				excludes="**/dependencies/**,**/ehcache/**"
 				includes="**/liferay-*.xml,**/web.xml"
 			/>

diff --git a/...kflow/portal-workflow-web/src/main/resources/META-INF/resources/definition/add_button.jsp b/...kflow/portal-workflow-web/src/main/resources/META-INF/resources/definition/add_button.jsp
@@ -36,7 +36,8 @@ addMenuItems.add(new AddMenuItem(HtmlUtil.escape(LanguageUtil.get(request, "new-
 %>
 
 <c:if test="<%= !addMenuItems.isEmpty() %>">
-	<liferay-frontend:add-menu inline="<%= true %>"
+	<liferay-frontend:add-menu
 		addMenuItems="<%= addMenuItems %>"
+		inline="<%= true %>"
 	/>
 </c:if>
diff --git a/...on/expando/expando-taglib/src/main/resources/META-INF/resources/custom_attribute/page.jsp b/...on/expando/expando-taglib/src/main/resources/META-INF/resources/custom_attribute/page.jsp
@@ -299,8 +299,7 @@ ExpandoBridge expandoBridge = ExpandoBridgeFactoryUtil.getExpandoBridge(company.
 							%>
 
 							<div id="<portlet:namespace />CoordinatesContainer">
-								<div class="glyphicon glyphicon-map-marker"
-									id="<%= portletDisplay.getNamespace()+"ExpandoAttribute--" + name + "--Location" %>">
+								<div class="glyphicon glyphicon-map-marker" id="<%= portletDisplay.getNamespace()+"ExpandoAttribute--" + name + "--Location" %>">
 								</div>
 
 								<liferay-map:map-display
@@ -801,8 +800,7 @@ ExpandoBridge expandoBridge = ExpandoBridgeFactoryUtil.getExpandoBridge(company.
 					%>
 
 					<div id="<portlet:namespace />CoordinatesContainer">
-						<div class="glyphicon glyphicon-map-marker"
-							id="<%= portletDisplay.getNamespace()+"ExpandoAttribute--" + name + "--Location" %>">
+						<div class="glyphicon glyphicon-map-marker" id="<%= portletDisplay.getNamespace()+"ExpandoAttribute--" + name + "--Location" %>">
 						</div>
 
 						<liferay-map:map-display

diff --git a/modules/apps/opensocial/opensocial-portlet/build.xml b/modules/apps/opensocial/opensocial-portlet/build.xml
@@ -447,16 +447,18 @@
 	</target>
 
 	<target name="strip-comments">
-		<replaceregexp file="${strip.comments.file}"
+		<replaceregexp
 			encoding="${strip.comments.encoding}"
+			file="${strip.comments.file}"
 			flags="gs"
 			match="\s*/[*].*?[*]/\s*"
 			replace=""
 		/>
 
-		<replaceregexp file="${strip.comments.file}"
+		<replaceregexp
 			byline="true"
 			encoding="${strip.comments.encoding}"
+			file="${strip.comments.file}"
 			match="^\s*(//)(.*)$$"
 			replace=""
 		/>

diff --git a/...xperience/staging/staging-taglib/src/main/resources/META-INF/resources/deletions/page.jsp b/...xperience/staging/staging-taglib/src/main/resources/META-INF/resources/deletions/page.jsp
@@ -42,13 +42,9 @@ String individualDeletionsLabel = individualDeletionsTitle + ": <span style='fon
 <c:if test="<%= cmd.equals(Constants.EXPORT) || cmd.equals(Constants.IMPORT) || cmd.equals(Constants.PUBLISH) %>">
 	<aui:fieldset collapsed="<%= true %>" collapsible="<%= true %>" cssClass="options-group" label="deletions" markupView="lexicon">
 		<c:if test="<%= !cmd.equals(Constants.EXPORT) %>">
-			<aui:input disabled="<%= disableInputs %>" id="deletePortletDataBeforeImportingCheckbox" label="<%= deleteApplicationDataBeforeImportingLabel %>" name="<%= PortletDataHandlerKeys.DELETE_PORTLET_DATA %>"
-				type="checkbox" value="<%= MapUtil.getBoolean(parameterMap, PortletDataHandlerKeys.DELETE_PORTLET_DATA, false) %>"
-			/>
+			<aui:input disabled="<%= disableInputs %>" id="deletePortletDataBeforeImportingCheckbox" label="<%= deleteApplicationDataBeforeImportingLabel %>" name="<%= PortletDataHandlerKeys.DELETE_PORTLET_DATA %>" type="checkbox" value="<%= MapUtil.getBoolean(parameterMap, PortletDataHandlerKeys.DELETE_PORTLET_DATA, false) %>" />
 		</c:if>
 
-		<aui:input disabled="<%= disableInputs %>" label="<%= individualDeletionsLabel %>" name="<%= PortletDataHandlerKeys.DELETIONS %>"
-			type="checkbox" value="<%= MapUtil.getBoolean(parameterMap, PortletDataHandlerKeys.DELETIONS, false) %>"
-		/>
+		<aui:input disabled="<%= disableInputs %>" label="<%= individualDeletionsLabel %>" name="<%= PortletDataHandlerKeys.DELETIONS %>" type="checkbox" value="<%= MapUtil.getBoolean(parameterMap, PortletDataHandlerKeys.DELETIONS, false) %>" />
 	</aui:fieldset>
 </c:if>
diff --git a/...erience/staging/staging-taglib/src/main/resources/META-INF/resources/permissions/page.jsp b/...erience/staging/staging-taglib/src/main/resources/META-INF/resources/permissions/page.jsp
@@ -42,8 +42,6 @@ String inputLabel = LanguageUtil.get(request, inputTitle) + ": <span style='font
 
 <aui:fieldset collapsed="<%= true %>" collapsible="<%= true %>" cssClass="options-group" label="permissions" markupView="lexicon">
 	<span class="<%= labelCSSClass %>">
-		<aui:input disabled="<%= disableInputs %>" name="<%= PortletDataHandlerKeys.PERMISSIONS %>" type="checkbox" label="<%= inputLabel %>"
-			value="<%= MapUtil.getBoolean(parameterMap, PortletDataHandlerKeys.PERMISSIONS, false) %>"
-		/>
+		<aui:input disabled="<%= disableInputs %>" label="<%= inputLabel %>" name="<%= PortletDataHandlerKeys.PERMISSIONS %>" type="checkbox" value="<%= MapUtil.getBoolean(parameterMap, PortletDataHandlerKeys.PERMISSIONS, false) %>" />
 	</span>
 </aui:fieldset>
diff --git a/...eb/test/functional/com/liferay/portalweb/dependencies/workflow_definition_task_timers.xml b/...eb/test/functional/com/liferay/portalweb/dependencies/workflow_definition_task_timers.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0"?>
 
-<workflow-definition xmlns="urn:liferay.com:liferay-workflow_6.2.0"
+<workflow-definition
+	xmlns="urn:liferay.com:liferay-workflow_6.2.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="urn:liferay.com:liferay-workflow_6.2.0 http://www.liferay.com/dtd/liferay-workflow-definition_6_2_0.xsd">
+	xsi:schemaLocation="urn:liferay.com:liferay-workflow_6.2.0 http://www.liferay.com/dtd/liferay-workflow-definition_6_2_0.xsd"
+>
 	<name>Single Approver</name>
 	<description>A single approver can approve a workflow content.</description>
 	<version>1</version>