Merge branch 'release/7.2.3'

Author: Yasuyuki Takeo

.eslintrc.js

@@ -0,0 +1,19 @@
+/**
+ * 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.
+ */
+
+module.exports = {
+	globals: {
+		_: true
+	}
+};

.npmbundlerrc

@@ -0,0 +1,28 @@
+{
+  "verbose": true,
+  "sources": ["src"],
+  "packages": {
+    "is-object": {
+      "copy-plugins": ["exclude-imports"],
+      "plugins": ["replace-browser-modules"],
+      ".babelrc:": {
+        "presets": ["liferay-standard"]
+      },
+      "post-plugins": [
+        "namespace-packages",
+        "inject-imports-dependencies",
+        "inject-peer-dependencies"
+      ]
+    }
+  },
+  "rules": [{
+    "test": "\\.js$",
+    "exclude": "node_modules",
+    "use": [{
+      "loader": "babel-loader",
+      "options": {
+        "presets": ["env"]
+      }
+    }]
+  }]
+}

README.md

@@ -28,9 +28,8 @@ Dummy Factory generates dummy data for debugging use. Please don't use this for
 ### For 7.2
 1. Download jar file from [here](https://github.com/yasuflatland-lf/liferay-dummy-factory/tree/master/latest) and place it in ${liferay-home}/deploy folder. 
 2. Start Liferay bundle and login as an administrator.
-3. Dummy Factory uses lodash libraly and it's disabled for 7.2 by default. Please navigate `Control Panel → Configuration → System Settings → Third Party` and check Lodash to true.
-4. After the jar is properly installed, navigate to ```Control Panel``` in the left pane and under ```Apps``` folder, Dummy Factory portlet will be found. Please place that on a page.
-5. Now you are ready to create dummy data! Enjoy!
+3. After the jar is properly installed, navigate to ```Control Panel``` in the left pane and under ```Apps``` folder, Dummy Factory portlet will be found. Please place that on a page.
+4. Now you are ready to create dummy data! Enjoy!
 
 ### For 7.1
 1. Download jar file from [here](https://github.com/yasuflatland-lf/liferay-dummy-factory/tree/7.1.x/latest) and place it in ${liferay-home}/deploy folder. 
@@ -49,3 +48,6 @@ Please download file from[here](https://github.com/yasuflatland-lf/liferay-dummy
 
 ## Bug / Enhancement request
 Please create a issue on this repository.
+
+## Known issues
+- Wiki generator gets error and does not work due to denied access to JSON APIs before the initilization. Wiki looks like bing initialized at the first access to the Wiki Admin page in the control panel, right after spining up the Liferay bundle.

bnd.bnd

@@ -1,7 +1,9 @@
 Bundle-Name: Liferay Dummy Factory Portlet
 Bundle-SymbolicName: liferay.dummy.factory
-Bundle-Version: 7.2.2
+Bundle-Version: 7.2.3
+Web-ContextPath: /liferay-dummy-factory
 -dsannotations-options: inherit
+-sources: true
 
 Import-Package:\
 	!org.apache.commons.fileupload.*,\

build.gradle

@@ -74,6 +74,9 @@ dependencies {
 	compile group: "com.liferay", name: "com.liferay.trash.taglib", version: "4.0.0"
 	compile group: "com.liferay", name: "com.liferay.portal.spring.extender", version: "2.1.+"
 	compile group: "com.liferay", name: "com.liferay.portal.instances.api", version: "3.0.0"
+	
+	compile group: "com.liferay", name: "com.liferay.frontend.js.loader.modules.extender.api", version: "3.0.0"
+	
 	compile group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "4.0.0"
 	compile group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "4.0.0"
 	compile group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "4.0.0"

latest/liferay.dummy.factory-7.2.2.jar renamed to latest/liferay.dummy.factory-7.2.3.jar

@@ -0,0 +1,14 @@
+{
+  "name": "liferay-dummy-factory",
+  "version": "1.0.0",
+  "dependencies": {
+    "lodash": "^4.17.15"
+  },
+  "devDependencies": {
+    "liferay-npm-bundler": "^2.13.2",
+    "liferay-npm-scripts": "^9.5.0"
+  },
+  "scripts": {
+    "build": "liferay-npm-bundler"
+  }
+}

package.json

@@ -1,9 +1,11 @@
 package com.liferay.support.tools.portlet;
 
+import com.liferay.frontend.js.loader.modules.extender.npm.NPMResolver;
 import com.liferay.portal.configuration.metatype.bnd.util.ConfigurableUtil;
 import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
 import com.liferay.support.tools.constants.LDFPortletKeys;
 import com.liferay.support.tools.portlet.actions.DummyFactoryConfiguration;
+import com.liferay.support.tools.utils.LodashResolver;
 
 import java.io.IOException;
 import java.util.Map;
@@ -17,6 +19,7 @@
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.ConfigurationPolicy;
 import org.osgi.service.component.annotations.Modified;
+import org.osgi.service.component.annotations.Reference;
 
 /**
  * Dummy Factory Portlet
@@ -56,7 +59,10 @@ public void doView(RenderRequest renderRequest, RenderResponse renderResponse)
         throws IOException, PortletException {
 
         renderRequest.setAttribute(DummyFactoryConfiguration.class.getName(), _dummyFactoryConfiguration);
-
+        
+        //Loading Lodash
+        LodashResolver.exec(renderRequest, _npmResolver);
+        
         super.doView(renderRequest, renderResponse);
     }
 
@@ -77,5 +83,8 @@ protected void activate(Map<Object, Object> properties) {
 		_dummyFactoryConfiguration = ConfigurableUtil.createConfigurable(DummyFactoryConfiguration.class, properties);
     }
 
-    private volatile DummyFactoryConfiguration _dummyFactoryConfiguration;	
+    @Reference
+    private NPMResolver _npmResolver;
+    private volatile DummyFactoryConfiguration _dummyFactoryConfiguration;
+    
 }

src/main/java/com/liferay/support/tools/portlet/LiferayDummyFactoryPortlet.java

@@ -1,12 +1,14 @@
 package com.liferay.support.tools.portlet.actions;
 
+import com.liferay.frontend.js.loader.modules.extender.npm.NPMResolver;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import com.liferay.portal.kernel.util.*;
+import com.liferay.portal.kernel.util.ParamUtil;
 import com.liferay.support.tools.constants.LDFPortletKeys;
 import com.liferay.support.tools.constants.LDFPortletWebKeys;
 import com.liferay.support.tools.utils.CommonUtil;
+import com.liferay.support.tools.utils.LodashResolver;
 import com.liferay.support.tools.utils.WikiCommons;
 
 import javax.portlet.PortletException;
@@ -63,6 +65,9 @@ public String render(RenderRequest renderRequest, RenderResponse renderResponse)
 			.getOrDefault(mode, LDFPortletKeys.JSP_ORGANIZAION) + ">");
 		}
 
+        //Loading Lodash
+        LodashResolver.exec(renderRequest, _npmResolver);
+		
 		return _commonUtil
 				.getPageFromMode()
 				.getOrDefault(mode, LDFPortletKeys.JSP_ORGANIZAION);
@@ -73,6 +78,9 @@ public String render(RenderRequest renderRequest, RenderResponse renderResponse)
 
 	@Reference
 	private WikiCommons _wikiCommons;
+	
+    @Reference
+    private NPMResolver _npmResolver;
 
 	private static Log _log = LogFactoryUtil
 			.getLog(CommonMVCRenderCommand.class);	

src/main/java/com/liferay/support/tools/portlet/actions/CommonMVCRenderCommand.java

@@ -0,0 +1,14 @@
+package com.liferay.support.tools.utils;
+
+import com.liferay.frontend.js.loader.modules.extender.npm.JSPackage;
+import com.liferay.frontend.js.loader.modules.extender.npm.NPMResolver;
+
+import javax.portlet.RenderRequest;
+
+public class LodashResolver {
+
+	static public void exec(RenderRequest renderRequest, NPMResolver npmResolver) {
+		JSPackage jsPackage = npmResolver.getDependencyJSPackage("lodash");
+		renderRequest.setAttribute("bootstrapRequire", jsPackage.getResolvedId());
+	}
+}