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 2016/02/15 04:49:47 UTC
[1/2] ignite git commit: IGNITE-843 Fixed typo in class name.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 0cd047156 -> 471ac276e
IGNITE-843 Fixed typo in class name.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b0d4bee3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b0d4bee3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b0d4bee3
Branch: refs/heads/ignite-843-rc2
Commit: b0d4bee32123a5a4f30d48337e45660956f5f935
Parents: 0cd0471
Author: vsisko <vs...@gridgain.com>
Authored: Mon Feb 15 10:48:54 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Feb 15 10:48:54 2016 +0700
----------------------------------------------------------------------
.../src/main/js/helpers/generator/generator-xml.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0d4bee3/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
index 7d89026..5eb5758 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
@@ -860,7 +860,7 @@ $generatorXml.cacheStore = function(cache, domains, res) {
}
else if (factoryKind === 'CacheJdbcBlobStoreFactory') {
res.startBlock('<property name="cacheStoreFactory">');
- res.startBlock('<bean class="org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactory">');
+ res.startBlock('<bean class="org.apache.ignite.cache.store.jdbc.CacheJdbcBlobStoreFactory">');
if (storeFactory.connectVia === 'DataSource')
$generatorXml.property(res, storeFactory, 'dataSourceBean');
[2/2] ignite git commit: IGNITE-843 Minor ES6 style fixes.
Posted by ak...@apache.org.
IGNITE-843 Minor ES6 style fixes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/471ac276
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/471ac276
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/471ac276
Branch: refs/heads/ignite-843-rc2
Commit: 471ac276e88b071e077418ad275c9f2f1ac1f67c
Parents: b0d4bee
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Feb 15 10:50:04 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Feb 15 10:50:04 2016 +0700
----------------------------------------------------------------------
.../src/main/js/serve/routes/notebooks.js | 86 ++++++++++----------
1 file changed, 43 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/471ac276/modules/control-center-web/src/main/js/serve/routes/notebooks.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/notebooks.js b/modules/control-center-web/src/main/js/serve/routes/notebooks.js
index 48e9a5c..a595303 100644
--- a/modules/control-center-web/src/main/js/serve/routes/notebooks.js
+++ b/modules/control-center-web/src/main/js/serve/routes/notebooks.js
@@ -32,20 +32,20 @@ module.exports.factory = function(express, mongo) {
* @param req Request.
* @param res Response.
*/
- router.post('/list', function(req, res) {
+ router.post('/list', (req, res) => {
const user_id = req.currentUserId();
// Get owned space and all accessed space.
- mongo.Space.find({$or: [{owner: user_id}, {usedBy: {$elemMatch: {account: user_id}}}]}, (err, spaces) => {
- if (err)
- return res.status(500).send(err.message);
+ mongo.Space.find({$or: [{owner: user_id}, {usedBy: {$elemMatch: {account: user_id}}}]}, (errSpace, spaces) => {
+ if (errSpace)
+ return res.status(500).send(errSpace.message);
const space_ids = spaces.map((value) => value._id);
// Get all metadata for spaces.
- mongo.Notebook.find({space: {$in: space_ids}}).select('_id name').sort('name').exec((err, notebooks) => {
- if (err)
- return res.status(500).send(err.message);
+ mongo.Notebook.find({space: {$in: space_ids}}).select('_id name').sort('name').exec((errNotebook, notebooks) => {
+ if (errNotebook)
+ return res.status(500).send(errNotebook.message);
res.json(notebooks);
});
@@ -58,22 +58,20 @@ module.exports.factory = function(express, mongo) {
* @param req Request.
* @param res Response.
*/
- router.post('/get', function(req, res) {
- var user_id = req.currentUserId();
+ router.post('/get', (req, res) => {
+ const user_id = req.currentUserId();
// Get owned space and all accessed space.
- mongo.Space.find({$or: [{owner: user_id}, {usedBy: {$elemMatch: {account: user_id}}}]}, function(err, spaces) {
- if (err)
- return res.status(500).send(err.message);
+ mongo.Space.find({$or: [{owner: user_id}, {usedBy: {$elemMatch: {account: user_id}}}]}, (errSpace, spaces) => {
+ if (errSpace)
+ return res.status(500).send(errSpace.message);
- var space_ids = spaces.map(function(value) {
- return value._id;
- });
+ const space_ids = spaces.map((value) => value._id);
// Get all metadata for spaces.
- mongo.Notebook.findOne({space: {$in: space_ids}, _id: req.body.noteId}).exec(function(err, notebook) {
- if (err)
- return res.status(500).send(err.message);
+ mongo.Notebook.findOne({space: {$in: space_ids}, _id: req.body.noteId}).exec((errNotebook, notebook) => {
+ if (errNotebook)
+ return res.status(500).send(errNotebook.message);
res.json(notebook);
});
@@ -86,32 +84,34 @@ module.exports.factory = function(express, mongo) {
* @param req Request.
* @param res Response.
*/
- router.post('/save', function(req, res) {
- var note = req.body;
- var noteId = note._id;
+ router.post('/save', (req, res) => {
+ const note = req.body;
+ const noteId = note._id;
- if (noteId)
- mongo.Notebook.update({_id: noteId}, note, {upsert: true}, function(err) {
+ if (noteId) {
+ mongo.Notebook.update({_id: noteId}, note, {upsert: true}, (err) => {
if (err)
return res.status(500).send(err.message);
res.send(noteId);
});
- else
- mongo.Notebook.findOne({space: note.space, name: note.name}, function(err, note) {
- if (err)
- return res.status(500).send(err.message);
+ }
+ else {
+ mongo.Notebook.findOne({space: note.space, name: note.name}, (errNotebookFind, notebookFoud) => {
+ if (errNotebookFind)
+ return res.status(500).send(errNotebookFind.message);
- if (note)
- return res.status(500).send('Notebook with name: "' + note.name + '" already exist.');
+ if (notebookFoud)
+ return res.status(500).send('Notebook with name: "' + notebookFoud.name + '" already exist.');
- (new mongo.Notebook(req.body)).save(function(err, note) {
- if (err)
- return res.status(500).send(err.message);
+ (new mongo.Notebook(req.body)).save((errNotebook, noteNew) => {
+ if (errNotebook)
+ return res.status(500).send(errNotebook.message);
- res.send(note._id);
+ res.send(noteNew._id);
});
});
+ }
});
/**
@@ -120,8 +120,8 @@ module.exports.factory = function(express, mongo) {
* @param req Request.
* @param res Response.
*/
- router.post('/remove', function(req, res) {
- mongo.Notebook.remove(req.body, function(err) {
+ router.post('/remove', (req, res) => {
+ mongo.Notebook.remove(req.body, (err) => {
if (err)
return res.status(500).send(err.message);
@@ -135,17 +135,17 @@ module.exports.factory = function(express, mongo) {
* @param req Request.
* @param res Response.
*/
- router.post('/new', function(req, res) {
- var user_id = req.currentUserId();
+ router.post('/new', (req, res) => {
+ const user_id = req.currentUserId();
// Get owned space and all accessed space.
- mongo.Space.findOne({owner: user_id}, function(err, space) {
- if (err)
- return res.status(500).send(err.message);
+ mongo.Space.findOne({owner: user_id}, (errSpace, space) => {
+ if (errSpace)
+ return res.status(500).send(errSpace.message);
- (new mongo.Notebook({space: space.id, name: req.body.name})).save(function(err, note) {
- if (err)
- return res.status(500).send(err.message);
+ (new mongo.Notebook({space: space.id, name: req.body.name})).save((errNotebook, note) => {
+ if (errNotebook)
+ return res.status(500).send(errNotebook.message);
return res.send(note._id);
});