Ian Maxon has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/2672
Change subject: [NO ISSUE] Dashboard build fixes
......................................................................
[NO ISSUE] Dashboard build fixes
- Stop use of ~/.npm
- Assure asterix-dashboard jar contains proper resources
- Update node/npm versions to fix OSX build issues
Change-Id: I1c055aa81e79612361e9e685e5bea69cfb9c4c2b
---
M asterixdb/asterix-dashboard/pom.xml
M
asterixdb/asterix-dashboard/src/main/java/org/apache/asterix/api/http/server/QueryWebInterfaceServlet.java
M asterixdb/asterix-dashboard/src/node/package.json
3 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/72/2672/1
diff --git a/asterixdb/asterix-dashboard/pom.xml
b/asterixdb/asterix-dashboard/pom.xml
index b4ad088..c2662a4 100644
--- a/asterixdb/asterix-dashboard/pom.xml
+++ b/asterixdb/asterix-dashboard/pom.xml
@@ -109,7 +109,7 @@
<goal>npm</goal>
</goals>
<configuration>
- <arguments>install --no-optional</arguments>
+ <arguments>install --cache ${basedir}/target/npm-cache
--no-optional</arguments>
</configuration>
</execution>
<execution>
@@ -151,7 +151,7 @@
</execution>
<execution>
<id>copy-license</id>
- <phase>compile</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
@@ -173,17 +173,17 @@
</execution>
<execution>
<id>copy-static</id>
- <phase>prepare-package</phase>
+ <phase>process-classes</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>
- ${basedir}/target/classes/dashboard/static
+ ${basedir}/target/classes/dashboard/
</outputDirectory>
<resources>
<resource>
- <directory>${basedir}/target/node/static/
+ <directory>${basedir}/target/dashboard/static/
</directory>
</resource>
</resources>
@@ -217,7 +217,7 @@
<includes>
<include>**/dashboard/**</include>
<include>**/*.class</include>
- <include>**/META-INF/*</include>
+ <include>**/META-INF/**</include>
</includes>
</configuration>
</plugin>
@@ -226,7 +226,7 @@
<artifactId>license-automation-plugin</artifactId>
<executions>
<execution>
- <phase>prepare-package</phase>
+ <phase>compile</phase>
<goals>
<goal>generate</goal>
</goals>
diff --git
a/asterixdb/asterix-dashboard/src/main/java/org/apache/asterix/api/http/server/QueryWebInterfaceServlet.java
b/asterixdb/asterix-dashboard/src/main/java/org/apache/asterix/api/http/server/QueryWebInterfaceServlet.java
index 91b22e9..900e72b 100644
---
a/asterixdb/asterix-dashboard/src/main/java/org/apache/asterix/api/http/server/QueryWebInterfaceServlet.java
+++
b/asterixdb/asterix-dashboard/src/main/java/org/apache/asterix/api/http/server/QueryWebInterfaceServlet.java
@@ -51,7 +51,7 @@
if ("/".equals(requestURI)) {
HttpUtil.setContentType(response, HttpUtil.ContentType.TEXT_HTML);
// Dashboard Administration Console
- deliverResource("/dashboard/static/index.html", response);
+ deliverResource("/dashboard/index.html", response);
} else {
deliverResource(requestURI, response);
}
diff --git a/asterixdb/asterix-dashboard/src/node/package.json
b/asterixdb/asterix-dashboard/src/node/package.json
index 9aa8a0d..051f182 100755
--- a/asterixdb/asterix-dashboard/src/node/package.json
+++ b/asterixdb/asterix-dashboard/src/node/package.json
@@ -6,7 +6,7 @@
"ng": "ng",
"start": "ng serve --proxy-config proxy.config.js --host 0.0.0.0",
"build": "ng build --prod",
- "mavenbuild": "node node_modules/.bin/ng build --prod -op static/",
+ "mavenbuild": "node node_modules/.bin/ng build --prod -op static/ -d
dashboard/",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
--
To view, visit https://asterix-gerrit.ics.uci.edu/2672
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c055aa81e79612361e9e685e5bea69cfb9c4c2b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: release-0.9.4-pre-rc
Gerrit-Owner: Ian Maxon <ima...@apache.org>
