Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0166218454 for ; Fri, 31 Jul 2015 02:55:08 +0000 (UTC) Received: (qmail 93197 invoked by uid 500); 31 Jul 2015 02:55:07 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 93166 invoked by uid 500); 31 Jul 2015 02:55:07 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 93157 invoked by uid 99); 31 Jul 2015 02:55:07 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jul 2015 02:55:07 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 74F4D195606 for ; Fri, 31 Jul 2015 02:55:07 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id vl9jQ1T65aHa for ; Fri, 31 Jul 2015 02:54:55 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id B4760506AD for ; Fri, 31 Jul 2015 02:45:48 +0000 (UTC) Received: (qmail 73095 invoked by uid 99); 31 Jul 2015 02:45:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jul 2015 02:45:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1E553DF9F8; Fri, 31 Jul 2015 02:45:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 31 Jul 2015 02:46:02 -0000 Message-Id: <46e9ee23510b4eab910379fb0ca7ae81@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/25] incubator-ignite git commit: IGNITE-843 Fixed property file generation and downloaded archive content. 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 Authored: Thu Jul 30 17:31:21 2015 +0700 Committer: AKuznetsov 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(); }); });