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/20 08:43:00 UTC
[5/8] ignite git commit: Merge branches 'ignite-2612' and
'ignite-843-rc2'
Merge branches 'ignite-2612' and 'ignite-843-rc2'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/43be1fe2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/43be1fe2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/43be1fe2
Branch: refs/heads/ignite-2612
Commit: 43be1fe22aebde094279212a2a35a7999e1f3eb6
Parents: 8909d23 b0a6ed6
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Sat Feb 20 11:53:30 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Sat Feb 20 11:56:50 2016 +0700
----------------------------------------------------------------------
.../control-center-web/src/main/js/.eslintrc | 1 +
.../control-center-web/src/main/js/app/index.js | 14 +-
.../main/js/app/modules/states/admin.state.js | 36 ++++
.../main/js/app/modules/states/admin/index.js | 36 ----
.../app/modules/states/configuration.state.js | 170 +++++++++++++++++++
.../app/modules/states/configuration/index.js | 170 -------------------
.../configuration/summary/summary.controller.js | 16 ++
.../main/js/app/modules/states/login/index.js | 55 ------
.../main/js/app/modules/states/logout.state.js | 33 ++++
.../main/js/app/modules/states/logout/index.js | 33 ----
.../js/app/modules/states/password.state.js | 40 +++++
.../js/app/modules/states/password/index.js | 40 -----
.../main/js/app/modules/states/profile.state.js | 36 ++++
.../main/js/app/modules/states/profile/index.js | 36 ----
.../main/js/app/modules/states/signin.state.js | 55 ++++++
.../src/main/js/app/modules/states/sql.state.js | 56 ++++++
.../src/main/js/app/modules/states/sql/index.js | 56 ------
.../js/helpers/generator/generator-common.js | 12 ++
.../main/js/helpers/generator/generator-java.js | 57 ++++++-
19 files changed, 512 insertions(+), 440 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/43be1fe2/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 0000000,57eb361..83f5641
mode 000000,100644..100644
--- 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
@@@ -1,0 -1,162 +1,170 @@@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ 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 clustersGeneral from './configuration/clusters/general.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 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';
+
-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';
++// Caches screen.
++import cachesGeneral from './configuration/caches/general.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'
+ ])
-.directive(...summaryTabs)
++// Clusters screen.
+ .directive(...previewPanel)
+ .directive(...clustersTransactions)
+ .directive(...clustersThread)
+ .directive(...clustersTime)
+ .directive(...clustersSwap)
+ .directive(...clustersSsl)
+ .directive(...clustersMetrics)
+ .directive(...clustersMarshaller)
+ .directive(...clustersIgfs)
+ .directive(...clustersEvents)
+ .directive(...clustersDiscovery)
+ .directive(...clustersDeployment)
+ .directive(...clustersConnector)
+ .directive(...clustersCommunication)
+ .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)
++// Caches screen
++.directive(...cachesGeneral)
++// Summary screen
++.directive(...summaryTabs)
+ // Services.
+ .service(...ConfigurationSummaryResource)
+ .config(['$stateProvider', function($stateProvider) {
+ // Setup the states.
+ $stateProvider
+ .state('base.configuration', {
+ url: '/configuration',
+ templateUrl: '/configuration/sidebar.html'
+ })
+ .state('base.configuration.clusters', {
+ url: '/clusters',
+ templateUrl: '/configuration/clusters.html',
+ params: {
+ id: null
+ },
+ data: {
+ loading: 'Loading clusters screen...'
+ },
+ resolve: {
+ $title: () => {
+ return 'Configure Clusters';
+ }
+ }
+ })
+ .state('base.configuration.caches', {
+ url: '/caches',
+ templateUrl: '/configuration/caches.html',
+ params: {
+ id: null
+ },
+ data: {
+ loading: 'Loading caches screen...'
+ },
+ resolve: {
+ $title: () => {
+ return 'Configure Caches';
+ }
+ }
+ })
+ .state('base.configuration.domains', {
+ url: '/domains',
+ templateUrl: '/configuration/domains.html',
+ params: {
+ id: null
+ },
+ data: {
+ loading: 'Loading domain models screen...'
+ },
+ resolve: {
+ $title: () => {
+ return 'Configure Domain Model';
+ }
+ }
+ })
+ .state('base.configuration.igfs', {
+ url: '/igfs',
+ templateUrl: '/configuration/igfs.html',
+ params: {
+ id: null
+ },
+ data: {
+ loading: 'Loading IGFS screen...'
+ },
+ resolve: {
+ $title: () => {
+ return 'Configure IGFS';
+ }
+ }
+ })
+ .state('base.configuration.summary', {
+ url: '/summary',
+ templateUrl: '/configuration/summary.html',
+ controller: ConfigurationSummaryCtrl,
+ controllerAs: 'ctrl',
+ data: {
+ loading: 'Loading summary screen...'
+ },
+ resolve: {
+ $title: () => {
+ return 'Configurations Summary';
+ }
+ }
+ });
+ }]);