ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-843 Refactored version into provider.
Date Fri, 05 Feb 2016 16:31:22 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 9d7da8749 -> 9d9810105


IGNITE-843 Refactored version into provider.


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

Branch: refs/heads/ignite-843-rc2
Commit: 9d9810105a6a75fedec1f9791adc14866a77b246
Parents: 9d7da87
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Fri Feb 5 23:31:16 2016 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Fri Feb 5 23:31:16 2016 +0700

----------------------------------------------------------------------
 .../ui-ace-pom/ui-ace-pom.controller.js         |  7 ++---
 .../control-center-web/src/main/js/app/index.js |  4 ++-
 .../src/main/js/app/modules/Version/main.js     | 32 ++++++++++++++++++++
 .../configuration/summary/summary.controller.js |  7 ++---
 4 files changed, 40 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9d981010/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.controller.js
b/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.controller.js
index 210b6de..61d010a 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.controller.js
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.controller.js
@@ -15,10 +15,7 @@
  * limitations under the License.
  */
 
-// TODO IGNITE-2055: use set version.
-const igniteVersion = '1.5.0.final';
-
-export default ['$scope', function($scope) {
+export default ['$scope', 'IgniteVersion', function($scope, IgniteVersion) {
     const ctrl = this;
 
     // Watchers definition.
@@ -29,7 +26,7 @@ export default ['$scope', function($scope) {
             return;
 
         // TODO IGNITE-2053: need move $generatorPom to services.
-        ctrl.data = $generatorPom.pom($scope.cluster, igniteVersion).asString();
+        ctrl.data = $generatorPom.pom($scope.cluster, IgniteVersion.version).asString();
     };
 
     // Setup watchers.

http://git-wip-us.apache.org/repos/asf/ignite/blob/9d981010/modules/control-center-web/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/index.js b/modules/control-center-web/src/main/js/app/index.js
index 4f80de8..3f4bd04 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -79,6 +79,7 @@ import './modules/configuration/include-event-types/main';
 import './modules/terms/main';
 import './modules/logo/main';
 import './modules/getting-started/main';
+import './modules/Version/main';
 // endignite
 
 // Directives.
@@ -130,7 +131,8 @@ angular
     'ignite-console.configuration.include-event-types',
     'ignite-console.terms',
     'ignite-console.logo',
-    'ignite-console.getting-started'
+    'ignite-console.getting-started',
+    'ignite-console.version'
 ])
 // Directives.
 .directive(...igniteLoading)

http://git-wip-us.apache.org/repos/asf/ignite/blob/9d981010/modules/control-center-web/src/main/js/app/modules/Version/main.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/Version/main.js b/modules/control-center-web/src/main/js/app/modules/Version/main.js
new file mode 100644
index 0000000..4aa008e
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/Version/main.js
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+import angular from 'angular';
+
+angular
+    .module('ignite-console.version', [])
+    .provider('IgniteVersion', function() {
+        const version = {
+            version: '1.5.0-final'
+        };
+
+        this.update = (newVersion) => {
+            version.version = newVersion;
+        };
+
+        this.$get = [() => version];
+    });

http://git-wip-us.apache.org/repos/asf/ignite/blob/9d981010/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
index 1ef60a6..b301a32 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
@@ -18,10 +18,9 @@
 import JSZip from 'jszip';
 
 export default [
-    '$scope', '$http', '$common', '$loading', '$table', '$filter', '$timeout', 'ConfigurationSummaryResource',
'JavaTypes',
-    function($scope, $http, $common, $loading, $table, $filter, $timeout, Resource, JavaTypes)
{
+    '$scope', '$http', '$common', '$loading', '$table', '$filter', '$timeout', 'ConfigurationSummaryResource',
'JavaTypes', 'IgniteVersion',
+    function($scope, $http, $common, $loading, $table, $filter, $timeout, Resource, JavaTypes,
IgniteVersion) {
         const ctrl = this;
-        const igniteVersion = '1.5.0.final';
 
         $loading.start('loading');
 
@@ -255,7 +254,7 @@ export default [
             zip.file(srcPath + 'startup/ClientNodeCodeStartup.java', $generatorJava.nodeStartup(cluster,
'startup', 'ClientNodeCodeStartup',
                 'ClientConfigurationFactory.createConfiguration()', 'config.ClientConfigurationFactory',
clientNearCfg));
 
-            zip.file('pom.xml', $generatorPom.pom(cluster, igniteVersion).asString());
+            zip.file('pom.xml', $generatorPom.pom(cluster, IgniteVersion.version).asString());
 
             zip.file('README.txt', $generatorReadme.readme().asString());
             zip.file('jdbc-drivers/README.txt', $generatorReadme.readmeJdbc().asString());


Mime
View raw message