You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/07/02 11:48:24 UTC

[1/2] incubator-ignite git commit: IGNITE-843 Fixed dev notes.

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-843 f8a21812f -> 1b765bd23


IGNITE-843 Fixed dev notes.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fcc97912
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fcc97912
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fcc97912

Branch: refs/heads/ignite-843
Commit: fcc979121722f6db9cbaf66b61eb4ffeda009e3f
Parents: 17690ac
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Jul 2 16:48:08 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Jul 2 16:48:08 2015 +0700

----------------------------------------------------------------------
 modules/web-control-center/nodejs/DEVNOTES.txt | 25 +++++++++++++--------
 modules/web-control-center/nodejs/package.json |  2 +-
 2 files changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fcc97912/modules/web-control-center/nodejs/DEVNOTES.txt
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/DEVNOTES.txt b/modules/web-control-center/nodejs/DEVNOTES.txt
index eb35c0a..6954fae 100644
--- a/modules/web-control-center/nodejs/DEVNOTES.txt
+++ b/modules/web-control-center/nodejs/DEVNOTES.txt
@@ -1,14 +1,21 @@
-Ignite Web Configurator Build Instructions
+Ignite Web Control Center Instructions
 ======================================
 
-Before run need install locally:
+How to deploy:
 
-1. NodeJS using installer from site https://nodejs.org
-2. MongoDB folow instructions from site http://docs.mongodb.org/manual/installation
+1. Install locally NodeJS using installer from site https://nodejs.org for your OS.
+2. Install locally MongoDB folow instructions from site http://docs.mongodb.org/manual/installation
+3. Checkout ignite-843 branch.
+4. Change directory '$IGNITE_HOME/modules/webconfig/nodejs'.
+5. Run "npm install" in terminal for download all dependencies.
 
-To run:
+Steps 1 - 5 should be executed once.
 
-1. Run following command in terminal for upload all dependence: "npm install" in 'modules/webconfig/nodejs' folder.
-2. Run MongoDB.
-3. Start application by following command in terminal: "npm start" in 'modules/webconfig/nodejs' folder.
-4. Open in browser: localhost:3000
\ No newline at end of file
+How to run:
+
+1. Run MongoDB.
+ 1.1 In terminal change dir to $MONGO_ISNTALL_DIR/server/3.0/bin.
+ 1.2 Run "mongod".
+2. In new terminal change directory '$IGNITE_HOME/modules/webconfig/nodejs'.
+3. Start application by executing "npm start".
+4. In browser open: http://localhost:3000
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fcc97912/modules/web-control-center/nodejs/package.json
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/package.json b/modules/web-control-center/nodejs/package.json
index ef35b9d..1ff5b6f 100644
--- a/modules/web-control-center/nodejs/package.json
+++ b/modules/web-control-center/nodejs/package.json
@@ -19,7 +19,6 @@
     "jade": "~1.9.2",
     "less-middleware": "1.0.x",
     "mongoose": "^4.0.2",
-    "morgan": "~1.5.1",
     "nconf": "^0.7.1",
     "passport": "^0.2.1",
     "passport-local": "^1.0.0",
@@ -29,6 +28,7 @@
     "util": "^0.10.3"
   },
   "devDependencies": {
+    "morgan": "~1.5.1",
     "supertest": "^1.0.1",
     "mocha": "~2.0.1",
     "should": "~3.1.3"


[2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-843' into ignite-843

Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1b765bd2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1b765bd2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1b765bd2

Branch: refs/heads/ignite-843
Commit: 1b765bd23c92b72c94428e5825f795a4ecd206a6
Parents: fcc9791 f8a2181
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Jul 2 16:48:21 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Jul 2 16:48:21 2015 +0700

----------------------------------------------------------------------
 .../nodejs/public/stylesheets/style.css         |  2 +-
 .../nodejs/public/stylesheets/style.less        |  7 ++----
 .../web-control-center/nodejs/views/login.jade  | 24 ++++++++++----------
 3 files changed, 15 insertions(+), 18 deletions(-)
----------------------------------------------------------------------