summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortang peng <tang.peng5@zte.com.cn>2018-07-21 06:53:24 +0000
committerGerrit Code Review <gerrit@onap.org>2018-07-21 06:53:24 +0000
commit1283f95fd9a01b875167725982c19aece10acf5b (patch)
tree9b0d3dd3e8b6c279ac8bd095f4698d635e314eab
parentddccff7b5d1dee0a17afb4d1e63302cb99626c31 (diff)
parentfb0bf963239aaacf19280843f825174e68d41eab (diff)
Merge "Added the frontend module"
-rw-r--r--pom.xml1
-rw-r--r--rulemgt-frontend/.gitignore1
-rw-r--r--rulemgt-frontend/package-lock.json20
-rw-r--r--rulemgt-frontend/package.json3
-rw-r--r--rulemgt-frontend/pom.xml68
-rw-r--r--rulemgt-frontend/src/index.html2
6 files changed, 58 insertions, 37 deletions
diff --git a/pom.xml b/pom.xml
index 77a344b..afc656e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,7 @@
<name>holmes-rule-management</name>
<modules>
<module>rulemgt</module>
+ <module>rulemgt-frontend</module>
<module>rulemgt-standalone</module>
</modules>
diff --git a/rulemgt-frontend/.gitignore b/rulemgt-frontend/.gitignore
index 54bfd20..3fdce3b 100644
--- a/rulemgt-frontend/.gitignore
+++ b/rulemgt-frontend/.gitignore
@@ -7,6 +7,7 @@
# dependencies
/node_modules
+/node
# IDEs and editors
/.idea
diff --git a/rulemgt-frontend/package-lock.json b/rulemgt-frontend/package-lock.json
index 69f96d6..1c29b4d 100644
--- a/rulemgt-frontend/package-lock.json
+++ b/rulemgt-frontend/package-lock.json
@@ -137,8 +137,7 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
@@ -265,8 +264,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"ini": {
"version": "1.3.5",
@@ -278,7 +276,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -404,8 +401,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -538,7 +534,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -12080,6 +12075,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -12259,7 +12255,8 @@
"safe-buffer": {
"version": "5.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -12365,7 +12362,8 @@
"yallist": {
"version": "3.0.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
}
}
},
@@ -12947,7 +12945,6 @@
"version": "1.1.11",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -13116,7 +13113,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
diff --git a/rulemgt-frontend/package.json b/rulemgt-frontend/package.json
index e7e8877..6ba05bf 100644
--- a/rulemgt-frontend/package.json
+++ b/rulemgt-frontend/package.json
@@ -5,7 +5,8 @@
"scripts": {
"ng": "ng",
"start": "ng serve",
- "build": "ng build",
+ "build": "ng build --dev",
+ "prod": "ng build --prod --base-href /holmes",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
diff --git a/rulemgt-frontend/pom.xml b/rulemgt-frontend/pom.xml
index 1891ef6..4e71ecc 100644
--- a/rulemgt-frontend/pom.xml
+++ b/rulemgt-frontend/pom.xml
@@ -33,41 +33,46 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.5.0</version>
+ <groupId>com.github.eirslett</groupId>
+ <artifactId>frontend-maven-plugin</artifactId>
+ <version>1.6</version>
<executions>
<execution>
- <id>angular-cli install</id>
- <configuration>
- <workingDirectory>.</workingDirectory>
- <executable>cmd</executable>
- <arguments>
- <argument>/c</argument>
- <argument>"npm install --prefer-offline"</argument>
- </arguments>
- </configuration>
- <phase>generate-resources</phase>
+ <id>install node and npm</id>
<goals>
- <goal>exec</goal>
+ <goal>install-node-and-npm</goal>
</goals>
+ <phase>generate-resources</phase>
</execution>
<execution>
- <id>angular-cli build</id>
+ <id>npm install</id>
+ <goals>
+ <goal>npm</goal>
+ </goals>
+ <phase>generate-resources</phase>
<configuration>
- <workingDirectory>.</workingDirectory>
- <executable>cmd</executable>
- <arguments>
- <argument>/c</argument>
- <argument>"ng build --prod"</argument>
- </arguments>
+ <arguments>install</arguments>
</configuration>
- <phase>generate-resources</phase>
+ </execution>
+ <execution>
+ <id>prod</id>
<goals>
- <goal>exec</goal>
+ <goal>npm</goal>
</goals>
+ <configuration>
+ <arguments>run-script prod</arguments>
+ <arguments>run-script prod</arguments>
+ </configuration>
+ <phase>generate-resources</phase>
</execution>
</executions>
+ <configuration>
+ <skip>${skip.node.and.npm.installation}</skip>
+ <nodeVersion>v10.6.0</nodeVersion>
+ <npmVersion>6.1.0</npmVersion>
+ <installDirectory>./</installDirectory>
+ <workingDirectory>./</workingDirectory>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -111,4 +116,21 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>local</id>
+ <properties>
+ <skip.node.and.npm.installation>true</skip.node.and.npm.installation>
+ </properties>
+ </profile>
+ <profile>
+ <id>normal</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <skip.node.and.npm.installation>false</skip.node.and.npm.installation>
+ </properties>
+ </profile>
+ </profiles>
</project>
diff --git a/rulemgt-frontend/src/index.html b/rulemgt-frontend/src/index.html
index 0a7632c..c8da64f 100644
--- a/rulemgt-frontend/src/index.html
+++ b/rulemgt-frontend/src/index.html
@@ -31,4 +31,4 @@
<remote-config>Loading...</remote-config>
</body>
-</html> \ No newline at end of file
+</html>