ignite git commit: Fixed performance suggestions.

2015-11-29 Thread agoncharuk 
Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 923fea865 -> 0b61333a3


Fixed performance suggestions.


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

Branch: refs/heads/ignite-1.5
Commit: 0b61333a34be7fac8309ce050aa383f757f6187e
Parents: 923fea8
Author: Alexey Goncharuk 
Authored: Sun Nov 29 17:11:08 2015 +0300
Committer: Alexey Goncharuk 
Committed: Sun Nov 29 17:11:08 2015 +0300

--
 .../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0b61333a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java 
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 05b1997..87ccf93 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1192,7 +1192,7 @@ public class IgniteKernal implements IgniteEx, 
IgniteMXBean, Externalizable {
 if (cfg.getIncludeEventTypes() != null && 
cfg.getIncludeEventTypes().length != 0)
 perf.add("Disable grid events (remove 'includeEventTypes' from 
configuration)");
 
-if (BinaryMarshaller.available() && (cfg.getMarshaller() != null || 
!(cfg.getMarshaller() instanceof BinaryMarshaller)))
+if (BinaryMarshaller.available() && (cfg.getMarshaller() != null && 
!(cfg.getMarshaller() instanceof BinaryMarshaller)))
 perf.add("Use default binary marshaller (do not set 'marshaller' 
explicitly)");
 }

[2/2] ignite git commit: Corrected performance suggestions.

2015-11-29 Thread agoncharuk 
Corrected performance suggestions.


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

Branch: refs/heads/ignite-1.5.1
Commit: 180c45964c8eb2d4a1c2bb39cc70932c92b574fa
Parents: af8b145 0b61333
Author: Alexey Goncharuk 
Authored: Sun Nov 29 17:13:53 2015 +0300
Committer: Alexey Goncharuk 
Committed: Sun Nov 29 17:13:53 2015 +0300

--
 .../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[1/2] ignite git commit: Fixed performance suggestions.

2015-11-29 Thread agoncharuk 
Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5.1 af8b14589 -> 180c45964


Fixed performance suggestions.


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

Branch: refs/heads/ignite-1.5.1
Commit: 0b61333a34be7fac8309ce050aa383f757f6187e
Parents: 923fea8
Author: Alexey Goncharuk 
Authored: Sun Nov 29 17:11:08 2015 +0300
Committer: Alexey Goncharuk 
Committed: Sun Nov 29 17:11:08 2015 +0300

--
 .../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0b61333a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java 
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 05b1997..87ccf93 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1192,7 +1192,7 @@ public class IgniteKernal implements IgniteEx, 
IgniteMXBean, Externalizable {
 if (cfg.getIncludeEventTypes() != null && 
cfg.getIncludeEventTypes().length != 0)
 perf.add("Disable grid events (remove 'includeEventTypes' from 
configuration)");
 
-if (BinaryMarshaller.available() && (cfg.getMarshaller() != null || 
!(cfg.getMarshaller() instanceof BinaryMarshaller)))
+if (BinaryMarshaller.available() && (cfg.getMarshaller() != null && 
!(cfg.getMarshaller() instanceof BinaryMarshaller)))
 perf.add("Use default binary marshaller (do not set 'marshaller' 
explicitly)");
 }

ignite git commit: IGNITE-2024 Added support for fields and non-JavaBeans getters/setters.

2015-11-29 Thread akuznetsov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 59f372669 -> 923fea865


IGNITE-2024 Added support for fields and non-JavaBeans getters/setters.


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

Branch: refs/heads/ignite-1.5
Commit: 923fea8659eac46f351b8d64f710a351f6bbf3ff
Parents: 59f3726
Author: AKuznetsov 
Authored: Sun Nov 29 20:44:51 2015 +0700
Committer: AKuznetsov 
Committed: Sun Nov 29 20:44:51 2015 +0700

