IGNITE-843 Fixed property file generation and downloaded archive content.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e1aa2cbd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e1aa2cbd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e1aa2cbd Branch: refs/heads/ignite-1121 Commit: e1aa2cbde29f731eb9a62e7b065a061d0385b0aa Parents: 3e6af39 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Jul 30 17:31:21 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Jul 30 17:31:21 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/summary-controller.js | 2 +- .../src/main/js/routes/generator/common.js | 2 +- modules/control-center-web/src/main/js/routes/summary.js | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1aa2cbd/modules/control-center-web/src/main/js/controllers/summary-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/summary-controller.js b/modules/control-center-web/src/main/js/controllers/summary-controller.js index 531dc83..a152485 100644 --- a/modules/control-center-web/src/main/js/controllers/summary-controller.js +++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js @@ -120,7 +120,7 @@ controlCenterModule.controller('summaryController', ['$scope', '$http', '$common }; $scope.download = function () { - $http.post('summary/download', {_id: $scope.selectedItem._id, javaClass: $scope.javaClass, os: $scope.os}) + $http.post('summary/download', {_id: $scope.selectedItem._id, os: $scope.os}) .success(function (data) { var file = document.createElement('a'); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1aa2cbd/modules/control-center-web/src/main/js/routes/generator/common.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/generator/common.js b/modules/control-center-web/src/main/js/routes/generator/common.js index 54e3197..a74b545 100644 --- a/modules/control-center-web/src/main/js/routes/generator/common.js +++ b/modules/control-center-web/src/main/js/routes/generator/common.js @@ -309,7 +309,7 @@ exports.generateProperties = function (cluster) { } if (datasources.length > 0) - return '# ' + mainComment() + '\n\n' + res.join(); + return '# ' + mainComment() + '\n\n' + res.join(''); return undefined; }; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e1aa2cbd/modules/control-center-web/src/main/js/routes/summary.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/summary.js b/modules/control-center-web/src/main/js/routes/summary.js index 9f8df2a..e91e045 100644 --- a/modules/control-center-web/src/main/js/routes/summary.js +++ b/modules/control-center-web/src/main/js/routes/summary.js @@ -87,8 +87,6 @@ router.post('/download', function (req, res) { // Send the file to the page output. zip.pipe(res); - var javaClass = req.body.javaClass; - if (!clientNearConfiguration) { zip.append(generatorDocker.generateClusterConfiguration(cluster, req.body.os), {name: "Dockerfile"}); @@ -99,8 +97,10 @@ router.post('/download', function (req, res) { } zip.append(generatorXml.generateClusterConfiguration(cluster, clientNearConfiguration), {name: cluster.name + ".xml"}) - .append(generatorJava.generateClusterConfiguration(cluster, javaClass, clientNearConfiguration), - {name: javaClass ? 'ConfigurationFactory.java' : cluster.name + '.snipplet.java'}) + .append(generatorJava.generateClusterConfiguration(cluster, false, clientNearConfiguration), + {name: cluster.name + '.snippet.java'}) + .append(generatorJava.generateClusterConfiguration(cluster, true, clientNearConfiguration), + {name: 'ConfigurationFactory.java'}) .finalize(); }); });
