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 2015/09/10 11:45:04 UTC
[1/2] ignite git commit: IGNITE-843 Minor tweak for code generation.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 e35c4fb63 -> db03da69f
IGNITE-843 Minor tweak for code generation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/35059bae
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/35059bae
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/35059bae
Branch: refs/heads/ignite-843
Commit: 35059bae4f8208aa45f6307ea7852a6713f69b3b
Parents: c8e5855
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Sep 10 16:38:55 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Sep 10 16:38:55 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/caches-controller.js | 32 ++++++-------
.../main/js/controllers/clusters-controller.js | 48 ++++++++++----------
.../src/main/js/controllers/common-module.js | 1 -
.../main/js/controllers/metadata-controller.js | 12 ++---
.../main/js/routes/generator/generator-java.js | 4 +-
.../main/js/routes/generator/generator-xml.js | 6 ++-
6 files changed, 52 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/35059bae/modules/control-center-web/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js
index a419047..ee7b7d1 100644
--- a/modules/control-center-web/src/main/js/controllers/caches-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js
@@ -337,36 +337,36 @@ controlCenterModule.controller('cachesController', [
var varName = 'cache';
- $scope.preview.general.xml = $generatorXml.cacheMetadatas(cacheMetadatas, $generatorXml.cacheGeneral(val)).join('');
- $scope.preview.general.java = $generatorJava.cacheMetadatas(cacheMetadatas, varName, $generatorJava.cacheGeneral(val, varName)).join('');
+ $scope.preview.general.xml = $generatorXml.cacheMetadatas(cacheMetadatas, $generatorXml.cacheGeneral(val)).asString();
+ $scope.preview.general.java = $generatorJava.cacheMetadatas(cacheMetadatas, varName, $generatorJava.cacheGeneral(val, varName)).asString();
$scope.preview.general.allDefaults = $common.isEmptyString($scope.preview.general.xml);
- $scope.preview.memory.xml = $generatorXml.cacheMemory(val).join('');
- $scope.preview.memory.java = $generatorJava.cacheMemory(val, varName).join('');
+ $scope.preview.memory.xml = $generatorXml.cacheMemory(val).asString();
+ $scope.preview.memory.java = $generatorJava.cacheMemory(val, varName).asString();
$scope.preview.memory.allDefaults = $common.isEmptyString($scope.preview.memory.xml);
- $scope.preview.query.xml = $generatorXml.cacheQuery(val).join('');
- $scope.preview.query.java = $generatorJava.cacheQuery(val, varName).join('');
+ $scope.preview.query.xml = $generatorXml.cacheQuery(val).asString();
+ $scope.preview.query.java = $generatorJava.cacheQuery(val, varName).asString();
$scope.preview.query.allDefaults = $common.isEmptyString($scope.preview.query.xml);
- $scope.preview.store.xml = $generatorXml.cacheStore(val).join('');
- $scope.preview.store.java = $generatorJava.cacheStore(val, varName).join('');
+ $scope.preview.store.xml = $generatorXml.cacheStore(val).asString();
+ $scope.preview.store.java = $generatorJava.cacheStore(val, varName).asString();
$scope.preview.store.allDefaults = $common.isEmptyString($scope.preview.store.xml);
- $scope.preview.concurrency.xml = $generatorXml.cacheConcurrency(val).join('');
- $scope.preview.concurrency.java = $generatorJava.cacheConcurrency(val, varName).join('');
+ $scope.preview.concurrency.xml = $generatorXml.cacheConcurrency(val).asString();
+ $scope.preview.concurrency.java = $generatorJava.cacheConcurrency(val, varName).asString();
$scope.preview.concurrency.allDefaults = $common.isEmptyString($scope.preview.concurrency.xml);
- $scope.preview.rebalance.xml = $generatorXml.cacheRebalance(val).join('');
- $scope.preview.rebalance.java = $generatorJava.cacheRebalance(val, varName).join('');
+ $scope.preview.rebalance.xml = $generatorXml.cacheRebalance(val).asString();
+ $scope.preview.rebalance.java = $generatorJava.cacheRebalance(val, varName).asString();
$scope.preview.rebalance.allDefaults = $common.isEmptyString($scope.preview.rebalance.xml);
- $scope.preview.serverNearCache.xml = $generatorXml.cacheServerNearCache(val).join('');
- $scope.preview.serverNearCache.java = $generatorJava.cacheServerNearCache(val, varName).join('');
+ $scope.preview.serverNearCache.xml = $generatorXml.cacheServerNearCache(val).asString();
+ $scope.preview.serverNearCache.java = $generatorJava.cacheServerNearCache(val, varName).asString();
$scope.preview.serverNearCache.allDefaults = $common.isEmptyString($scope.preview.serverNearCache.xml);
- $scope.preview.statistics.xml = $generatorXml.cacheStatistics(val).join('');
- $scope.preview.statistics.java = $generatorJava.cacheStatistics(val, varName).join('');
+ $scope.preview.statistics.xml = $generatorXml.cacheStatistics(val).asString();
+ $scope.preview.statistics.java = $generatorJava.cacheStatistics(val, varName).asString();
$scope.preview.statistics.allDefaults = $common.isEmptyString($scope.preview.statistics.xml);
sessionStorage.cacheBackupItem = angular.toJson(val);
http://git-wip-us.apache.org/repos/asf/ignite/blob/35059bae/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index a1131fa..16919fa 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -221,52 +221,52 @@ controlCenterModule.controller('clustersController', ['$scope', '$controller', '
return caches;
}, []);
- $scope.preview.general.xml = $generatorXml.clusterCaches(clusterCaches, $generatorXml.clusterGeneral(val)).join('');
- $scope.preview.general.java = $generatorJava.clusterCaches(clusterCaches, $generatorJava.clusterGeneral(val)).join('');
+ $scope.preview.general.xml = $generatorXml.clusterCaches(clusterCaches, $generatorXml.clusterGeneral(val)).asString();
+ $scope.preview.general.java = $generatorJava.clusterCaches(clusterCaches, $generatorJava.clusterGeneral(val)).asString();
$scope.preview.general.allDefaults = $common.isEmptyString($scope.preview.general.xml);
- $scope.preview.atomics.xml = $generatorXml.clusterAtomics(val).join('');
- $scope.preview.atomics.java = $generatorJava.clusterAtomics(val).join('');
+ $scope.preview.atomics.xml = $generatorXml.clusterAtomics(val).asString();
+ $scope.preview.atomics.java = $generatorJava.clusterAtomics(val).asString();
$scope.preview.atomics.allDefaults = $common.isEmptyString($scope.preview.atomics.xml);
- $scope.preview.communication.xml = $generatorXml.clusterCommunication(val).join('');
- $scope.preview.communication.java = $generatorJava.clusterCommunication(val).join('');
+ $scope.preview.communication.xml = $generatorXml.clusterCommunication(val).asString();
+ $scope.preview.communication.java = $generatorJava.clusterCommunication(val).asString();
$scope.preview.communication.allDefaults = $common.isEmptyString($scope.preview.communication.xml);
- $scope.preview.deployment.xml = $generatorXml.clusterDeployment(val).join('');
- $scope.preview.deployment.java = $generatorJava.clusterDeployment(val).join('');
+ $scope.preview.deployment.xml = $generatorXml.clusterDeployment(val).asString();
+ $scope.preview.deployment.java = $generatorJava.clusterDeployment(val).asString();
$scope.preview.deployment.allDefaults = $common.isEmptyString($scope.preview.deployment.xml);
- $scope.preview.events.xml = $generatorXml.clusterEvents(val).join('');
- $scope.preview.events.java = $generatorJava.clusterEvents(val).join('');
+ $scope.preview.events.xml = $generatorXml.clusterEvents(val).asString();
+ $scope.preview.events.java = $generatorJava.clusterEvents(val).asString();
$scope.preview.events.allDefaults = $common.isEmptyString($scope.preview.events.xml);
- $scope.preview.marshaller.xml = $generatorXml.clusterMarshaller(val).join('');
- $scope.preview.marshaller.java = $generatorJava.clusterMarshaller(val).join('');
+ $scope.preview.marshaller.xml = $generatorXml.clusterMarshaller(val).asString();
+ $scope.preview.marshaller.java = $generatorJava.clusterMarshaller(val).asString();
$scope.preview.marshaller.allDefaults = $common.isEmptyString($scope.preview.marshaller.xml);
- $scope.preview.metrics.xml = $generatorXml.clusterMetrics(val).join('');
- $scope.preview.metrics.java = $generatorJava.clusterMetrics(val).join('');
+ $scope.preview.metrics.xml = $generatorXml.clusterMetrics(val).asString();
+ $scope.preview.metrics.java = $generatorJava.clusterMetrics(val).asString();
$scope.preview.metrics.allDefaults = $common.isEmptyString($scope.preview.metrics.xml);
- $scope.preview.p2p.xml = $generatorXml.clusterP2p(val).join('');
- $scope.preview.p2p.java = $generatorJava.clusterP2p(val).join('');
+ $scope.preview.p2p.xml = $generatorXml.clusterP2p(val).asString();
+ $scope.preview.p2p.java = $generatorJava.clusterP2p(val).asString();
$scope.preview.p2p.allDefaults = $common.isEmptyString($scope.preview.p2p.xml);
- $scope.preview.swap.xml = $generatorXml.clusterSwap(val).join('');
- $scope.preview.swap.java = $generatorJava.clusterSwap(val).join('');
+ $scope.preview.swap.xml = $generatorXml.clusterSwap(val).asString();
+ $scope.preview.swap.java = $generatorJava.clusterSwap(val).asString();
$scope.preview.swap.allDefaults = $common.isEmptyString($scope.preview.swap.xml);
- $scope.preview.time.xml = $generatorXml.clusterTime(val).join('');
- $scope.preview.time.java = $generatorJava.clusterTime(val).join('');
+ $scope.preview.time.xml = $generatorXml.clusterTime(val).asString();
+ $scope.preview.time.java = $generatorJava.clusterTime(val).asString();
$scope.preview.time.allDefaults = $common.isEmptyString($scope.preview.time.xml);
- $scope.preview.pools.xml = $generatorXml.clusterPools(val).join('');
- $scope.preview.pools.java = $generatorJava.clusterPools(val).join('');
+ $scope.preview.pools.xml = $generatorXml.clusterPools(val).asString();
+ $scope.preview.pools.java = $generatorJava.clusterPools(val).asString();
$scope.preview.pools.allDefaults = $common.isEmptyString($scope.preview.pools.xml);
- $scope.preview.transactions.xml = $generatorXml.clusterTransactions(val).join('');
- $scope.preview.transactions.java = $generatorJava.clusterTransactions(val).join('');
+ $scope.preview.transactions.xml = $generatorXml.clusterTransactions(val).asString();
+ $scope.preview.transactions.java = $generatorJava.clusterTransactions(val).asString();
$scope.preview.transactions.allDefaults = $common.isEmptyString($scope.preview.transactions.xml);
$common.markChanged($scope.ui.inputForm, 'clusterBackupItemChanged');
http://git-wip-us.apache.org/repos/asf/ignite/blob/35059bae/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index c8e676b..f14287d 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -797,7 +797,6 @@ controlCenterModule.service('$stepConfirm', function ($timeout, $modal, $rootSco
while(nextElement())
stepProcessor(modelArray[curIx]);
}
- scope.cancelTitle = cancelTitle || dfltCancelTitle;
if (!nextElement()) {
deferred.resolve();
http://git-wip-us.apache.org/repos/asf/ignite/blob/35059bae/modules/control-center-web/src/main/js/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
index eb8ae29..e8ac53d 100644
--- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
@@ -628,16 +628,16 @@ controlCenterModule.controller('metadataController', [
if (val) {
sessionStorage.metadataBackupItem = angular.toJson(val);
- $scope.preview.general.xml = $generatorXml.metadataGeneral(val).join('');
- $scope.preview.general.java = $generatorJava.metadataGeneral(val).join('');
+ $scope.preview.general.xml = $generatorXml.metadataGeneral(val).asString();
+ $scope.preview.general.java = $generatorJava.metadataGeneral(val).asString();
$scope.preview.general.allDefaults = $common.isEmptyString($scope.preview.general.xml);
- $scope.preview.query.xml = $generatorXml.metadataQuery(val).join('');
- $scope.preview.query.java = $generatorJava.metadataQuery(val).join('');
+ $scope.preview.query.xml = $generatorXml.metadataQuery(val).asString();
+ $scope.preview.query.java = $generatorJava.metadataQuery(val).asString();
$scope.preview.query.allDefaults = $common.isEmptyString($scope.preview.query.xml);
- $scope.preview.store.xml = $generatorXml.metadataStore(val).join('');
- $scope.preview.store.java = $generatorJava.metadataStore(val).join('');
+ $scope.preview.store.xml = $generatorXml.metadataStore(val).asString();
+ $scope.preview.store.java = $generatorJava.metadataStore(val).asString();
$scope.preview.store.allDefaults = $common.isEmptyString($scope.preview.store.xml);
$common.markChanged($scope.ui.inputForm, 'metadataBackupItemChanged');
http://git-wip-us.apache.org/repos/asf/ignite/blob/35059bae/modules/control-center-web/src/main/js/routes/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-java.js b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
index e936df0..dce71c2 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
@@ -1131,11 +1131,11 @@ $generatorJava.cluster = function (cluster, javaClass, clientNearCfg) {
res.endBlock('}');
res.endBlock('}');
- return res.generateImports() + '\n\n' + res.join('\n');
+ return res.generateImports() + '\n\n' + res.asString();
}
}
- return res.join('\n');
+ return res.asString();
};
// For server side we should export Java code generation entry point.
http://git-wip-us.apache.org/repos/asf/ignite/blob/35059bae/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
index e826ca0..7d92f9f 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-xml.js
@@ -845,6 +845,8 @@ $generatorXml.metadataStore = function(meta, res) {
$generatorXml.property(res, meta, 'databaseSchema');
$generatorXml.property(res, meta, 'databaseTable');
+ res.needEmptyLine = true;
+
if (!$dataStructures.isJavaBuildInClass(meta.keyType))
$generatorXml.metadataDatabaseFields(res, meta, 'keyFields');
@@ -1048,10 +1050,10 @@ $generatorXml.cluster = function (cluster, clientNearCfg) {
}
// 3. Add main content.
- xml += res.join('\n');
+ xml += res.asString();
// 4. Add footer.
- xml += '</beans>\n';
+ xml += '\n</beans>';
return xml;
}
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/db03da69
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/db03da69
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/db03da69
Branch: refs/heads/ignite-843
Commit: db03da69fa9815641eb81a33739f2d8878e1bed5
Parents: 35059ba e35c4fb
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Sep 10 16:45:43 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Sep 10 16:45:43 2015 +0700
----------------------------------------------------------------------
.../apache/ignite/agent/AgentConfiguration.java | 18 ++++++------------
.../org/apache/ignite/agent/AgentLauncher.java | 16 +++++++++-------
.../java/org/apache/ignite/agent/AgentSocket.java | 4 ++--
.../ignite/agent/handlers/RestExecutor.java | 5 +++++
.../apache/ignite/agent/remote/RemoteHandler.java | 2 +-
.../agent/testdrive/AgentMetadataTestDrive.java | 4 ++--
.../ignite/agent/testdrive/AgentSqlTestDrive.java | 15 +++++++++------
.../src/main/resources/logging.properties | 3 ++-
8 files changed, 36 insertions(+), 31 deletions(-)
----------------------------------------------------------------------