ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [3/3] ignite git commit: Merge branch ignite-843-rc2 into ignite-2612
Date Thu, 25 Feb 2016 16:47:19 GMT
Merge branch ignite-843-rc2 into ignite-2612


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

Branch: refs/heads/ignite-2612
Commit: 5c0aa35478aff016d057e5a27f2adadc97a12317
Parents: 6ae55f9 37bc977
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Thu Feb 25 23:47:02 2016 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Thu Feb 25 23:47:02 2016 +0700

----------------------------------------------------------------------
 .../control-center-web/src/main/js/.eslintrc    |   2 +-
 .../main/js/app/filters/byName/byName.filter.js |  23 ++++
 .../control-center-web/src/main/js/app/index.js |   2 +
 .../app/modules/states/configuration.state.js   |  20 ++++
 .../states/configuration/clusters/general.jade  |   2 +
 .../general/discovery/zookeeper.directive.js    |  27 +++++
 .../clusters/general/discovery/zookeeper.jade   | 113 +++++++++++++++++++
 .../bounded-exponential-backoff.directive.js    |  27 +++++
 .../bounded-exponential-backoff.jade            |  57 ++++++++++
 .../zookeeper/retrypolicy/custom.directive.js   |  27 +++++
 .../discovery/zookeeper/retrypolicy/custom.jade |  30 +++++
 .../exponential-backoff.directive.js            |  27 +++++
 .../retrypolicy/exponential-backoff.jade        |  56 +++++++++
 .../zookeeper/retrypolicy/forever.directive.js  |  27 +++++
 .../zookeeper/retrypolicy/forever.jade          |  30 +++++
 .../zookeeper/retrypolicy/n-times.directive.js  |  27 +++++
 .../zookeeper/retrypolicy/n-times.jade          |  43 +++++++
 .../zookeeper/retrypolicy/one-time.directive.js |  27 +++++
 .../zookeeper/retrypolicy/one-time.jade         |  31 +++++
 .../retrypolicy/until-elapsed.directive.js      |  27 +++++
 .../zookeeper/retrypolicy/until-elapsed.jade    |  43 +++++++
 .../configuration/summary/summary.controller.js |   9 +-
 .../main/js/controllers/clusters-controller.js  |   7 +-
 .../main/js/helpers/generator/generator-java.js |  87 ++++++++++++++
 .../main/js/helpers/generator/generator-pom.js  |   3 +
 .../main/js/helpers/generator/generator-xml.js  | 102 +++++++++++++++++
 .../src/main/js/serve/mongo.js                  |  40 ++++++-
 .../main/js/views/configuration/summary.jade    |  41 +++++--
 28 files changed, 937 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5c0aa354/modules/control-center-web/src/main/js/app/index.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/5c0aa354/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
----------------------------------------------------------------------
diff --cc modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
index 68e27b0,edd7f9d..e0e4b38
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
@@@ -17,47 -17,45 +17,59 @@@
  
  import angular from 'angular';
  
 -import ConfigurationSummaryCtrl from './configuration/summary/summary.controller';
 -import ConfigurationSummaryResource from './configuration/summary/summary.resource';
 -import summaryTabs from './configuration/summary/summary-tabs.directive';
 +// Clusters screen.
  import previewPanel from './configuration/clusters/preview-panel.directive';
+ 
 -import clustersTransactions from './configuration/clusters/transactions.directive';
 -import clustersThread from './configuration/clusters/thread.directive';
 -import clustersTime from './configuration/clusters/time.directive';
 -import clustersSwap from './configuration/clusters/swap.directive';
 -import clustersSsl from './configuration/clusters/ssl.directive';
 -import clustersMetrics from './configuration/clusters/metrics.directive';
 -import clustersMarshaller from './configuration/clusters/marshaller.directive';
 -import clustersIgfs from './configuration/clusters/igfs.directive';
 -import clustersEvents from './configuration/clusters/events.directive';
 -import clustersDiscovery from './configuration/clusters/discovery.directive';
 -import clustersDeployment from './configuration/clusters/deployment.directive';
 -import clustersConnector from './configuration/clusters/connector.directive';
 -import clustersCommunication from './configuration/clusters/communication.directive';
 -import clustersBinary from './configuration/clusters/binary.directive';
 -import clustersAtomic from './configuration/clusters/atomic.directive';
 -
  import clustersGeneral from './configuration/clusters/general.directive';
 -import generalDiscoveryCloud from './configuration/clusters/general/discovery/cloud.directive';
 -import generalDiscoveryGoogle from './configuration/clusters/general/discovery/google.directive';
 -import generalDiscoveryJdbc from './configuration/clusters/general/discovery/jdbc.directive';
 -import generalDiscoveryMulticast from './configuration/clusters/general/discovery/multicast.directive';
 -import generalDiscoveryS3 from './configuration/clusters/general/discovery/s3.directive';
 -import generalDiscoveryShared from './configuration/clusters/general/discovery/shared.directive';
 -import generalDiscoveryVm from './configuration/clusters/general/discovery/vm.directive';
 -import generalDiscoveryZookeeper from './configuration/clusters/general/discovery/zookeeper.directive';
+ 
 +import clustersGeneralDiscoveryCloud from './configuration/clusters/general/discovery/cloud.directive';
 +import clustersGeneralDiscoveryGoogle from './configuration/clusters/general/discovery/google.directive';
 +import clustersGeneralDiscoveryJdbc from './configuration/clusters/general/discovery/jdbc.directive';
 +import clustersGeneralDiscoveryMulticast from './configuration/clusters/general/discovery/multicast.directive';
 +import clustersGeneralDiscoveryS3 from './configuration/clusters/general/discovery/s3.directive';
 +import clustersGeneralDiscoveryShared from './configuration/clusters/general/discovery/shared.directive';
 +import clustersGeneralDiscoveryVm from './configuration/clusters/general/discovery/vm.directive';
