Skip to content

Commit 73a02d0

Browse files
author
Yasuyuki Takeo
committed
Merge branch 'release/7.3.1'
2 parents ba3157c + 17d79ac commit 73a02d0

22 files changed

+88
-86
lines changed

‎.npmbundlerrc

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,17 @@
11
{
2-
"verbose": true,
3-
"sources": ["src"],
4-
"packages": {
5-
"is-object": {
6-
"copy-plugins": ["exclude-imports"],
7-
"plugins": ["replace-browser-modules"],
8-
".babelrc:": {
9-
"presets": ["liferay-standard"]
10-
},
11-
"post-plugins": [
12-
"namespace-packages",
13-
"inject-imports-dependencies",
14-
"inject-peer-dependencies"
15-
]
16-
}
17-
},
18-
"rules": [{
19-
"test": "\\.js$",
20-
"exclude": "node_modules",
21-
"use": [{
22-
"loader": "babel-loader",
23-
"options": {
24-
"presets": ["env"]
25-
}
26-
}]
27-
}]
2+
"sources": ["src"],
3+
"rules": [
4+
{
5+
"test": "\\.js$",
6+
"exclude": "node_modules",
7+
"use": [
8+
{
9+
"loader": "babel-loader",
10+
"options": {
11+
"presets": ["env"]
12+
}
13+
}
14+
]
15+
}
16+
]
2817
}

‎README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Dummy Factory generates dummy data for debugging use. Please don't use this for
2121
## Required environment
2222
* Java 1.8 or above
2323
* Liferay 7.3 GA1 (Master / Develop branch)
24-
* Liferay 7.2 GA1 / Liferay DXP 7.2 GA1 or above (Please see 7.2.x branch)
24+
* Liferay 7.2 (Please see 7.2.x branch)
2525
* Liferay 7.1 (Please see 7.1.x branch)
2626
* Liferay 7.0 (Please see 7.0.x branch)
2727

