diff --git a/build.xml b/build.xml
index 7bbcc24054c2a4..1b34d3ed1c3955 100644
--- a/build.xml
+++ b/build.xml
@@ -874,6 +874,13 @@ This target has been renamed to "snapshot-bundle". Please call "snapshot-bundle"
+
+
+
+
+
+
+
@@ -1500,6 +1507,7 @@ print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')
+
@@ -1507,6 +1515,7 @@ print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')
+
@@ -1516,6 +1525,7 @@ print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')
+
@@ -1529,6 +1539,7 @@ print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')
+
@@ -1542,6 +1553,7 @@ print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')
+
@@ -1553,6 +1565,7 @@ print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')
+
@@ -1564,6 +1577,7 @@ print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')
+
@@ -1585,6 +1599,7 @@ print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')
+
@@ -1592,6 +1607,7 @@ print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')
+
@@ -1609,6 +1625,7 @@ print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')
+
@@ -1616,6 +1633,7 @@ print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')
+
@@ -1627,11 +1645,13 @@ print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')
+
+
diff --git a/portal-impl/src/com/liferay/portal/util/EntityResolver.java b/portal-impl/src/com/liferay/portal/util/EntityResolver.java
index a56b80f4a8e340..14ee7b673d6047 100644
--- a/portal-impl/src/com/liferay/portal/util/EntityResolver.java
+++ b/portal-impl/src/com/liferay/portal/util/EntityResolver.java
@@ -153,6 +153,8 @@ else if (systemId != null) {
"-//Liferay//DTD Display 7.2.0//EN", "liferay-display_7_2_0.dtd"),
new KeyValuePair(
"-//Liferay//DTD Display 7.3.0//EN", "liferay-display_7_3_0.dtd"),
+ new KeyValuePair(
+ "-//Liferay//DTD Display 7.4.0//EN", "liferay-display_7_4_0.dtd"),
new KeyValuePair(
"-//Liferay//DTD Friendly URL Routes 6.0.0//EN",
"liferay-friendly-url-routes_6_0_0.dtd"),
@@ -174,6 +176,9 @@ else if (systemId != null) {
new KeyValuePair(
"-//Liferay//DTD Friendly URL Routes 7.3.0//EN",
"liferay-friendly-url-routes_7_3_0.dtd"),
+ new KeyValuePair(
+ "-//Liferay//DTD Friendly URL Routes 7.4.0//EN",
+ "liferay-friendly-url-routes_7_4_0.dtd"),
new KeyValuePair(
"-//Liferay//DTD Hook 5.1.0//EN", "liferay-hook_5_1_0.dtd"),
new KeyValuePair(
@@ -192,6 +197,8 @@ else if (systemId != null) {
"-//Liferay//DTD Hook 7.2.0//EN", "liferay-hook_7_2_0.dtd"),
new KeyValuePair(
"-//Liferay//DTD Hook 7.3.0//EN", "liferay-hook_7_3_0.dtd"),
+ new KeyValuePair(
+ "-//Liferay//DTD Hook 7.4.0//EN", "liferay-hook_7_4_0.dtd"),
new KeyValuePair(
"-//Liferay//DTD Layout Templates 3.6.0//EN",
"liferay-layout-templates_3_6_0.dtd"),
@@ -231,6 +238,9 @@ else if (systemId != null) {
new KeyValuePair(
"-//Liferay//DTD Layout Templates 7.3.0//EN",
"liferay-layout-templates_7_3_0.dtd"),
+ new KeyValuePair(
+ "-//Liferay//DTD Layout Templates 7.4.0//EN",
+ "liferay-layout-templates_7_4_0.dtd"),
new KeyValuePair(
"-//Liferay//DTD Look and Feel 3.5.0//EN",
"liferay-look-and-feel_3_5_0.dtd"),
@@ -270,6 +280,9 @@ else if (systemId != null) {
new KeyValuePair(
"-//Liferay//DTD Look and Feel 7.3.0//EN",
"liferay-look-and-feel_7_3_0.dtd"),
+ new KeyValuePair(
+ "-//Liferay//DTD Look and Feel 7.4.0//EN",
+ "liferay-look-and-feel_7_4_0.dtd"),
new KeyValuePair(
"-//Liferay//DTD Plugin Package 4.3.0//EN",
"liferay-plugin-package_4_3_0.dtd"),
@@ -303,6 +316,9 @@ else if (systemId != null) {
new KeyValuePair(
"-//Liferay//DTD Plugin Package 7.3.0//EN",
"liferay-plugin-package_7_3_0.dtd"),
+ new KeyValuePair(
+ "-//Liferay//DTD Plugin Package 7.4.0//EN",
+ "liferay-plugin-package_7_4_0.dtd"),
new KeyValuePair(
"-//Liferay//DTD Plugin Repository 4.3.0//EN",
"liferay-plugin-repository_4_3_0.dtd"),
@@ -336,6 +352,9 @@ else if (systemId != null) {
new KeyValuePair(
"-//Liferay//DTD Plugin Repository 7.3.0//EN",
"liferay-plugin-repository_7_3_0.dtd"),
+ new KeyValuePair(
+ "-//Liferay//DTD Plugin Repository 7.4.0//EN",
+ "liferay-plugin-repository_7_4_0.dtd"),
new KeyValuePair(
"-//Liferay//DTD Portlet Application 3.5.0//EN",
"liferay-portlet-app_3_5_0.dtd"),
@@ -396,6 +415,9 @@ else if (systemId != null) {
new KeyValuePair(
"-//Liferay//DTD Portlet Application 7.3.0//EN",
"liferay-portlet-app_7_3_0.dtd"),
+ new KeyValuePair(
+ "-//Liferay//DTD Portlet Application 7.4.0//EN",
+ "liferay-portlet-app_7_4_0.dtd"),
new KeyValuePair(
"-//Liferay//DTD Resource Action Mapping 6.0.0//EN",
"liferay-resource-action-mapping_6_0_0.dtd"),
@@ -417,6 +439,9 @@ else if (systemId != null) {
new KeyValuePair(
"-//Liferay//DTD Resource Action Mapping 7.3.0//EN",
"liferay-resource-action-mapping_7_3_0.dtd"),
+ new KeyValuePair(
+ "-//Liferay//DTD Resource Action Mapping 7.4.0//EN",
+ "liferay-resource-action-mapping_7_4_0.dtd"),
new KeyValuePair(
"-//Liferay//DTD Service Builder 3.5.0//EN",
"liferay-service-builder_3_5_0.dtd"),
@@ -468,6 +493,9 @@ else if (systemId != null) {
new KeyValuePair(
"-//Liferay//DTD Service Builder 7.3.0//EN",
"liferay-service-builder_7_3_0.dtd"),
+ new KeyValuePair(
+ "-//Liferay//DTD Service Builder 7.4.0//EN",
+ "liferay-service-builder_7_4_0.dtd"),
new KeyValuePair(
"-//Liferay//DTD Social 6.1.0//EN", "liferay-social_6_1_0.dtd"),
new KeyValuePair(
@@ -480,6 +508,8 @@ else if (systemId != null) {
"-//Liferay//DTD Social 7.2.0//EN", "liferay-social_7_2_0.dtd"),
new KeyValuePair(
"-//Liferay//DTD Social 7.3.0//EN", "liferay-social_7_3_0.dtd"),
+ new KeyValuePair(
+ "-//Liferay//DTD Social 7.4.0//EN", "liferay-social_7_4_0.dtd"),
new KeyValuePair(
"-//Liferay//DTD Theme Loader 4.3.0//EN",
"liferay-theme-loader_4_3_0.dtd"),
@@ -513,6 +543,9 @@ else if (systemId != null) {
new KeyValuePair(
"-//Liferay//DTD Theme Loader 7.3.0//EN",
"liferay-theme-loader_7_3_0.dtd"),
+ new KeyValuePair(
+ "-//Liferay//DTD Theme Loader 7.4.0//EN",
+ "liferay-theme-loader_7_4_0.dtd"),
new KeyValuePair(
"-//Liferay//DTD User Notification Definition 6.2.0//EN",
"liferay-user-notification-definitions_6_2_0.dtd"),
@@ -528,6 +561,9 @@ else if (systemId != null) {
new KeyValuePair(
"-//Liferay//DTD User Notification Definition 7.3.0//EN",
"liferay-user-notification-definitions_7_3_0.dtd"),
+ new KeyValuePair(
+ "-//Liferay//DTD User Notification Definition 7.4.0//EN",
+ "liferay-user-notification-definitions_7_4_0.dtd"),
new KeyValuePair(
"-//MuleSource //DTD mule-configuration XML V1.0//EN",
"mule-configuration.dtd"),
@@ -632,6 +668,9 @@ else if (systemId != null) {
new KeyValuePair(
"http://www.liferay.com/dtd/liferay-workflow-definition_7_3_0.xsd",
"liferay-workflow-definition_7_3_0.xsd"),
+ new KeyValuePair(
+ "http://www.liferay.com/dtd/liferay-workflow-definition_7_4_0.xsd",
+ "liferay-workflow-definition_7_4_0.xsd"),
new KeyValuePair("http://www.w3.org/2001/xml.xsd", "xml.xsd")
};