++
++import generalDiscoveryZookeeper from './configuration/clusters/general/discovery/zookeeper.directive';
+ import generalDiscoveryZookeeperRetryExponential from './configuration/clusters/general/discovery/zookeeper/retrypolicy/exponential-backoff.directive';
+ import generalDiscoveryZookeeperRetryBoundedExponential from './configuration/clusters/general/discovery/zookeeper/retrypolicy/bounded-exponential-backoff.directive';
+ import generalDiscoveryZookeeperRetryUntilElapsed from './configuration/clusters/general/discovery/zookeeper/retrypolicy/until-elapsed.directive';
+ import generalDiscoveryZookeeperRetryNTimes from './configuration/clusters/general/discovery/zookeeper/retrypolicy/n-times.directive';
+ import generalDiscoveryZookeeperRetryOneTime from './configuration/clusters/general/discovery/zookeeper/retrypolicy/one-time.directive';
+ import generalDiscoveryZookeeperRetryForever from './configuration/clusters/general/discovery/zookeeper/retrypolicy/forever.directive';
+ import generalDiscoveryZookeeperRetryCustom from './configuration/clusters/general/discovery/zookeeper/retrypolicy/custom.directive';
+ 
 +import clustersAtomic from './configuration/clusters/atomic.directive';
 +import clustersBinary from './configuration/clusters/binary.directive';
 +import clustersCommunication from './configuration/clusters/communication.directive';
 +import clustersConnector from './configuration/clusters/connector.directive';
 +import clustersDeployment from './configuration/clusters/deployment.directive';
 +import clustersDiscovery from './configuration/clusters/discovery.directive';
 +import clustersEvents from './configuration/clusters/events.directive';
 +import clustersIgfs from './configuration/clusters/igfs.directive';
 +import clustersMarshaller from './configuration/clusters/marshaller.directive';
 +import clustersMetrics from './configuration/clusters/metrics.directive';
 +import clustersSsl from './configuration/clusters/ssl.directive';
 +import clustersSwap from './configuration/clusters/swap.directive';
 +import clustersTime from './configuration/clusters/time.directive';
 +import clustersThread from './configuration/clusters/thread.directive';
 +import clustersTransactions from './configuration/clusters/transactions.directive';
 +
 +// Caches screen.
 +import cachesGeneral from './configuration/caches/general.directive';
 +import cachesMemory from './configuration/caches/memory.directive';
 +import cachesQuery from './configuration/caches/query.directive';
 +import cachesStore from './configuration/caches/store.directive';
 +import cachesConcurrency from './configuration/caches/concurrency.directive';
 +import cachesRebalance from './configuration/caches/rebalance.directive';
 +import cachesServerNearCache from './configuration/caches/server-near-cache.directive';
 +import cachesStatistics from './configuration/caches/statistics.directive';
 +
 +// Summary screen.
 +import ConfigurationSummaryCtrl from './configuration/summary/summary.controller';
 +import ConfigurationSummaryResource from './configuration/summary/summary.resource';
 +import summaryTabs from './configuration/summary/summary-tabs.directive';
 +
  angular
  .module('ignite-console.states.configuration', [
      'ui.router'
@@@ -80,24 -78,21 +92,32 @@@
  .directive(...clustersBinary)
  .directive(...clustersAtomic)
  .directive(...clustersGeneral)
 -.directive(...generalDiscoveryCloud)
 -.directive(...generalDiscoveryGoogle)
 -.directive(...generalDiscoveryJdbc)
 -.directive(...generalDiscoveryMulticast)
 -.directive(...generalDiscoveryS3)
 -.directive(...generalDiscoveryShared)
 -.directive(...generalDiscoveryVm)
 +.directive(...clustersGeneralDiscoveryCloud)
 +.directive(...clustersGeneralDiscoveryGoogle)
 +.directive(...clustersGeneralDiscoveryJdbc)
 +.directive(...clustersGeneralDiscoveryMulticast)
 +.directive(...clustersGeneralDiscoveryS3)
 +.directive(...clustersGeneralDiscoveryShared)
 +.directive(...clustersGeneralDiscoveryVm)
+ .directive(...generalDiscoveryZookeeper)
+ .directive(...generalDiscoveryZookeeperRetryExponential)
+ .directive(...generalDiscoveryZookeeperRetryBoundedExponential)
+ .directive(...generalDiscoveryZookeeperRetryUntilElapsed)
+ .directive(...generalDiscoveryZookeeperRetryNTimes)
+ .directive(...generalDiscoveryZookeeperRetryOneTime)
+ .directive(...generalDiscoveryZookeeperRetryForever)
+ .directive(...generalDiscoveryZookeeperRetryCustom)
 +// Caches screen
 +.directive(...cachesGeneral)
 +.directive(...cachesMemory)
 +.directive(...cachesQuery)
 +.directive(...cachesStore)
 +.directive(...cachesConcurrency)
 +.directive(...cachesRebalance)
 +.directive(...cachesServerNearCache)
 +.directive(...cachesStatistics)
 +// Summary screen
 +.directive(...summaryTabs)
  // Services.
  .service(...ConfigurationSummaryResource)
  .config(['$stateProvider', function($stateProvider) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/5c0aa354/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------


Mime
View raw message