--
 .../cache/store/jdbc/CacheJdbcPojoStore.java| 188 +--
 1 file changed, 133 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/923fea86/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
 
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
index b837e5c..abc4b2e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
@@ -18,6 +18,8 @@
 package org.apache.ignite.cache.store.jdbc;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -44,7 +46,7 @@ import org.jetbrains.annotations.Nullable;
  */
 public class CacheJdbcPojoStore extends CacheAbstractJdbcStore {
 /** POJO methods cache. */
-private volatile Map> pojosMthds = 
Collections.emptyMap();
+private volatile Map> pojosProps 
= Collections.emptyMap();
 
 /**
  * Get field value from object for use as query parameter.
@@ -81,23 +83,23 @@ public class CacheJdbcPojoStore extends 
CacheAbstractJdbcStore {
 @Nullable private Object extractPojoParameter(@Nullable String cacheName, 
String typeName, String fldName,
 Object obj) throws CacheException {
 try {
-Map cacheMethods = 
pojosMthds.get(cacheName);
+Map cacheProps = 
pojosProps.get(cacheName);
 
-if (cacheMethods == null)
+if (cacheProps == null)
 throw new CacheException("Failed to find POJO type metadata 
for cache: " + U.maskName(cacheName));
 
-PojoMethodsCache mc = cacheMethods.get(typeName);
+PojoPropertiesCache ppc = cacheProps.get(typeName);
 
-if (mc == null)
+if (ppc == null)
 throw new CacheException("Failed to find POJO type metadata 
for type: " + typeName);
 
-Method getter = mc.getters.get(fldName);
+ClassProperty prop = ppc.props.get(fldName);
 
-if (getter == null)
-throw new CacheLoaderException("Failed to find getter in POJO 
class [class=" + typeName +
+if (prop == null)
+throw new CacheLoaderException("Failed to find property in 
POJO class [class=" + typeName +
 ", prop=" + fldName + "]");
 
-return getter.invoke(obj);
+return prop.get(obj);
 }
 catch (Exception e) {
 throw new CacheException("Failed to read object of class: " + 
typeName, e);
@@ -171,26 +173,26 @@ public class CacheJdbcPojoStore extends 
CacheAbstractJdbcStore {
 JdbcTypeField[] flds, Map loadColIdxs, ResultSet rs)
 throws CacheLoaderException {
 
-Map cacheMethods = pojosMthds.get(cacheName);
+Map cacheProps = 
pojosProps.get(cacheName);
 
-if (cacheMethods == null)
+if (cacheProps == null)
 throw new CacheLoaderException("Failed to find POJO types metadata 
for cache: " + U.maskName(cacheName));
 
-PojoMethodsCache mc = cacheMethods.get(typeName);
+PojoPropertiesCache ppc = cacheProps.get(typeName);
 
-if (mc == null)
+if (ppc == null)
 throw new CacheLoaderException("Failed to find POJO type metadata 
for type: " + typeName);
 
 try {
-Object obj = mc.ctor.newInstance();
+Object obj = ppc.ctor.newInstance();
 
 for (JdbcTypeField fld : flds) {
 String fldJavaName =

[2/2] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5.1

2015-11-29 Thread akuznetsov 
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite 
into ignite-1.5.1


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

Branch: refs/heads/ignite-1.5.1
Commit: af8b14589b84b5c1412c3936b9c2c0cfffb4bbc4
Parents: 4c014a4 923fea8
Author: AKuznetsov 
Authored: Sun Nov 29 20:46:46 2015 +0700
Committer: AKuznetsov 
Committed: Sun Nov 29 20:46:46 2015 +0700

--
 .../cache/store/jdbc/CacheJdbcPojoStore.java| 188 +--
 1 file changed, 133 insertions(+), 55 deletions(-)
--

[1/2] ignite git commit: IGNITE-2024 Added support for fields and non-JavaBeans getters/setters.

2015-11-29 Thread akuznetsov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5.1 4c014a470 -> af8b14589


IGNITE-2024 Added support for fields and non-JavaBeans getters/setters.


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

Branch: refs/heads/ignite-1.5.1
Commit: 923fea8659eac46f351b8d64f710a351f6bbf3ff
Parents: 59f3726
Author: AKuznetsov 
Authored: Sun Nov 29 20:44:51 2015 +0700
Committer: AKuznetsov 
Committed: Sun Nov 29 20:44:51 2015 +0700

--
 .../cache/store/jdbc/CacheJdbcPojoStore.java| 188 +--
 1 file changed, 133 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/923fea86/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
 
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
index b837e5c..abc4b2e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStore.java
@@ -18,6 +18,8 @@
 package org.apache.ignite.cache.store.jdbc;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -44,7 +46,7 @@ import org.jetbrains.annotations.Nullable;
  */
 public class CacheJdbcPojoStore extends CacheAbstractJdbcStore {
 /** POJO methods cache. */
-private volatile Map> pojosMthds = 
Collections.emptyMap();
+private volatile Map> pojosProps 
= Collections.emptyMap();
 
 /**
  * Get field value from object for use as query parameter.
@@ -81,23 +83,23 @@ public class CacheJdbcPojoStore extends 
CacheAbstractJdbcStore {
 @Nullable private Object extractPojoParameter(@Nullable String cacheName, 
String typeName, String fldName,
 Object obj) throws CacheException {
 try {
-Map cacheMethods = 
pojosMthds.get(cacheName);
+Map cacheProps = 
pojosProps.get(cacheName);
 
-if (cacheMethods == null)
+if (cacheProps == null)
 throw new CacheException("Failed to find POJO type metadata 
for cache: " + U.maskName(cacheName));
 
-PojoMethodsCache mc = cacheMethods.get(typeName);
+PojoPropertiesCache ppc = cacheProps.get(typeName);
 
-if (mc == null)
+if (ppc == null)
 throw new CacheException("Failed to find POJO type metadata 
for type: " + typeName);
 
-Method getter = mc.getters.get(fldName);
+ClassProperty prop = ppc.props.get(fldName);
 
-if (getter == null)
-throw new CacheLoaderException("Failed to find getter in POJO 
class [class=" + typeName +
+if (prop == null)
+throw new CacheLoaderException("Failed to find property in 
POJO class [class=" + typeName +
 ", prop=" + fldName + "]");
 
-return getter.invoke(obj);
+return prop.get(obj);
 }
 catch (Exception e) {
 throw new CacheException("Failed to read object of class: " + 
typeName, e);
@@ -171,26 +173,26 @@ public class CacheJdbcPojoStore extends 
CacheAbstractJdbcStore {
 JdbcTypeField[] flds, Map loadColIdxs, ResultSet rs)
 throws CacheLoaderException {
 
-Map cacheMethods = pojosMthds.get(cacheName);
+Map cacheProps = 
pojosProps.get(cacheName);
 
-if (cacheMethods == null)
+if (cacheProps == null)
 throw new CacheLoaderException("Failed to find POJO types metadata 
for cache: " + U.maskName(cacheName));
 
-PojoMethodsCache mc = cacheMethods.get(typeName);
+PojoPropertiesCache ppc = cacheProps.get(typeName);
 
-if (mc == null)
+if (ppc == null)
 throw new CacheLoaderException("Failed to find POJO type metadata 
for type: " + typeName);
 
 try {
-Object obj = mc.ctor.newInstance();
+Object obj = ppc.ctor.newInstance();
 
 for (JdbcTypeField fld : flds) {
 String fldJavaName =

ignite git commit: IGNITE-843 Merge on code generation.

2015-11-29 Thread akuznetsov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 585706f4e -> 61a4f881d


IGNITE-843 Merge on code generation.


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

Branch: refs/heads/ignite-843-rc1
Commit: 61a4f881dc4ab75677ad23daf0cf5f0c4ea4cd13
Parents: 585706f
Author: Vasiliy Sisko 
Authored: Mon Nov 30 10:43:28 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Mon Nov 30 10:43:28 2015 +0700

--
 .../src/main/js/helpers/generator/generator-common.js  | 13 +
 .../src/main/js/helpers/generator/generator-java.js|  6 --
 2 files changed, 17 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/61a4f881/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
index cf28375..9fcd784 100644
--- 
a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
+++ 
b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
@@ -62,6 +62,19 @@ $generatorCommon.builder = function (deep) {
 res.safeDatasources = [];
 res.safePoint = -1;
 
+res.mergeProps = function (fromRes) {
+res.datasources = fromRes.datasources;
+
+angular.extend(res.imports, fromRes.imports);
+angular.extend(res.vars, fromRes.datasources);
+};
+
+res.mergeLines = function (fromRes) {
+_.forEach(fromRes, function (line) {
+res.append(line);
+})
+};
+
 res.startSafeBlock = function () {
 res.safeDeep = this.deep;
 this.safeNeedEmptyLine = this.needEmptyLine;

http://git-wip-us.apache.org/repos/asf/ignite/blob/61a4f881/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
--
diff --git 
a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js 
b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index 9db6437..b9fb376 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -1875,7 +1875,9 @@ $generatorJava.cluster = function (cluster, javaClass, 
clientNearCfg, clientMode
 var res = $generatorCommon.builder();
 
 if (cluster) {
-var resCfg = $generatorJava.clusterConfiguration(cluster, 
clientNearCfg, $generatorCommon.builder(1));
+var resCfg = $generatorJava.clusterConfiguration(cluster, 
clientNearCfg, $generatorCommon.builder());
+
+res.mergeProps(resCfg);
 
 if (javaClass) {
 if (clientMode)
@@ -1912,7 +1914,7 @@ $generatorJava.cluster = function (cluster, javaClass, 
clientNearCfg, clientMode
 res.needEmptyLine = true;
 }
 
-resCfg.forEach(res.line);
+res.mergeLines(resCfg);
 
 if (javaClass) {
 res.needEmptyLine = true;

Git Push Summary

2015-11-29 Thread anovikov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 [created] 61a4f881d

ignite git commit: IGNITE-843 Fix with proxy.

2015-11-29 Thread anovikov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 af3d3e841 -> c4adc0780


IGNITE-843 Fix with proxy.


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

Branch: refs/heads/ignite-843-rc2
Commit: c4adc0780602bd8367236eddd24078e03376dd13
Parents: af3d3e8
Author: Andrey 
Authored: Mon Nov 30 12:15:08 2015 +0700
Committer: Andrey 
Committed: Mon Nov 30 12:15:08 2015 +0700

--
 modules/control-center-web/src/main/js/routes/public.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c4adc078/modules/control-center-web/src/main/js/routes/public.js
--
diff --git a/modules/control-center-web/src/main/js/routes/public.js 
b/modules/control-center-web/src/main/js/routes/public.js
index 84f498f..73fc95c 100644
--- a/modules/control-center-web/src/main/js/routes/public.js
+++ b/modules/control-center-web/src/main/js/routes/public.js
@@ -140,7 +140,7 @@ router.post('/password/forgot', function(req, res) {
 subject: 'Password Reset',
 text: 'You are receiving this because you (or someone else) 
have requested the reset of the password for your account.\n\n' +
 'Please click on the following link, or paste this into your 
browser to complete the process:\n\n' +
-'http://' + req.headers['x-forwarded-for'] || req.headers.host 
+ '/password/reset?token=' + token + '\n\n' +
+'http://' + (req.headers['x-forwarded-for'] || 
req.headers.host) + '/password/reset?token=' + token + '\n\n' +
 'If you did not request this, please ignore this email and 
your password will remain unchanged.\n\n' +
 '--\n' +
 'Apache Ignite Web Console\n'
@@ -194,7 +194,7 @@ router.post('/password/reset', function(req, res) {
 subject: 'Your password has been changed',
 text: 'Hello,\n\n' +
 'This is a confirmation that the password for your account 
' + user.email + ' has just been changed.\n\n' +
-'Now you can login: http://' + 
req.headers['x-forwarded-for'] || req.headers.host + '\n\n' +
+'Now you can login: http://' + 
(req.headers['x-forwarded-for'] || req.headers.host) + '\n\n' +
 '--\n' +
 'Apache Ignite Web Console\n'
 };

ignite git commit: IGNITE-843 Minor fix.

2015-11-29 Thread anovikov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 c4adc0780 -> b16b27ef8


IGNITE-843 Minor fix.


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

Branch: refs/heads/ignite-843-rc2
Commit: b16b27ef8e0a53d41372e55ac3097e0a7f4198fb
Parents: c4adc07
Author: Andrey 
Authored: Mon Nov 30 12:46:17 2015 +0700
Committer: Andrey 
Committed: Mon Nov 30 12:46:17 2015 +0700

--
 modules/control-center-web/src/main/js/config.js | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b16b27ef/modules/control-center-web/src/main/js/config.js
--
diff --git a/modules/control-center-web/src/main/js/config.js 
b/modules/control-center-web/src/main/js/config.js
index f4914e5..4a46153 100644
--- a/modules/control-center-web/src/main/js/config.js
+++ b/modules/control-center-web/src/main/js/config.js
@@ -38,7 +38,7 @@ System.config({
 "bootstrap-carousel": "github:twbs/bootstrap@3.3.6",
 "clean-css": "npm:clean-css@3.4.8",
 "core-js": "npm:core-js@1.2.6",
-"css": "github:systemjs/plugin-css@0.1.19",
+"css": "github:systemjs/plugin-css@0.1.20",
 "file-saver": "github:eligrey/FileSaver.js@master",
 "font-awesome": "npm:font-awesome@4.4.0",
 "jquery": "github:components/jquery@2.1.4",
@@ -113,7 +113,7 @@ System.config({
 },
 "github:krispo/angular-nvd3@1.0.4": {
   "angular": "github:angular/bower-angular@1.4.8",
-  "d3": "npm:d3@3.5.9",
+  "d3": "npm:d3@3.5.10",
   "nvd3": "npm:nvd3@1.8.1"
 },
 "github:marceljuenemann/angular-drag-and-drop-lists@1.3.0": {
@@ -121,7 +121,7 @@ System.config({
 },
 "github:mgcrea/angular-motion@0.4.3": {
   "angular": "github:angular/bower-angular@1.4.8",
-  "css": "github:systemjs/plugin-css@0.1.19"
+  "css": "github:systemjs/plugin-css@0.1.20"
 },
 "github:twbs/bootstrap@3.3.6": {
   "jquery": "github:components/jquery@2.1.4"
@@ -143,8 +143,11 @@ System.config({
 },
 "npm:buffer@3.5.2": {
   "base64-js": "npm:base64-js@0.0.8",
+  "child_process": "github:jspm/nodelibs-child_process@0.1.0",
+  "fs": "github:jspm/nodelibs-fs@0.1.2",
   "ieee754": "npm:ieee754@1.1.6",
-  "is-array": "npm:is-array@1.0.1"
+  "is-array": "npm:is-array@1.0.1",
+  "process": "github:jspm/nodelibs-process@0.1.2"
 },
 "npm:clean-css@3.4.8": {
   "buffer": "github:jspm/nodelibs-buffer@0.1.0",
@@ -177,7 +180,7 @@ System.config({
   "buffer": "github:jspm/nodelibs-buffer@0.1.0"
 },
 "npm:font-awesome@4.4.0": {
-  "css": "github:systemjs/plugin-css@0.1.19"
+  "css": "github:systemjs/plugin-css@0.1.20"
 },
 "npm:graceful-readlink@1.0.1": {
   "fs": "github:jspm/nodelibs-fs@0.1.2"
@@ -192,7 +195,7 @@ System.config({
   "process": "github:jspm/nodelibs-process@0.1.2"
 },
 "npm:nvd3@1.8.1": {
-  "d3": "npm:d3@3.5.9"
+  "d3": "npm:d3@3.5.10"
 },
 "npm:os-browserify@0.1.2": {
   "os": "github:jspm/nodelibs-os@0.1.0"

ignite git commit: IGNITE-843 Minor fix.

2015-11-29 Thread anovikov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 b16b27ef8 -> c2efcd405


IGNITE-843 Minor fix.


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

Branch: refs/heads/ignite-843-rc2
Commit: c2efcd405deb489382eb0aa01ccddb3272f0e1a6
Parents: b16b27e
Author: Andrey 
Authored: Mon Nov 30 13:22:33 2015 +0700
Committer: Andrey 
Committed: Mon Nov 30 13:22:33 2015 +0700

--
 modules/control-center-web/src/main/js/package.json | 5 +
 modules/control-center-web/src/main/js/routes/public.js | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c2efcd40/modules/control-center-web/src/main/js/package.json
--
diff --git a/modules/control-center-web/src/main/js/package.json 
b/modules/control-center-web/src/main/js/package.json
index 52dd01e..da3f887 100644
--- a/modules/control-center-web/src/main/js/package.json
+++ b/modules/control-center-web/src/main/js/package.json
@@ -24,6 +24,7 @@
 "body-parser": "~1.14.1",
 "bootstrap-sass": "^3.3.6",
 "compression": "1.6.0",
+"connect-modrewrite": "^0.8.2",
 "connect-mongo": "^0.8.1",
 "cookie-parser": "~1.4.0",
 "debug": "~2.2.0",
@@ -31,7 +32,11 @@
 "express": "~4.13.3",
 "express-force-ssl": "^0.3.0",
 "express-session": "^1.12.0",
+"font-awesome": "^4.4.0",
 "gulp": "^3.9.0",
+"gulp-concat": "^2.6.0",
+"gulp-connect": "^2.2.0",
+"gulp-environments": "^0.1.1",
 "gulp-inject": "^3.0.0",
 "gulp-jade": "^1.1.0",
 "gulp-rimraf": "^0.2.0",

http://git-wip-us.apache.org/repos/asf/ignite/blob/c2efcd40/modules/control-center-web/src/main/js/routes/public.js
--
diff --git a/modules/control-center-web/src/main/js/routes/public.js 
b/modules/control-center-web/src/main/js/routes/public.js
index 73fc95c..717b217 100644
--- a/modules/control-center-web/src/main/js/routes/public.js
+++ b/modules/control-center-web/src/main/js/routes/public.js
@@ -140,7 +140,7 @@ router.post('/password/forgot', function(req, res) {
 subject: 'Password Reset',
 text: 'You are receiving this because you (or someone else) 
have requested the reset of the password for your account.\n\n' +
 'Please click on the following link, or paste this into your 
browser to complete the process:\n\n' +
-'http://' + (req.headers['x-forwarded-for'] || 
req.headers.host) + '/password/reset?token=' + token + '\n\n' +
+'http://' + req.headers.host + '/password/reset?token=' + 
token + '\n\n' +
 'If you did not request this, please ignore this email and 
your password will remain unchanged.\n\n' +
 '--\n' +
 'Apache Ignite Web Console\n'
@@ -194,7 +194,7 @@ router.post('/password/reset', function(req, res) {
 subject: 'Your password has been changed',
 text: 'Hello,\n\n' +
 'This is a confirmation that the password for your account 
' + user.email + ' has just been changed.\n\n' +
-'Now you can login: http://' + 
(req.headers['x-forwarded-for'] || req.headers.host) + '\n\n' +
+'Now you can login: http://' + req.headers.host + '\n\n' +
 '--\n' +
 'Apache Ignite Web Console\n'
 };

ignite git commit: IGNITE-843 Fixed joinTip.

2015-11-29 Thread akuznetsov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 61a4f881d -> 0c536216c


IGNITE-843 Fixed joinTip.


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

Branch: refs/heads/ignite-843-rc1
Commit: 0c536216cc0c4c5a44577d692b788b485a01984e
Parents: 61a4f88
Author: Alexey Kuznetsov 
Authored: Mon Nov 30 13:28:33 2015 +0700
Committer: Alexey Kuznetsov 
Committed: Mon Nov 30 13:28:33 2015 +0700

--
 modules/control-center-web/src/main/js/config.js | 5 -
 .../src/main/js/controllers/common-module.js | 8 +++-
 2 files changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0c536216/modules/control-center-web/src/main/js/config.js
--
diff --git a/modules/control-center-web/src/main/js/config.js 
b/modules/control-center-web/src/main/js/config.js
index 495ab0a..62abb41 100644
--- a/modules/control-center-web/src/main/js/config.js
+++ b/modules/control-center-web/src/main/js/config.js
@@ -207,8 +207,11 @@ System.config({
 },
 "npm:buffer@3.5.2": {
   "base64-js": "npm:base64-js@0.0.8",
+  "child_process": "github:jspm/nodelibs-child_process@0.1.0",
+  "fs": "github:jspm/nodelibs-fs@0.1.2",
   "ieee754": "npm:ieee754@1.1.6",
-  "is-array": "npm:is-array@1.0.1"
+  "is-array": "npm:is-array@1.0.1",
+  "process": "github:jspm/nodelibs-process@0.1.2"
 },
 "npm:cipher-base@1.0.2": {
   "buffer": "github:jspm/nodelibs-buffer@0.1.0",

http://git-wip-us.apache.org/repos/asf/ignite/blob/0c536216/modules/control-center-web/src/main/js/controllers/common-module.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/common-module.js 
b/modules/control-center-web/src/main/js/controllers/common-module.js
index 965906a..4985022 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -654,16 +654,14 @@ consoleModule.service('$common', [
 return {
 getModel: getModel,
 joinTip: function (arr) {
-if (!arr) {
+if (!arr)
 return arr;
-}
 
-var lines = arr.map(function (line) {
+var lines = _.map(arr, function (line) {
 var rtrimmed = line.replace(/\s+$/g, '');
 
-if (rtrimmed.indexOf('>', this.length - 1) == -1) {
+if (rtrimmed.indexOf('>', this.length - 1) == -1)
 rtrimmed = rtrimmed + '';
-}
 
 return rtrimmed;
 });

[4/5] ignite git commit: IGNITE-1936 implemented spa behavior to ignite console - Fixes #266.

2015-11-29 Thread anovikov 
http://git-wip-us.apache.org/repos/asf/ignite/blob/50856911/modules/control-center-web/src/main/js/controllers/igfs-controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/igfs-controller.js 
b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
index 7175c45..bcfa032 100644
--- a/modules/control-center-web/src/main/js/controllers/igfs-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
@@ -17,8 +17,8 @@
 
 // Controller for IGFS screen.
 consoleModule.controller('igfsController', [
-'$scope', '$controller', '$filter', '$http', '$timeout', '$common', 
'$focus', '$confirm', '$message', '$clone', '$table', '$preview', '$loading', 
'$unsavedChangesGuard',
-function ($scope, $controller, $filter, $http, $timeout, $common, $focus, 
$confirm, $message, $clone, $table, $preview, $loading, $unsavedChangesGuard) {
+'$scope', '$controller', '$filter', '$http', '$timeout', '$common', 
'$focus', '$confirm', '$clone', '$table', '$preview', '$loading', 
'$unsavedChangesGuard',
+function ($scope, $controller, $filter, $http, $timeout, $common, $focus, 
$confirm, $clone, $table, $preview, $loading, $unsavedChangesGuard) {
 $unsavedChangesGuard.install($scope);
 
 // Initialize the super class and extend it.
@@ -26,8 +26,6 @@ consoleModule.controller('igfsController', [
 
 $scope.ui = $common.formUI();
 
-$scope.showMoreInfo = $message.message;
-
 $scope.joinTip = $common.joinTip;
 $scope.getModel = $common.getModel;
 $scope.javaBuildInClasses = $common.javaBuildInClasses;
@@ -121,7 +119,7 @@ consoleModule.controller('igfsController', [
 $loading.start('loadingIgfsScreen');
 
 // When landing on the page, get IGFSs and show them.
-$http.post('igfs/list')
+$http.post('/api/v1/configuration/igfs/list')
 .success(function (data) {
 $scope.spaces = data.spaces;
 $scope.igfss = data.igfss;
@@ -295,7 +293,7 @@ consoleModule.controller('igfsController', [
 
 // Save IGFS into database.
 function save(item) {
-$http.post('igfs/save', item)
+$http.post('/api/v1/configuration/igfs/save', item)
 .success(function (_id) {
 $scope.ui.markPristine();
 
@@ -354,9 +352,9 @@ consoleModule.controller('igfsController', [
 .then(function () {
 var _id = selectedItem._id;
 
-$http.post('igfs/remove', {_id: _id})
-.success(function () {
-$common.showInfo('IGFS has been removed: ' + 
selectedItem.name);
+$http.post('/api/v1/configuration/igfs/remove', 
{_id: _id})
+.success(function () {
+$common.showInfo('IGFS has been removed: ' 
+ selectedItem.name);
 
 var igfss = $scope.igfss;
 
@@ -385,9 +383,9 @@ consoleModule.controller('igfsController', [
 
 $confirm.confirm('Are you sure you want to remove all IGFS?')
 .then(function () {
-$http.post('igfs/remove/all')
-.success(function () {
-$common.showInfo('All IGFS have been removed');
+$http.post('/api/v1/configuration/igfs/remove/all')
+.success(function () {
+$common.showInfo('All IGFS have been 
removed');
 
 $scope.igfss = [];
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/50856911/modules/control-center-web/src/main/js/controllers/metadata-controller.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/metadata-controller.js 
b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
index 067161c..6a3e99e 100644
--- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
@@ -17,8 +17,8 @@
 
 // Controller for Metadata screen.
 consoleModule.controller('metadataController', [
-'$scope', '$controller', '$filter', '$http', '$modal', '$common', 
'$timeout', '$focus', '$confirm', '$confirmBatch', '$message', '$clone', 
'$table', '$preview', '$loading', '$unsavedChangesGuard',
-function ($scope, $controller, $filter, $http, $modal, $common, $timeout, 
$focus, $confirm, $confirmBatch, $message, $clone, $table, $preview, $loading, 
$unsavedChangesGuard) {
+'$scope', '$controller', '$filter', '$http', '$modal', '$common', 
'$timeout',

[3/5] ignite git commit: IGNITE-1936 implemented spa behavior to ignite console - Fixes #266.

2015-11-29 Thread anovikov 
http://git-wip-us.apache.org/repos/asf/ignite/blob/50856911/modules/control-center-web/src/main/js/controllers/worker-xml.js
--
diff --git a/modules/control-center-web/src/main/js/controllers/worker-xml.js 
b/modules/control-center-web/src/main/js/controllers/worker-xml.js
new file mode 100644
index 000..2b472e3
--- /dev/null
+++ b/modules/control-center-web/src/main/js/controllers/worker-xml.js
@@ -0,0 +1,3892 @@
+/* */ 
+"format global";
+"deps ./ace";
+"no use strict";
+;(function(window) {
+if (typeof window.window != "undefined" && window.document)
+return;
+if (window.require && window.define)
+return;
+
+if (!window.console) {
+window.console = function() {
+var msgs = Array.prototype.slice.call(arguments, 0);
+postMessage({type: "log", data: msgs});
+};
+window.console.error =
+window.console.warn = 
+window.console.log =
+window.console.trace = window.console;
+}
+window.window = window;
+window.ace = window;
+
+window.onerror = function(message, file, line, col, err) {
+postMessage({type: "error", data: {
+message: message,
+data: err.data,
+file: file,
+line: line, 
+col: col,
+stack: err.stack
+}});
+};
+
+window.normalizeModule = function(parentId, moduleName) {
+// normalize plugin requires
+if (moduleName.indexOf("!") !== -1) {
+var chunks = moduleName.split("!");
+return window.normalizeModule(parentId, chunks[0]) + "!" + 
window.normalizeModule(parentId, chunks[1]);
+}
+// normalize relative requires
+if (moduleName.charAt(0) == ".") {
+var base = parentId.split("/").slice(0, -1).join("/");
+moduleName = (base ? base + "/" : "") + moduleName;
+
+while (moduleName.indexOf(".") !== -1 && previous != moduleName) {
+var previous = moduleName;
+moduleName = moduleName.replace(/^\.\//, "").replace(/\/\.\//, 
"/").replace(/[^\/]+\/\.\.\//, "");
+}
+}
+
+return moduleName;
+};
+
+window.require = function require(parentId, id) {
+if (!id) {
+id = parentId;
+parentId = null;
+}
+if (!id.charAt)
+throw new Error("worker.js require() accepts only (parentId, id) as 
arguments");
+
+id = window.normalizeModule(parentId, id);
+
+var module = window.require.modules[id];
+if (module) {
+if (!module.initialized) {
+module.initialized = true;
+module.exports = module.factory().exports;
+}
+return module.exports;
+}
+   
+if (!window.require.tlns)
+return console.log("unable to load " + id);
+
+var path = resolveModuleId(id, window.require.tlns);
+if (path.slice(-3) != ".js") path += ".js";
+
+window.require.id = id;
+window.require.modules[id] = {}; // prevent infinite loop on broken modules
+importScripts(path);
+return window.require(parentId, id);
+};
+function resolveModuleId(id, paths) {
+var testPath = id, tail = "";
+while (testPath) {
+var alias = paths[testPath];
+if (typeof alias == "string") {
+return alias + tail;
+} else if (alias) {
+return  alias.location.replace(/\/*$/, "/") + (tail || alias.main 
|| alias.name);
+} else if (alias === false) {
+return "";
+}
+var i = testPath.lastIndexOf("/");
+if (i === -1) break;
+tail = testPath.substr(i) + tail;
+testPath = testPath.slice(0, i);
+}
+return id;
+}
+window.require.modules = {};
+window.require.tlns = {};
+
+window.define = function(id, deps, factory) {
+if (arguments.length == 2) {
+factory = deps;
+if (typeof id != "string") {
+deps = id;
+id = window.require.id;
+}
+} else if (arguments.length == 1) {
+factory = id;
+deps = [];
+id = window.require.id;
+}
+
+if (typeof factory != "function") {
+window.require.modules[id] = {
+exports: factory,
+initialized: true
+};
+return;
+}
+
+if (!deps.length)
+// If there is no dependencies, we inject "require", "exports" and
+// "module" as dependencies, to provide CommonJS compatibility.
+deps = ["require", "exports", "module"];
+
+var req = function(childId) {
+return window.require(id, childId);
+};
+
+window.require.modules[id] = {
+exports: {},
+factory: function() {
+var module = this;
+var returnExports = factory.apply(this, deps.map(function(dep) {
+switch (dep) {
+// Because "require", "exports" and "module" aren't actual
+// dependencies, we must handle them seperately.
+case "require": return req;
+case "exports":

ignite git commit: IGNITE-843 Minor fix.

2015-11-29 Thread anovikov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 c2efcd405 -> ee17111dc


IGNITE-843 Minor fix.


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

Branch: refs/heads/ignite-843-rc2
Commit: ee17111dc51a0aee35f4905b61ea675a1ad2e0d5
Parents: c2efcd4
Author: Andrey 
Authored: Mon Nov 30 14:35:00 2015 +0700
Committer: Andrey 
Committed: Mon Nov 30 14:35:00 2015 +0700

--
 .../src/main/js/app/modules/Auth/index.js   | 9 ++---
 .../src/main/js/controllers/common-module.js| 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ee17111d/modules/control-center-web/src/main/js/app/modules/Auth/index.js
--
diff --git a/modules/control-center-web/src/main/js/app/modules/Auth/index.js 
b/modules/control-center-web/src/main/js/app/modules/Auth/index.js
index fd290ce..626b86c 100644
--- a/modules/control-center-web/src/main/js/app/modules/Auth/index.js
+++ b/modules/control-center-web/src/main/js/app/modules/Auth/index.js
@@ -47,11 +47,14 @@ angular
 $http.post('/api/v1/' + action, userInfo)
 .then(User.read)
 .then(function (user) {
-authorized(true);
+if (action != 'password/forgot') {
+authorized(true);
 
-$state.go('base.configuration.clusters');
+$root.$broadcast('user', user);
 
-$root.$broadcast('user', user);
+$state.go('base.configuration.clusters');
+} else
+$state.go('password.send');
 })
 .catch(function (errMsg) {
 $common.showPopoverMessage(undefined, undefined, 
'user_email', errMsg.data);

http://git-wip-us.apache.org/repos/asf/ignite/blob/ee17111d/modules/control-center-web/src/main/js/controllers/common-module.js
--
diff --git 
a/modules/control-center-web/src/main/js/controllers/common-module.js 
b/modules/control-center-web/src/main/js/controllers/common-module.js
index 2ad9cfb..f4d9428 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -2032,7 +2032,7 @@ consoleModule.controller('activeLink', [
 consoleModule.controller('resetPassword', [
 '$scope', '$modal', '$http', '$window', '$common', '$focus', 'Auth', 
'$state',
 function ($scope, $http, $common, $focus, Auth, $state) {
-if ($state.params.token)
+if ($state.params && $state.params.token)
 $http.post('/api/v1/password/validate-token', {token: 
$state.params.token})
 .success(function (res) {
 $scope.email = res.email;

[1/5] ignite git commit: IGNITE-1936 implemented spa behavior to ignite console - Fixes #266.

2015-11-29 Thread anovikov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 61a4f881d -> 50856911b


http://git-wip-us.apache.org/repos/asf/ignite/blob/50856911/modules/control-center-web/src/main/js/views/templates/message.jade
--
diff --git 
a/modules/control-center-web/src/main/js/views/templates/message.jade 
b/modules/control-center-web/src/main/js/views/templates/message.jade
index 0043709..6dcf445 100644
--- a/modules/control-center-web/src/main/js/views/templates/message.jade
+++ b/modules/control-center-web/src/main/js/views/templates/message.jade
@@ -21,6 +21,6 @@
 button.close(ng-click='$hide()' aria-hidden='true') 
 h4.modal-title {{title}}
 .modal-body(ng-show='content')
-p(ng-bind-html='content' style='text-align: left;')
+p(ng-bind-html='content.join("")' style='text-align: 
left;')
 .modal-footer
 button.btn.btn-primary(id='confirm-btn-confirm' 
ng-click='$hide()') Ok

[2/5] ignite git commit: IGNITE-1936 implemented spa behavior to ignite console - Fixes #266.

2015-11-29 Thread anovikov 
http://git-wip-us.apache.org/repos/asf/ignite/blob/50856911/modules/control-center-web/src/main/js/gulpfile.js/index.js
--
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/index.js 
b/modules/control-center-web/src/main/js/gulpfile.js/index.js
index dfcf7e7..6e4f5de 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/index.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/index.js
@@ -23,4 +23,4 @@ requireDir('./tasks', { recurse: true });
 
 // Summary tasks
 gulp.task('default', ['build']);
-gulp.task('watch', ['build', 'sass:watch', 'jade:watch', 'copy:watch']);
+gulp.task('watch', ['build', 'bundle:watch', 'sass:watch', 'jade:watch', 
'copy:watch']);

http://git-wip-us.apache.org/repos/asf/ignite/blob/50856911/modules/control-center-web/src/main/js/gulpfile.js/tasks/build.js
--
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/tasks/build.js 
b/modules/control-center-web/src/main/js/gulpfile.js/tasks/build.js
index 0930383..3f4cd61 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/tasks/build.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/tasks/build.js
@@ -16,8 +16,10 @@
  */
 
 var gulp = require('gulp');
-var gulpSequence = require('gulp-sequence');
+var sequence = require('gulp-sequence');
 
 gulp.task('build', function(cb) {
-gulpSequence('clean', ['bundle', 'copy', 'jade', 'sass'], 
'inject:plugins', cb)
+   var tasks = ['clean', ['copy', 'jade', 'sass'], 'bundle', 'concat', 
'inject:plugins'];
+
+sequence.apply(null, tasks)(cb)
 });

http://git-wip-us.apache.org/repos/asf/ignite/blob/50856911/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js
--
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js 
b/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js
index fd733b0..ed9e65f 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/tasks/bundle.js
@@ -1,7 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 var gulp = require('gulp');
 var jspm = require('jspm');
+var util = require('gulp-util');
+
+var paths = [
+'./app/**/*.js'
+];
+
+var options = {
+   minify: true
+};
 
 gulp.task('bundle', function() {
-   return jspm.bundleSFX('app/index', 'build/app.min.js', {})
+   if (util.env.debug) {
+   delete options.minify;
+   }
+
+   if (util.env.debug || util.env.sourcemaps) {
+   options.sourceMaps = true;
+   }
+
+   return jspm.bundleSFX('app/index', 'build/app.min.js', options);
 });
 
+gulp.task('bundle:watch', function() {
+   gulp.watch(paths, ['bundle'])
+});

http://git-wip-us.apache.org/repos/asf/ignite/blob/50856911/modules/control-center-web/src/main/js/gulpfile.js/tasks/concat.js
--
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/tasks/concat.js 
b/modules/control-center-web/src/main/js/gulpfile.js/tasks/concat.js
new file mode 100644
index 000..dfb2115
--- /dev/null
+++ b/modules/control-center-web/src/main/js/gulpfile.js/tasks/concat.js
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the

[5/5] ignite git commit: IGNITE-1936 implemented spa behavior to ignite console - Fixes #266.

2015-11-29 Thread anovikov 
IGNITE-1936 implemented spa behavior to ignite console - Fixes #266.

Signed-off-by: Andrey 


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

Branch: refs/heads/ignite-843-rc2
Commit: 50856911b56eacb48b1a88727e1e6f1f4f569448
Parents: 61a4f88
Author: Andrey 
Authored: Mon Nov 30 11:57:43 2015 +0700
Committer: Andrey 
Committed: Mon Nov 30 11:57:43 2015 +0700

--
 modules/control-center-web/src/main/js/app.js   |   11 +-
 .../control-center-web/src/main/js/app/index.js |   94 +-
 .../src/main/js/app/modules/Auth/index.js   |   75 +
 .../src/main/js/app/modules/User/index.js   |   56 +
 .../app/modules/configuration-sidebar/main.js   |8 +-
 .../src/main/js/app/modules/navbar/main.js  |8 +-
 .../main/js/app/modules/states/admin/index.js   |   31 +
 .../app/modules/states/configuration/index.js   |   51 +
 .../main/js/app/modules/states/login/index.js   |   42 +
 .../main/js/app/modules/states/logout/index.js  |   33 +
 .../app/modules/states/password-reset/index.js  |   40 +
 .../main/js/app/modules/states/profile/index.js |   31 +
 .../src/main/js/app/modules/states/sql/index.js |   31 +
 .../src/main/js/app/modules/userbar/main.js |   61 +
 modules/control-center-web/src/main/js/bin/www  |  107 -
 .../control-center-web/src/main/js/config.js|  245 +-
 .../src/main/js/controllers/admin-controller.js |   22 +-
 .../main/js/controllers/caches-controller.js|   14 +-
 .../main/js/controllers/clusters-controller.js  |   14 +-
 .../src/main/js/controllers/common-module.js|  159 +-
 .../src/main/js/controllers/ext-searchbox.js|  418 ++
 .../src/main/js/controllers/igfs-controller.js  |   22 +-
 .../main/js/controllers/metadata-controller.js  |   34 +-
 .../main/js/controllers/profile-controller.js   |   10 +-
 .../src/main/js/controllers/sql-controller.js   |   49 +-
 .../main/js/controllers/summary-controller.js   |8 +-
 .../src/main/js/controllers/worker-xml.js   | 3892 ++
 .../src/main/js/gulpfile.js/index.js|2 +-
 .../src/main/js/gulpfile.js/tasks/build.js  |6 +-
 .../src/main/js/gulpfile.js/tasks/bundle.js |   39 +-
 .../src/main/js/gulpfile.js/tasks/concat.js |   31 +
 .../src/main/js/gulpfile.js/tasks/connect.js|   34 +
 .../src/main/js/gulpfile.js/tasks/copy.js   |   52 +-
 .../src/main/js/gulpfile.js/tasks/production.js |   28 +
 .../src/main/js/gulpfile.js/tasks/sass.js   |   11 +-
 .../control-center-web/src/main/js/package.json |   73 +-
 .../src/main/js/public/favicon.ico  |  Bin 1150 -> 0 bytes
 .../src/main/js/public/favicon.png  |  Bin 0 -> 1150 bytes
 .../src/main/js/public/images/cache.png |  Bin 143060 -> 97173 bytes
 .../src/main/js/public/images/cluster.png   |  Bin 279519 -> 190760 bytes
 .../src/main/js/public/images/logo.png  |  Bin 8148 -> 6479 bytes
 .../src/main/js/public/images/metadata.png  |  Bin 451859 -> 283455 bytes
 .../src/main/js/public/images/query-chart.png   |  Bin 290052 -> 205236 bytes
 .../main/js/public/images/query-metadata.png|  Bin 308360 -> 214756 bytes
 .../src/main/js/public/images/query-table.png   |  Bin 275475 -> 185341 bytes
 .../src/main/js/public/images/summary.png   |  Bin 294358 -> 203058 bytes
 .../stylesheets/_bootstrap-variables.scss   |3 +
 .../stylesheets/_font-awesome-custom.scss   |   31 +
 .../src/main/js/public/stylesheets/style.scss   |   18 +-
 .../src/main/js/routes/admin.js |   23 +-
 .../src/main/js/routes/agent.js |5 -
 .../src/main/js/routes/caches.js|5 -
 .../src/main/js/routes/clusters.js  |5 -
 .../src/main/js/routes/igfs.js  |5 -
 .../src/main/js/routes/metadata.js  |   10 -
 .../src/main/js/routes/notebooks.js |6 +-
 .../src/main/js/routes/profile.js   |   14 -
 .../src/main/js/routes/public.js|   57 +-
 .../src/main/js/routes/sql.js   |   37 -
 .../src/main/js/routes/summary.js   |   29 -
 modules/control-center-web/src/main/js/serve.js |  107 +
 .../src/main/js/views/base.jade |6 +
 .../src/main/js/views/configuration/caches.jade |5 -
 .../main/js/views/configuration/clusters.jade   |5 -
 .../src/main/js/views/configuration/igfs.jade   |5 -
 .../main/js/views/configuration/metadata.jade   |5 -
 .../main/js/views/configuration/sidebar.jade|4 +-
 .../main/js/views/configuration/summary.jade|9 +-
 .../src/main/js/views/error.jade|   22 -

ignite git commit: IGNITE-843 Fix with proxy.

2015-11-29 Thread anovikov 
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 50856911b -> af3d3e841


IGNITE-843 Fix with proxy.


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

Branch: refs/heads/ignite-843-rc2
Commit: af3d3e8419573d253ce0a966ed56958ead8bf2f0
Parents: 5085691
Author: Andrey 
Authored: Mon Nov 30 12:09:02 2015 +0700
Committer: Andrey 
Committed: Mon Nov 30 12:09:02 2015 +0700

--
 modules/control-center-web/src/main/js/routes/public.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/af3d3e84/modules/control-center-web/src/main/js/routes/public.js
--
diff --git a/modules/control-center-web/src/main/js/routes/public.js 
b/modules/control-center-web/src/main/js/routes/public.js
index 717b217..84f498f 100644
--- a/modules/control-center-web/src/main/js/routes/public.js
+++ b/modules/control-center-web/src/main/js/routes/public.js
@@ -140,7 +140,7 @@ router.post('/password/forgot', function(req, res) {
 subject: 'Password Reset',
 text: 'You are receiving this because you (or someone else) 
have requested the reset of the password for your account.\n\n' +
 'Please click on the following link, or paste this into your 
browser to complete the process:\n\n' +
-'http://' + req.headers.host + '/password/reset?token=' + 
token + '\n\n' +
+'http://' + req.headers['x-forwarded-for'] || req.headers.host 
+ '/password/reset?token=' + token + '\n\n' +
 'If you did not request this, please ignore this email and 
your password will remain unchanged.\n\n' +
 '--\n' +
 'Apache Ignite Web Console\n'
@@ -194,7 +194,7 @@ router.post('/password/reset', function(req, res) {
 subject: 'Your password has been changed',
 text: 'Hello,\n\n' +
 'This is a confirmation that the password for your account 
' + user.email + ' has just been changed.\n\n' +
-'Now you can login: http://' + req.headers.host + '\n\n' +
+'Now you can login: http://' + 
req.headers['x-forwarded-for'] || req.headers.host + '\n\n' +
 '--\n' +
 'Apache Ignite Web Console\n'
 };