Repository: ode-console Updated Branches: refs/heads/master a3c567d26 -> f6eb8afa0
adjusted pom.xml and ci-build to work for local and CI builds Project: http://git-wip-us.apache.org/repos/asf/ode-console/repo Commit: http://git-wip-us.apache.org/repos/asf/ode-console/commit/f6eb8afa Tree: http://git-wip-us.apache.org/repos/asf/ode-console/tree/f6eb8afa Diff: http://git-wip-us.apache.org/repos/asf/ode-console/diff/f6eb8afa Branch: refs/heads/master Commit: f6eb8afa01c51c70e049ac9742476a184e9a4cbd Parents: a3c567d Author: sathwik <[email protected]> Authored: Wed Sep 28 19:40:44 2016 +0530 Committer: sathwik <[email protected]> Committed: Wed Sep 28 19:40:44 2016 +0530 ---------------------------------------------------------------------- .gitignore | 1 + ci-build.sh | 10 +++++++--- package.json | 3 --- pom.xml | 12 ++++++------ src/index.html | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode-console/blob/f6eb8afa/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index d9bf47f..f090dd7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ bower_components/ .tmp/ dist/ target/ +node/ http://git-wip-us.apache.org/repos/asf/ode-console/blob/f6eb8afa/ci-build.sh ---------------------------------------------------------------------- diff --git a/ci-build.sh b/ci-build.sh index 0eb68b2..5700932 100755 --- a/ci-build.sh +++ b/ci-build.sh @@ -34,16 +34,20 @@ SU_USER="su $CONTAINER_USERNAME -c " NPM_COMMAND="$SU_USER 'npm install'" -# A hack for frontend_maven_plugin to run gulp build task command +# A hack for frontend_maven_plugin to use node and npm binaries +# installed in the docker container FRONTEND_RM_COMMAND="$SU_USER 'rm -rf /workspace/node'" -FRONTEND_MK_COMMAND="$SU_USER 'mkdir /workspace/node && ln -s /opt/node/bin/node /workspace/node/node'" +FRONTEND_MK_COMMAND="$SU_USER 'mkdir -p /workspace/node' \ + && $SU_USER 'ln -s /opt/node/bin/node /workspace/node/node' \ + && $SU_USER 'ln -s /opt/node/bin/npm /workspace/node/npm' \ + && $SU_USER 'ln -s /opt/node/lib/node_modules /workspace/node'" MVN_COMMAND="$SU_USER 'mvn $MVN_ARGS'" FINAL_COMMAND="$CREATE_USER_COMMAND \ - && $NPM_COMMAND \ && $FRONTEND_RM_COMMAND \ && $FRONTEND_MK_COMMAND \ + && $NPM_COMMAND \ && $MVN_COMMAND \ && $FRONTEND_RM_COMMAND" http://git-wip-us.apache.org/repos/asf/ode-console/blob/f6eb8afa/package.json ---------------------------------------------------------------------- diff --git a/package.json b/package.json index a765068..4c85d77 100644 --- a/package.json +++ b/package.json @@ -44,8 +44,5 @@ }, "engines": { "node": ">=0.10.0" - }, - "scripts": { - "postinstall": "bower install" } } http://git-wip-us.apache.org/repos/asf/ode-console/blob/f6eb8afa/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4cc1187..21b247e 100644 --- a/pom.xml +++ b/pom.xml @@ -70,12 +70,8 @@ under the License. <artifactId>frontend-maven-plugin</artifactId> <version>${frontend-maven-plugin.version}</version> - <!--<configuration> - <installDirectory>target</installDirectory> - </configuration>--> - <executions> - <!--<execution> + <execution> <id>install Node and npm</id> <goals> <goal>install-node-and-npm</goal> @@ -85,6 +81,7 @@ under the License. <npmVersion>${npm.version}</npmVersion> </configuration> </execution> + <execution> <id>npm install</id> <goals> @@ -94,6 +91,7 @@ under the License. <arguments>install</arguments> </configuration> </execution> + <execution> <id>npm install bower</id> <goals> @@ -103,6 +101,7 @@ under the License. <arguments>install bower</arguments> </configuration> </execution> + <execution> <id>bower install</id> <goals> @@ -111,7 +110,8 @@ under the License. <configuration> <arguments>install</arguments> </configuration> - </execution>--> + </execution> + <execution> <id>gulp build</id> <goals> http://git-wip-us.apache.org/repos/asf/ode-console/blob/f6eb8afa/src/index.html ---------------------------------------------------------------------- diff --git a/src/index.html b/src/index.html index 9d16a0b..1ca17e9 100644 --- a/src/index.html +++ b/src/index.html @@ -68,6 +68,7 @@ <script src="vendor/jquery.xpath.js"></script> <script src="vendor/vkbeautify.js"></script> <script src="app/dashboard/dashboard.controller.js"></script> + <script src="components/navbar/navbar.controller.js"></script> <script src="app/instance/instance.controller.js"></script> <script src="app/instance/instance.service.js"></script> <script src="app/instance/instanceactions.controller.js"></script> @@ -76,7 +77,6 @@ <script src="app/process/process.service.js"></script> <script src="app/process/processactions.controller.js"></script> <script src="app/process/processlist.controller.js"></script> - <script src="components/navbar/navbar.controller.js"></script> <!-- endinject --> <!-- inject:partials -->
