ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [2/2] ignite git commit: GNITE-843 Added support for optional content generation.
Date Thu, 14 Jan 2016 10:55:47 GMT
GNITE-843 Added support for optional content generation.


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

Branch: refs/heads/ignite-843-rc2
Commit: 39956dbe9f5844d313a11830cf914f0062bc74ed
Parents: eb2d9ea
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Thu Jan 14 17:55:45 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Thu Jan 14 17:55:45 2016 +0700

----------------------------------------------------------------------
 .../configuration/summary/summary.controller.js |  2 ++
 .../main/js/helpers/generator/generator-java.js |  2 +-
 .../js/helpers/generator/generator-optional.js  | 23 ++++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/39956dbe/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 d6e7905..0d590ba 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
@@ -257,6 +257,8 @@ export default [
                 zip.file(srcPath + meta.valueType.replace(/\./g, '/') + '.java', meta.valueClass);
             }
 
+            $generatorOptional.optionalContent(zip, cluster);
+
             const blob = zip.generate({type: 'blob', mimeType: 'application/octet-stream'});
 
             // Download archive.

http://git-wip-us.apache.org/repos/asf/ignite/blob/39956dbe/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 34e6c45..badf8e3 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
@@ -2344,7 +2344,7 @@ $generatorJava.tryLoadSecretProperties = function (cluster, res) {
     if ($generatorCommon.secretPropertiesNeeded(cluster)) {
         res.importClass('org.apache.ignite.configuration.IgniteConfiguration');
 
-        $generatorJava.declareVariableCustom(res, 'props', 'java.util.Properties', 'new Properties()',
'private static');
+        $generatorJava.declareVariableCustom(res, 'props', 'java.util.Properties', 'new Properties()',
'private static final');
 
         res.startBlock('static {');
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/39956dbe/modules/control-center-web/src/main/js/helpers/generator/generator-optional.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-optional.js
b/modules/control-center-web/src/main/js/helpers/generator/generator-optional.js
new file mode 100644
index 0000000..ad0d938
--- /dev/null
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-optional.js
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+// Optional content generation entry point.
+$generatorOptional = {};
+
+$generatorOptional.optionalContent = function (zip, cluster) {
+    // No-op.
+};


Mime
View raw message