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/29 15:27:18 UTC
[3/6] ignite git commit: IGNITE-2713 Added resource folder to project
structure.
IGNITE-2713 Added resource folder to project structure.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f045f538
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f045f538
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f045f538
Branch: refs/heads/ignite-2612
Commit: f045f5386f9dc873a67cf8587921172a78c55b85
Parents: cb1d79d
Author: vsisko <vs...@gridgain.com>
Authored: Mon Feb 29 12:04:30 2016 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Feb 29 12:04:30 2016 +0700
----------------------------------------------------------------------
.../configuration/summary/summary.controller.js | 26 ++++++++++++++------
1 file changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f045f538/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 068a03c..d4e3e98 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
@@ -90,6 +90,14 @@ export default [
]
};
+ const resourcesFolder = {
+ type: 'folder',
+ name: 'resources',
+ children: [
+ { type: 'file', name: 'secret.properties' }
+ ]
+ };
+
const javaFolder = {
type: 'folder',
name: 'java',
@@ -109,6 +117,12 @@ export default [
const srvCfg = { type: 'file', name: 'server.xml' };
+ const mainFolder = {
+ type: 'folder',
+ name: 'main',
+ children: [javaFolder]
+ };
+
const projectStructureRoot = {
type: 'folder',
name: 'project.zip',
@@ -128,13 +142,7 @@ export default [
{
type: 'folder',
name: 'src',
- children: [
- {
- type: 'folder',
- name: 'main',
- children: [javaFolder]
- }
- ]
+ children: [mainFolder]
},
{ type: 'file', name: '.dockerignore' },
{ type: 'file', name: 'Dockerfile' },
@@ -205,8 +213,12 @@ export default [
sessionStorage.summarySelectedId = $scope.clusters.indexOf(cluster);
+ mainFolder.children = [javaFolder];
javaFolder.children = [javaConfigFolder, javaStartupFolder];
+ if ($generatorCommon.secretPropertiesNeeded(cluster))
+ mainFolder.children.push(resourcesFolder);
+
if ($generatorCommon.dataForExampleConfigured(cluster))
javaFolder.children.push(exampleFolder);