@@ -34,9 +34,11 @@ Dummy Factory generates dummy data for debugging use. Please don't use this for
3434
| 7.0 | [https://github.com/yasuflatland-lf/liferay-dummy-factory/tree/7.0.x/latest](https://github.com/yasuflatland-lf/liferay-dummy-factory/tree/7.0.x/latest) |
3535

3636
1. Download jar file according to the version above and place it int `${liferay-home}/deploy `
37-
2. Start Liferay bundle and login as an administrator.
38-
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.
39-
4. Now you are ready to create dummy data! Enjoy!
37+
1. Start Liferay bundle and login as an administrator.
38+
1. After the jar is properly installed, navigate to `Control Panel -> System Settings -> Platform -> Thrid party` and enable JQuery.
39+
1. Reboot the bundle.
40+
1. Navigate to `Control Panel`, under `Marketplace`, `Dummy Factory` will be found.
41+
1. Now you are ready to create dummy data! Enjoy!
4042

4143
## How can I compile Dummy Factory on my own?
4244
1. Create a Liferay Workspace for appropriate version (7.2.x branch is for 7.2, for example)
@@ -48,4 +50,4 @@ Dummy Factory generates dummy data for debugging use. Please don't use this for
4850
Please create a issue on this repository.
4951

5052
## Known issues
51-
- 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.
53+
- Wiki generator gets error and does not work due to denied access to JSON APIs before the initialization. Wiki looks like bing initialized at the first access to the Wiki Admin page in the control panel, right after spinning up the Liferay bundle.

‎bnd.bnd

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Bundle-Name: Liferay Dummy Factory Portlet
22
Bundle-SymbolicName: liferay.dummy.factory
3-
Bundle-Version: 7.3.0
3+
Bundle-Version: 7.3.1
44
Web-ContextPath: /liferay-dummy-factory
55
-dsannotations-options: inherit
66
-sources: true
@@ -12,6 +12,14 @@ Import-Package:\
1212
!org.apache.commons.beanutils.*,\
1313
!org.apache.commons.codec.*,\
1414
!org.checkerframework.*,\
15+
!com.linkedin.*,\
16+
!de.malkusch.*,\
17+
!com.machinepublishers.*,\
18+
!javax.annotation.*,\
19+
!net.sf.*,\
20+
!net.spy.*,\
21+
!org.openqa.*,\
22+
!org.yaml.*,\
1523
*
1624

1725
-includeresource:\

‎build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,29 @@ buildscript {
4040
apply plugin: 'com.github.kt3k.coveralls'
4141

4242
dependencies {
43-
compile 'biz.aQute.bnd:biz.aQute.bndlib:3.1.0'
44-
compile 'com.google.errorprone:error_prone_annotations:2.0.19'
45-
compile 'commons-digester:commons-digester:1.8.1'
46-
compile "com.google.guava:guava:21.0"
43+
compile 'biz.aQute.bnd:biz.aQute.bndlib:3.5.0'
44+
compile 'com.google.errorprone:error_prone_annotations:2.3.1'
45+
compile 'commons-digester:commons-digester:2.1'
46+
compile "com.google.guava:guava:27.1-jre"
4747
compile "commons-io:commons-io:2.5"
4848
compile "commons-validator:commons-validator:1.6"
4949
compile "org.apache.commons:commons-lang3:3.9"
5050
compile "com.github.mifmif:generex:1.0.2"
5151
compile "dk.brics.automaton:automaton:1.11-8"
52-
compile "com.github.javafaker:javafaker:0.13"
53-
compile("edu.uci.ics:crawler4j:4.4.0") {
52+
compile "com.github.javafaker:javafaker:1.0.2"
53+
compile("com.goikosoft.crawler4j:crawler4j:4.5.10") {
5454
exclude module: 'tika-bundle'
5555
exclude module: 'tika-core'
5656
exclude module: 'tika-parsers'
5757
}
5858

59-
compile group: 'com.sleepycat', name: 'je', version: '5.0.+'
59+
compile group: 'com.sleepycat', name: 'je', version: '18.3.12'
6060
compile "io.reactivex.rxjava2:rxjava:2.2.+"
6161
compile group: 'org.apache.httpcomponents', name: 'httpcore-osgi', version: '4.4.+'
6262
compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.+'
6363
compile group: 'org.reactivestreams', name: 'reactive-streams', version: '1.0.+'
6464
compile group: "commons-fileupload", name: "commons-fileupload", version: "1.3.3"
65-
compile group: "org.apache.felix", name: "org.apache.felix.gogo.runtime", version: "0.10.0"
65+
compile group: "org.apache.felix", name: "org.apache.felix.gogo.runtime", version: "1.1.+"
6666

6767
compile "com.liferay:com.liferay.application.list.api"
6868
compile "com.liferay:com.liferay.frontend.taglib"

‎latest/liferay.dummy.factory-7.3.0.jar renamed to ‎latest/liferay.dummy.factory-7.3.1.jar

13.1 MB
Binary file not shown.

‎package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
"name": "liferay-dummy-factory",
33
"version": "1.0.0",
44
"dependencies": {
5-
"lodash": "^4.17.15"
5+
"jquery": "^3.5.1",
6+
"lodash": "^4.17.20"
67
},
78
"devDependencies": {
8-
"liferay-npm-bundler": "^2.18.4",
9-
"liferay-npm-scripts": "^29.0.0"
9+
"@liferay/npm-scripts": "^34.0.1",
10+
"liferay-npm-bundler": "^2.20.0"
1011
},
1112
"scripts": {
1213
"build": "liferay-npm-bundler"

‎src/main/java/com/liferay/support/tools/constants/LDFPortletKeys.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class LDFPortletKeys {
88
public static final String EOL = System.getProperty("line.separator");
99

1010
// Portlet Name
11-
public static final String LIFERAY_DUMMY_FACTORY = "portlet_com_liferay_support_tools_portlet_LiferayDummyFactoryPortlet";
11+
public static final String LIFERAY_DUMMY_FACTORY = "com_liferay_support_tools_portlet_LiferayDummyFactoryPortlet";
1212

1313
public static final String DUMMY_FACTORY_CONFIG = "com.liferay.support.tools.portlet.actions.DummyFactoryConfiguration";
1414

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
66
import com.liferay.support.tools.constants.LDFPortletKeys;
77
import com.liferay.support.tools.portlet.actions.DummyFactoryConfiguration;
8+
import com.liferay.support.tools.utils.JqueryResolver;
89
import com.liferay.support.tools.utils.LodashResolver;
910

1011
import java.io.IOException;
@@ -62,6 +63,8 @@ public void doView(RenderRequest renderRequest, RenderResponse renderResponse)
6263

6364
//Loading Lodash
6465
LodashResolver.exec(renderRequest, _npmResolver);
66+
//Loading JQuery
67+
JqueryResolver.exec(renderRequest, _npmResolver);
6568

6669
super.doView(renderRequest, renderResponse);
6770
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.liferay.support.tools.constants.LDFPortletKeys;
99
import com.liferay.support.tools.constants.LDFPortletWebKeys;
1010
import com.liferay.support.tools.utils.CommonUtil;
11+
import com.liferay.support.tools.utils.JqueryResolver;
1112
import com.liferay.support.tools.utils.LodashResolver;
1213
import com.liferay.support.tools.utils.WikiCommons;
1314

@@ -67,7 +68,9 @@ public String render(RenderRequest renderRequest, RenderResponse renderResponse)
6768

6869
//Loading Lodash
6970
LodashResolver.exec(renderRequest, _npmResolver);
70-
71+
//Loading JQuery
72+
JqueryResolver.exec(renderRequest, _npmResolver);
73+
7174
return _commonUtil
7275
.getPageFromMode()
7376
.getOrDefault(mode, LDFPortletKeys.JSP_ORGANIZAION);

‎src/main/java/com/liferay/support/tools/portlet/actions/ImageLinksMVCResourceCommand.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
package com.liferay.support.tools.portlet.actions;
22

3+
import com.goikosoft.crawler4j.crawler.CrawlConfig;
4+
import com.goikosoft.crawler4j.crawler.CrawlController;
5+
import com.goikosoft.crawler4j.fetcher.PageFetcher;
6+
import com.goikosoft.crawler4j.robotstxt.RobotstxtConfig;
7+
import com.goikosoft.crawler4j.robotstxt.RobotstxtServer;
38
import com.google.common.collect.Lists;
49
import com.google.common.io.Files;
510
import com.liferay.portal.kernel.json.JSONArray;
@@ -14,11 +19,6 @@
1419
import com.liferay.portal.kernel.util.Portal;
1520
import com.liferay.support.tools.constants.LDFPortletKeys;
1621
import com.liferay.support.tools.utils.ImageCrawler;
17-
import edu.uci.ics.crawler4j.crawler.CrawlConfig;
18-
import edu.uci.ics.crawler4j.crawler.CrawlController;
19-
import edu.uci.ics.crawler4j.fetcher.PageFetcher;
20-
import edu.uci.ics.crawler4j.robotstxt.RobotstxtConfig;
21-
import edu.uci.ics.crawler4j.robotstxt.RobotstxtServer;
2222
import io.reactivex.Flowable;
2323
import io.reactivex.schedulers.Schedulers;
2424
import java.io.File;

0 commit comments

Comments
 (0)