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:42:56 UTC
[1/8] ignite git commit: IGNITE-843 Rename.
Repository: ignite
Updated Branches:
refs/heads/ignite-2612 8909d236e -> b5aaa23a6
IGNITE-843 Rename.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/473dd701
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/473dd701
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/473dd701
Branch: refs/heads/ignite-2612
Commit: 473dd701713133ccb08ee969c8da4425dd72263f
Parents: ea979d8
Author: Andrey <an...@gridgain.com>
Authored: Sat Feb 20 10:26:40 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Sat Feb 20 10:26:40 2016 +0700
----------------------------------------------------------------------
.../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 | 162 +++++++++++++++++++
.../app/modules/states/configuration/index.js | 162 -------------------
.../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 -------
15 files changed, 425 insertions(+), 425 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/index.js b/modules/control-center-web/src/main/js/app/index.js
index efa2d7d..fca3027 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -62,13 +62,13 @@ import './modules/form/form.module';
import './modules/JavaTypes/JavaTypes.provider';
import './modules/QueryNotebooks/QueryNotebooks.provider';
-import './modules/states/login/index';
-import './modules/states/logout/index';
-import './modules/states/password/index';
-import './modules/states/configuration/index';
-import './modules/states/sql/index';
-import './modules/states/profile/index';
-import './modules/states/admin/index';
+import './modules/states/signin.state';
+import './modules/states/logout.state';
+import './modules/states/password.state';
+import './modules/states/configuration.state';
+import './modules/states/sql.state';
+import './modules/states/profile.state';
+import './modules/states/admin.state';
// ignite:modules
import './modules/user/user.module';
http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/admin.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/admin.state.js b/modules/control-center-web/src/main/js/app/modules/states/admin.state.js
new file mode 100644
index 0000000..c183807
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/admin.state.js
@@ -0,0 +1,36 @@
+/*
+ * 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';
+
+angular
+.module('ignite-console.states.admin', [
+ 'ui.router'
+])
+.config(['$stateProvider', function($stateProvider) {
+ // set up the states
+ $stateProvider
+ .state('settings.admin', {
+ url: '/admin',
+ templateUrl: '/settings/admin.html',
+ resolve: {
+ $title: () => {
+ return 'List of registered users';
+ }
+ }
+ });
+}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/admin/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/admin/index.js b/modules/control-center-web/src/main/js/app/modules/states/admin/index.js
deleted file mode 100644
index c183807..0000000
--- a/modules/control-center-web/src/main/js/app/modules/states/admin/index.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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';
-
-angular
-.module('ignite-console.states.admin', [
- 'ui.router'
-])
-.config(['$stateProvider', function($stateProvider) {
- // set up the states
- $stateProvider
- .state('settings.admin', {
- url: '/admin',
- templateUrl: '/settings/admin.html',
- resolve: {
- $title: () => {
- return 'List of registered users';
- }
- }
- });
-}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
----------------------------------------------------------------------
diff --git 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
new file mode 100644
index 0000000..57eb361
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
@@ -0,0 +1,162 @@
+/*
+ * 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';
+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';
+
+angular
+.module('ignite-console.states.configuration', [
+ 'ui.router'
+])
+.directive(...summaryTabs)
+.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)
+// 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';
+ }
+ }
+ });
+}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
deleted file mode 100644
index e8f32c0..0000000
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/index.js
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * 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 './summary/summary.controller';
-import ConfigurationSummaryResource from './summary/summary.resource';
-import summaryTabs from './summary/summary-tabs.directive';
-import previewPanel from './clusters/preview-panel.directive';
-
-import clustersTransactions from './clusters/transactions.directive';
-import clustersThread from './clusters/thread.directive';
-import clustersTime from './clusters/time.directive';
-import clustersSwap from './clusters/swap.directive';
-import clustersSsl from './clusters/ssl.directive';
-import clustersMetrics from './clusters/metrics.directive';
-import clustersMarshaller from './clusters/marshaller.directive';
-import clustersIgfs from './clusters/igfs.directive';
-import clustersEvents from './clusters/events.directive';
-import clustersDiscovery from './clusters/discovery.directive';
-import clustersDeployment from './clusters/deployment.directive';
-import clustersConnector from './clusters/connector.directive';
-import clustersCommunication from './clusters/communication.directive';
-import clustersBinary from './clusters/binary.directive';
-import clustersAtomic from './clusters/atomic.directive';
-
-import clustersGeneral from './clusters/general.directive';
-import generalDiscoveryCloud from './clusters/general/discovery/cloud.directive';
-import generalDiscoveryGoogle from './clusters/general/discovery/google.directive';
-import generalDiscoveryJdbc from './clusters/general/discovery/jdbc.directive';
-import generalDiscoveryMulticast from './clusters/general/discovery/multicast.directive';
-import generalDiscoveryS3 from './clusters/general/discovery/s3.directive';
-import generalDiscoveryShared from './clusters/general/discovery/shared.directive';
-import generalDiscoveryVm from './clusters/general/discovery/vm.directive';
-
-angular
-.module('ignite-console.states.configuration', [
- 'ui.router'
-])
-.directive(...summaryTabs)
-.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)
-// 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';
- }
- }
- });
-}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/login/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/login/index.js b/modules/control-center-web/src/main/js/app/modules/states/login/index.js
deleted file mode 100644
index feaf76a..0000000
--- a/modules/control-center-web/src/main/js/app/modules/states/login/index.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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';
-
-angular
-.module('ignite-console.states.login', [
- 'ui.router',
- // services
- 'ignite-console.user'
-])
-.config(['$stateProvider', function($stateProvider) {
- // set up the states
- $stateProvider
- .state('signin', {
- url: '/signin',
- templateUrl: '/signin.html',
- resolve: {
- $title: () => {
- return 'Sign In';
- }
- }
- });
-}])
-.run(['$rootScope', '$state', 'Auth', 'IgniteTerms', function($root, $state, Auth, IgniteTerms) {
- $root.$on('$stateChangeStart', function(event, toState) {
- if (toState.name === IgniteTerms.termsState)
- return;
-
- if (!Auth.authorized && (toState.name !== 'signin' && !_.startsWith(toState.name, 'password.'))) {
- event.preventDefault();
-
- $state.go('signin');
- }
- else if (Auth.authorized && toState.name === 'signin') {
- event.preventDefault();
-
- $state.go('base.configuration.clusters');
- }
- });
-}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/logout.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/logout.state.js b/modules/control-center-web/src/main/js/app/modules/states/logout.state.js
new file mode 100644
index 0000000..7609f24
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/logout.state.js
@@ -0,0 +1,33 @@
+/*
+ * 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';
+
+angular
+.module('ignite-console.states.logout', [
+ 'ui.router'
+])
+.config(['$stateProvider', function($stateProvider) {
+ // set up the states
+ $stateProvider
+ .state('logout', {
+ url: '/logout',
+ controller: ['Auth', function(Auth) {
+ Auth.logout();
+ }]
+ });
+}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/logout/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/logout/index.js b/modules/control-center-web/src/main/js/app/modules/states/logout/index.js
deleted file mode 100644
index 7609f24..0000000
--- a/modules/control-center-web/src/main/js/app/modules/states/logout/index.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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';
-
-angular
-.module('ignite-console.states.logout', [
- 'ui.router'
-])
-.config(['$stateProvider', function($stateProvider) {
- // set up the states
- $stateProvider
- .state('logout', {
- url: '/logout',
- controller: ['Auth', function(Auth) {
- Auth.logout();
- }]
- });
-}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/password.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/password.state.js b/modules/control-center-web/src/main/js/app/modules/states/password.state.js
new file mode 100644
index 0000000..6014cd2
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/password.state.js
@@ -0,0 +1,40 @@
+/*
+ * 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';
+
+angular
+.module('ignite-console.states.password', [
+ 'ui.router'
+])
+.config(['$stateProvider', function($stateProvider) {
+ // set up the states
+ $stateProvider
+ .state('password', {
+ url: '/password',
+ abstract: true,
+ template: '<ui-view></ui-view>'
+ })
+ .state('password.reset', {
+ url: '/reset?{token}',
+ templateUrl: '/reset.html'
+ })
+ .state('password.send', {
+ url: '/send',
+ templateUrl: '/reset.html'
+ });
+}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/password/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/password/index.js b/modules/control-center-web/src/main/js/app/modules/states/password/index.js
deleted file mode 100644
index 6014cd2..0000000
--- a/modules/control-center-web/src/main/js/app/modules/states/password/index.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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';
-
-angular
-.module('ignite-console.states.password', [
- 'ui.router'
-])
-.config(['$stateProvider', function($stateProvider) {
- // set up the states
- $stateProvider
- .state('password', {
- url: '/password',
- abstract: true,
- template: '<ui-view></ui-view>'
- })
- .state('password.reset', {
- url: '/reset?{token}',
- templateUrl: '/reset.html'
- })
- .state('password.send', {
- url: '/send',
- templateUrl: '/reset.html'
- });
-}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/profile.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/profile.state.js b/modules/control-center-web/src/main/js/app/modules/states/profile.state.js
new file mode 100644
index 0000000..23d1bec
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/profile.state.js
@@ -0,0 +1,36 @@
+/*
+ * 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';
+
+angular
+.module('ignite-console.states.profile', [
+ 'ui.router'
+])
+.config(['$stateProvider', function($stateProvider) {
+ // set up the states
+ $stateProvider
+ .state('settings.profile', {
+ url: '/profile',
+ templateUrl: '/settings/profile.html',
+ resolve: {
+ $title: () => {
+ return 'User profile';
+ }
+ }
+ });
+}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/profile/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/profile/index.js b/modules/control-center-web/src/main/js/app/modules/states/profile/index.js
deleted file mode 100644
index 23d1bec..0000000
--- a/modules/control-center-web/src/main/js/app/modules/states/profile/index.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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';
-
-angular
-.module('ignite-console.states.profile', [
- 'ui.router'
-])
-.config(['$stateProvider', function($stateProvider) {
- // set up the states
- $stateProvider
- .state('settings.profile', {
- url: '/profile',
- templateUrl: '/settings/profile.html',
- resolve: {
- $title: () => {
- return 'User profile';
- }
- }
- });
-}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/signin.state.js b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
new file mode 100644
index 0000000..feaf76a
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/signin.state.js
@@ -0,0 +1,55 @@
+/*
+ * 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';
+
+angular
+.module('ignite-console.states.login', [
+ 'ui.router',
+ // services
+ 'ignite-console.user'
+])
+.config(['$stateProvider', function($stateProvider) {
+ // set up the states
+ $stateProvider
+ .state('signin', {
+ url: '/signin',
+ templateUrl: '/signin.html',
+ resolve: {
+ $title: () => {
+ return 'Sign In';
+ }
+ }
+ });
+}])
+.run(['$rootScope', '$state', 'Auth', 'IgniteTerms', function($root, $state, Auth, IgniteTerms) {
+ $root.$on('$stateChangeStart', function(event, toState) {
+ if (toState.name === IgniteTerms.termsState)
+ return;
+
+ if (!Auth.authorized && (toState.name !== 'signin' && !_.startsWith(toState.name, 'password.'))) {
+ event.preventDefault();
+
+ $state.go('signin');
+ }
+ else if (Auth.authorized && toState.name === 'signin') {
+ event.preventDefault();
+
+ $state.go('base.configuration.clusters');
+ }
+ });
+}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/sql.state.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/sql.state.js b/modules/control-center-web/src/main/js/app/modules/states/sql.state.js
new file mode 100644
index 0000000..672d829
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/modules/states/sql.state.js
@@ -0,0 +1,56 @@
+/*
+ * 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';
+
+angular
+.module('ignite-console.states.sql', [
+ 'ui.router'
+])
+.config(['$stateProvider', function($stateProvider) {
+ // set up the states
+ $stateProvider
+ .state('base.sql', {
+ url: '/sql',
+ abstract: true,
+ template: '<ui-view></ui-view>'
+ })
+ .state('base.sql.notebook', {
+ url: '/notebook/{noteId}',
+ templateUrl: '/sql/sql.html',
+ data: {
+ loading: 'Loading notebook screen...'
+ },
+ resolve: {
+ $title: () => {
+ return 'Query notebook';
+ }
+ }
+ })
+ .state('base.sql.demo', {
+ url: '/demo',
+ templateUrl: '/sql/sql.html',
+ data: {
+ loading: 'Enable SQL demo...'
+ },
+ resolve: {
+ $title: () => {
+ return 'SQL demo';
+ }
+ }
+ });
+}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/473dd701/modules/control-center-web/src/main/js/app/modules/states/sql/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/sql/index.js b/modules/control-center-web/src/main/js/app/modules/states/sql/index.js
deleted file mode 100644
index 672d829..0000000
--- a/modules/control-center-web/src/main/js/app/modules/states/sql/index.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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';
-
-angular
-.module('ignite-console.states.sql', [
- 'ui.router'
-])
-.config(['$stateProvider', function($stateProvider) {
- // set up the states
- $stateProvider
- .state('base.sql', {
- url: '/sql',
- abstract: true,
- template: '<ui-view></ui-view>'
- })
- .state('base.sql.notebook', {
- url: '/notebook/{noteId}',
- templateUrl: '/sql/sql.html',
- data: {
- loading: 'Loading notebook screen...'
- },
- resolve: {
- $title: () => {
- return 'Query notebook';
- }
- }
- })
- .state('base.sql.demo', {
- url: '/demo',
- templateUrl: '/sql/sql.html',
- data: {
- loading: 'Enable SQL demo...'
- },
- resolve: {
- $title: () => {
- return 'SQL demo';
- }
- }
- });
-}]);
[4/8] ignite git commit: IGNITE-2287 Fixed eslint warnings.
Posted by ak...@apache.org.
IGNITE-2287 Fixed eslint warnings.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b0a6ed6c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b0a6ed6c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b0a6ed6c
Branch: refs/heads/ignite-2612
Commit: b0a6ed6c0bb8daa0fa2d5f6ee428a1c570d91a0c
Parents: 775a6af
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Sat Feb 20 11:27:39 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Sat Feb 20 11:27:39 2016 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/.eslintrc | 1 +
.../modules/states/configuration/summary/summary.controller.js | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0a6ed6c/modules/control-center-web/src/main/js/.eslintrc
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/.eslintrc b/modules/control-center-web/src/main/js/.eslintrc
index 9174e14..000de6c 100644
--- a/modules/control-center-web/src/main/js/.eslintrc
+++ b/modules/control-center-web/src/main/js/.eslintrc
@@ -22,6 +22,7 @@ globals:
_: true
window: true
global: true
+ $generatorCommon: true
$generatorProperties: true
$generatorXml: true
$generatorJava: true
http://git-wip-us.apache.org/repos/asf/ignite/blob/b0a6ed6c/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
index 7cd564a..5b8aa31 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
@@ -258,9 +258,10 @@ export default [
zip.file(srcPath + 'config/ServerConfigurationFactory.java', $generatorJava.cluster(cluster, 'config', 'ServerConfigurationFactory', null));
zip.file(srcPath + 'config/ClientConfigurationFactory.java', $generatorJava.cluster(cluster, 'config', 'ClientConfigurationFactory', clientNearCfg));
- if ($generatorCommon.dataForExampleConfigured(cluster))
+ if ($generatorCommon.dataForExampleConfigured(cluster)) {
zip.file(srcPath + 'example/ExampleStartup.java', $generatorJava.nodeStartup(cluster, 'startup', 'ExampleStartup',
'ServerConfigurationFactory.createConfiguration()', 'config.ServerConfigurationFactory'));
+ }
zip.file(srcPath + 'startup/ServerNodeSpringStartup.java', $generatorJava.nodeStartup(cluster, 'startup', 'ServerNodeSpringStartup', '"' + serverXml + '"'));
zip.file(srcPath + 'startup/ClientNodeSpringStartup.java', $generatorJava.nodeStartup(cluster, 'startup', 'ClientNodeSpringStartup', '"' + clientXml + '"'));
[6/8] ignite git commit: IGNITE-2287 Added generation of comment.
Posted by ak...@apache.org.
IGNITE-2287 Added generation of comment.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/75ad7be6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/75ad7be6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/75ad7be6
Branch: refs/heads/ignite-2612
Commit: 75ad7be650508fbc99b048cd452c9805e300222b
Parents: b0a6ed6
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Sat Feb 20 13:12:06 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Sat Feb 20 13:12:06 2016 +0700
----------------------------------------------------------------------
.../src/main/js/helpers/generator/generator-java.js | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/75ad7be6/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index 16079be..87255c4 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -2854,6 +2854,8 @@ $generatorJava.generateExample = function (cluster, res, factoryCls) {
});
if (desc) {
+ res.line('// Generate ' + desc.type + '.');
+
if (desc.schema)
_prepareStatement(res, conVar, 'CREATE SCHEMA IF NOT EXISTS ' + desc.schema);
[3/8] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc2' into ignite-843-rc2
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into 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/775a6afa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/775a6afa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/775a6afa
Branch: refs/heads/ignite-2612
Commit: 775a6afa7501d9c10e2aac31424b94e58b8c4075
Parents: c01cca4 473dd70
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Sat Feb 20 11:22:50 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Sat Feb 20 11:22:50 2016 +0700
----------------------------------------------------------------------
.../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 | 162 +++++++++++++++++++
.../app/modules/states/configuration/index.js | 162 -------------------
.../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 -------
15 files changed, 425 insertions(+), 425 deletions(-)
----------------------------------------------------------------------
[5/8] ignite git commit: Merge branches 'ignite-2612' and
'ignite-843-rc2'
Posted by ak...@apache.org.
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';
+ }
+ }
+ });
+ }]);
[7/8] ignite git commit: Merge branch 'ignite-843-rc2' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612
Posted by ak...@apache.org.
Merge branch 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite 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/7d33af3d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7d33af3d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7d33af3d
Branch: refs/heads/ignite-2612
Commit: 7d33af3dc8038a749477b20e8f5c2defd7c9de1f
Parents: 43be1fe 75ad7be
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Sat Feb 20 13:14:13 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Sat Feb 20 13:14:13 2016 +0700
----------------------------------------------------------------------
.../src/main/js/helpers/generator/generator-java.js | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
[8/8] ignite git commit: IGNITE-2612 WIP reworking caches screen to
Angular directives.
Posted by ak...@apache.org.
IGNITE-2612 WIP reworking caches screen to Angular directives.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b5aaa23a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b5aaa23a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b5aaa23a
Branch: refs/heads/ignite-2612
Commit: b5aaa23a6aea1102319649b4076254312c4c2963
Parents: 7d33af3
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Sat Feb 20 14:43:15 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Sat Feb 20 14:43:15 2016 +0700
----------------------------------------------------------------------
.../advanced-options-hide.directive.js | 26 ++++++++++++++++++++
.../advanced-options/advanced-options-hide.jade | 19 ++++++++++++++
.../advanced-options-toggle.directive.js | 26 ++++++++++++++++++++
.../advanced-options-toggle.jade | 19 ++++++++++++++
.../control-center-web/src/main/js/app/index.js | 4 +++
.../app/modules/states/configuration.state.js | 8 ++++++
.../caches/concurrency.directive.js | 2 +-
.../configuration/caches/concurrency.jade | 6 ++---
.../states/configuration/caches/memory.jade | 6 ++---
.../configuration/caches/query.directive.js | 2 +-
.../states/configuration/caches/query.jade | 6 ++---
.../configuration/caches/store.directive.js | 2 +-
.../states/configuration/caches/store.jade | 6 ++---
.../src/main/js/views/configuration/caches.jade | 14 ++++++++---
.../main/js/views/configuration/clusters.jade | 12 +++------
15 files changed, 131 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-hide.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-hide.directive.js b/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-hide.directive.js
new file mode 100644
index 0000000..9a136ec
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-hide.directive.js
@@ -0,0 +1,26 @@
+/*
+ * 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 template from './advanced-options-hide.jade!';
+
+export default ['igniteAdvancedOptionsHide', [() => {
+ return {
+ restrict: 'E',
+ template,
+ replace: true
+ };
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-hide.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-hide.jade b/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-hide.jade
new file mode 100644
index 0000000..355f209
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-hide.jade
@@ -0,0 +1,19 @@
+//-
+ 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.
+
+.advanced-options
+ i.fa.fa-chevron-circle-down(ng-click='ui.expanded = !ui.expanded')
+ a(ng-click='ui.expanded = !ui.expanded') Hide advanced settings...
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-toggle.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-toggle.directive.js b/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-toggle.directive.js
new file mode 100644
index 0000000..651e714
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-toggle.directive.js
@@ -0,0 +1,26 @@
+/*
+ * 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 template from './advanced-options-toggle.jade!';
+
+export default ['igniteAdvancedOptionsToggle', [() => {
+ return {
+ restrict: 'E',
+ template,
+ replace: true
+ };
+}]];
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-toggle.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-toggle.jade b/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-toggle.jade
new file mode 100644
index 0000000..7a2b197
--- /dev/null
+++ b/modules/control-center-web/src/main/js/app/directives/advanced-options/advanced-options-toggle.jade
@@ -0,0 +1,19 @@
+//-
+ 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.
+
+.advanced-options
+ i.fa(ng-click='toggleExpanded()' ng-class='ui.expanded ? "fa-chevron-circle-down" : "fa-chevron-circle-right"')
+ a(ng-click='toggleExpanded()') {{ui.expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/index.js b/modules/control-center-web/src/main/js/app/index.js
index fca3027..c889a61 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -81,6 +81,8 @@ import './modules/Version/Version.provider';
// endignite
// Directives.
+import igniteAdvancedOptionsHide from './directives/advanced-options/advanced-options-hide.directive';
+import igniteAdvancedOptionsToggle from './directives/advanced-options/advanced-options-toggle.directive';
import igniteLoading from './directives/loading/loading.directive';
import igniteInformation from './directives/information/information.directive';
import igniteUiAce from './directives/ui-ace/ui-ace.directive';
@@ -130,6 +132,8 @@ angular
'ignite-console.version'
])
// Directives.
+.directive(...igniteAdvancedOptionsHide)
+.directive(...igniteAdvancedOptionsToggle)
.directive(...igniteLoading)
.directive(...igniteInformation)
.directive(...igniteUiAce)
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/modules/states/configuration.state.js
----------------------------------------------------------------------
diff --git 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
index 83f5641..c2cc37a 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
@@ -45,6 +45,10 @@ import clustersTransactions from './configuration/clusters/transactions.directiv
// 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';
// Summary screen.
import ConfigurationSummaryCtrl from './configuration/summary/summary.controller';
@@ -82,6 +86,10 @@ angular
.directive(...clustersGeneralDiscoveryVm)
// Caches screen
.directive(...cachesGeneral)
+.directive(...cachesMemory)
+.directive(...cachesQuery)
+.directive(...cachesStore)
+.directive(...cachesConcurrency)
// Summary screen
.directive(...summaryTabs)
// Services.
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js
index fcf0877..0e00a4b 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.directive.js
@@ -17,7 +17,7 @@
import template from './concurrency.jade!';
-export default ['igniteConfigurationCachesGeneral', [() => {
+export default ['igniteConfigurationCachesConcurrency', [() => {
return {
scope: true,
restrict: 'E',
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.jade
index 689b036..f0b8370 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/concurrency.jade
@@ -16,12 +16,12 @@
- var model = 'backupItem'
-form.panel.panel-default(name='general' novalidate)
+form.panel.panel-default(name='concurrency' novalidate)
.panel-heading(bs-collapse-toggle)
ignite-form-panel-chevron
- label General
+ label Concurrency control
ignite-form-revert
- .panel-collapse(role='tabpanel' bs-collapse-target id='general')
+ .panel-collapse(role='tabpanel' bs-collapse-target id='concurrency')
.panel-body
.col-sm-6
.settings-row
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade
index 689b036..e073dcd 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/memory.jade
@@ -16,12 +16,12 @@
- var model = 'backupItem'
-form.panel.panel-default(name='general' novalidate)
+form.panel.panel-default(name='memory' novalidate)
.panel-heading(bs-collapse-toggle)
ignite-form-panel-chevron
- label General
+ label Memory
ignite-form-revert
- .panel-collapse(role='tabpanel' bs-collapse-target id='general')
+ .panel-collapse(role='tabpanel' bs-collapse-target id='memory')
.panel-body
.col-sm-6
.settings-row
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.directive.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.directive.js
index 25e958c..b3b6edb 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.directive.js
@@ -17,7 +17,7 @@
import template from './query.jade!';
-export default ['igniteConfigurationCachesMemory', [() => {
+export default ['igniteConfigurationCachesQuery', [() => {
return {
scope: true,
restrict: 'E',
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade
index 689b036..6bb78c1 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade
@@ -16,12 +16,12 @@
- var model = 'backupItem'
-form.panel.panel-default(name='general' novalidate)
+form.panel.panel-default(name='query' novalidate)
.panel-heading(bs-collapse-toggle)
ignite-form-panel-chevron
- label General
+ label Queries & Indexing
ignite-form-revert
- .panel-collapse(role='tabpanel' bs-collapse-target id='general')
+ .panel-collapse(role='tabpanel' bs-collapse-target id='query')
.panel-body
.col-sm-6
.settings-row
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.directive.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.directive.js
index 4964a7e..168eb85 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.directive.js
@@ -17,7 +17,7 @@
import template from './store.jade!';
-export default ['igniteConfigurationCachesMemory', [() => {
+export default ['igniteConfigurationCachesStore', [() => {
return {
scope: true,
restrict: 'E',
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade
index 689b036..f335184 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/store.jade
@@ -16,12 +16,12 @@
- var model = 'backupItem'
-form.panel.panel-default(name='general' novalidate)
+form.panel.panel-default(name='store' novalidate)
.panel-heading(bs-collapse-toggle)
ignite-form-panel-chevron
- label General
+ label Store
ignite-form-revert
- .panel-collapse(role='tabpanel' bs-collapse-target id='general')
+ .panel-collapse(role='tabpanel' bs-collapse-target id='store')
.panel-body
.col-sm-6
.settings-row
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/views/configuration/caches.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/caches.jade b/modules/control-center-web/src/main/js/views/configuration/caches.jade
index 4c10464..62d4da2 100644
--- a/modules/control-center-web/src/main/js/views/configuration/caches.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade
@@ -37,8 +37,14 @@ include ../includes/infos
ignite-configuration-caches-memory
ignite-configuration-caches-query
ignite-configuration-caches-store
- ignite-configuration-caches-concurrency
- ignite-configuration-caches-rebalance
- ignite-configuration-caches-server-near-cache
- ignite-configuration-caches-statistics
+
+ ignite-advanced-options-toggle
+
+ div(ng-show='ui.expanded')
+ ignite-configuration-caches-concurrency
+ ignite-configuration-caches-rebalance
+ ignite-configuration-caches-server-near-cache
+ ignite-configuration-caches-statistics
+
+ ignite-advanced-options-hide
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5aaa23a/modules/control-center-web/src/main/js/views/configuration/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
index da32e0d..3a6ab07 100644
--- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
@@ -53,11 +53,9 @@ include ../includes/infos
form.form-horizontal(name='ui.inputForm' ng-show='contentVisible()' novalidate)
.panel-group(ng-click='triggerDigest = true')
ignite-configuration-clusters-general
- .advanced-options
- i.fa(
- ng-click='toggleExpanded()'
- ng-class='ui.expanded ? "fa-chevron-circle-down" : "fa-chevron-circle-right"')
- a(ng-click='toggleExpanded()') {{ui.expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}}
+
+ ignite-advanced-options-toggle
+
div(ng-show='ui.expanded')
ignite-configuration-clusters-atomic
ignite-configuration-clusters-binary
@@ -75,6 +73,4 @@ include ../includes/infos
ignite-configuration-clusters-thread
ignite-configuration-clusters-transactions
- .advanced-options
- i.fa.fa-chevron-circle-down(ng-click='ui.expanded = !ui.expanded')
- a(ng-click='ui.expanded = !ui.expanded') Hide advanced settings...
+ ignite-advanced-options-hide
[2/8] ignite git commit: IGNITE-2287 Reworked code generation of
example code.
Posted by ak...@apache.org.
IGNITE-2287 Reworked code generation of example code.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c01cca41
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c01cca41
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c01cca41
Branch: refs/heads/ignite-2612
Commit: c01cca4109f9984ce4aec53b11c8af76e2b84cd5
Parents: ea979d8
Author: vsisko <vs...@gridgain.com>
Authored: Sat Feb 20 11:22:27 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Sat Feb 20 11:22:27 2016 +0700
----------------------------------------------------------------------
.../configuration/summary/summary.controller.js | 15 ++++++
.../js/helpers/generator/generator-common.js | 12 +++++
.../main/js/helpers/generator/generator-java.js | 57 +++++++++++++++++---
3 files changed, 77 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c01cca41/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
index 5f677d9..7cd564a 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
@@ -73,6 +73,14 @@ export default [
]
};
+ const exampleFolder = {
+ type: 'folder',
+ name: 'example',
+ children: [
+ { type: 'file', name: 'ExampleStartup.java' }
+ ]
+ };
+
const javaFolder = {
type: 'folder',
name: 'java',
@@ -188,6 +196,9 @@ export default [
javaFolder.children = [javaConfigFolder, javaStartupFolder];
+ if ($generatorCommon.dataForExampleConfigured(cluster))
+ javaFolder.children.push(exampleFolder);
+
_.forEach(cluster.caches, (cache) => {
if (cache.cacheStoreFactory) {
const store = cache.cacheStoreFactory[cache.cacheStoreFactory.kind];
@@ -247,6 +258,10 @@ export default [
zip.file(srcPath + 'config/ServerConfigurationFactory.java', $generatorJava.cluster(cluster, 'config', 'ServerConfigurationFactory', null));
zip.file(srcPath + 'config/ClientConfigurationFactory.java', $generatorJava.cluster(cluster, 'config', 'ClientConfigurationFactory', clientNearCfg));
+ if ($generatorCommon.dataForExampleConfigured(cluster))
+ zip.file(srcPath + 'example/ExampleStartup.java', $generatorJava.nodeStartup(cluster, 'startup', 'ExampleStartup',
+ 'ServerConfigurationFactory.createConfiguration()', 'config.ServerConfigurationFactory'));
+
zip.file(srcPath + 'startup/ServerNodeSpringStartup.java', $generatorJava.nodeStartup(cluster, 'startup', 'ServerNodeSpringStartup', '"' + serverXml + '"'));
zip.file(srcPath + 'startup/ClientNodeSpringStartup.java', $generatorJava.nodeStartup(cluster, 'startup', 'ClientNodeSpringStartup', '"' + clientXml + '"'));
http://git-wip-us.apache.org/repos/asf/ignite/blob/c01cca41/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
index 40614b6..3731070 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
@@ -508,3 +508,15 @@ $generatorCommon.binaryIsDefined = function (binary) {
$generatorCommon.domainQueryMetadata = function(domain) {
return domain.queryMetadata ? domain.queryMetadata : 'Configuration';
};
+
+/**
+ * Checks if cluster has demo types.
+ *
+ * @param cluster Cluster to check.
+ * @returns {boolean} True if cluster has caches with demo types.
+ */
+$generatorCommon.dataForExampleConfigured = function(cluster) {
+ return $commonUtils.isDefined(_.find(cluster.caches, function (cache) {
+ return _.find(cache.domains, {demo: true});
+ }));
+};
http://git-wip-us.apache.org/repos/asf/ignite/blob/c01cca41/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index 57ac1da..16079be 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -2759,9 +2759,6 @@ function _multilineQuery(res, query, prefix, postfix) {
res.line('"' + line + '"' + (ix === lines.length - 1 ? postfix : ' +'));
});
- if (lines.length > 0)
- res.needEmptyLine = true;
-
if (lines.length > 1)
res.endBlock();
}
@@ -2900,6 +2897,14 @@ $generatorJava.generateExample = function (cluster, res, factoryCls) {
res.needEmptyLine = true;
+ res.line('/** Print result table to console */');
+ res.startBlock('private static void printResult(' + res.importClass('java.util.List') + '<' + res.importClass('javax.cache.Cache') + '.Entry<Object, Object>> rows) {');
+ res.startBlock('for (Cache.Entry<Object, Object> row: rows) {');
+ res.line('System.out.println(row);');
+ res.endBlock('}');
+ res.endBlock('}');
+ res.needEmptyLine = true;
+
// Generation of execute queries method.
res.line('/** Run demo examples. */');
res.startBlock('private static void runExamples(Ignite ignite) throws SQLException {');
@@ -2908,6 +2913,9 @@ $generatorJava.generateExample = function (cluster, res, factoryCls) {
return fullType.substr(fullType.lastIndexOf('.') + 1);
};
+ var cacheLoaded = [];
+ var rowVariableDeclared = false;
+
_.forEach(typeByDs, function (types, ds) {
var conVar = ds + 'Con';
@@ -2921,8 +2929,19 @@ $generatorJava.generateExample = function (cluster, res, factoryCls) {
if (desc) {
_.forEach(desc.selectQuery, function (query) {
- _multilineQuery(res, query, 'ignite.cache("' + type.cache.name + '").query(new ' + res.importClass('org.apache.ignite.cache.query.SqlQuery') +
- '<>("' + getType(domain.valueType) + '", ', '));');
+ var cacheName = type.cache.name;
+
+ if (!_.contains(cacheLoaded, cacheName)) {
+ res.line('ignite.cache("' + cacheName + '").loadCache(null);');
+
+ cacheLoaded.push(cacheName);
+ }
+
+ _multilineQuery(res, query, (rowVariableDeclared ? 'rows' : 'List<Cache.Entry<Object, Object>> rows') +
+ ' = ignite.cache("' + cacheName + '").query(new ' + res.importClass('org.apache.ignite.cache.query.SqlQuery') +
+ '<>("' + getType(domain.valueType) + '", ', ')).getAll();');
+ res.line('printResult(rows);');
+ rowVariableDeclared = true;
res.needEmptyLine = true;
})
@@ -2954,14 +2973,26 @@ $generatorJava.generateExample = function (cluster, res, factoryCls) {
* @param clientNearCfg Optional near cache configuration for client node.
*/
$generatorJava.nodeStartup = function (cluster, pkg, cls, cfg, factoryCls, clientNearCfg) {
+ var example = cls === 'ExampleStartup';
+
var res = $generatorCommon.builder();
res.line('/**');
res.line(' * ' + $generatorCommon.mainComment());
+
+ if (example) {
+ res.line(' *');
+ res.line(' * To start example configure data sources in secret.properties file.');
+ res.line(' * For H2 database it should be like following:');
+ res.line(' * dsH2.jdbc.url=jdbc:h2:tcp://localhost/mem:ExampleDb;DB_CLOSE_DELAY=-1');
+ res.line(' * dsH2.jdbc.username=sa');
+ res.line(' * dsH2.jdbc.password=');
+ }
+
res.line(' */');
res.startBlock('public class ' + cls + ' {');
- if (factoryCls)
+ if (example)
var demoTypes = $generatorJava.generateExample(cluster, res, factoryCls);
res.line('/**');
@@ -2973,6 +3004,18 @@ $generatorJava.nodeStartup = function (cluster, pkg, cls, cfg, factoryCls, clien
res.startBlock('public static void main(String[] args) throws Exception {');
+ if (example) {
+ res.startBlock('try {');
+ res.line('// Start H2 database server.');
+ res.line(res.importClass('org.h2.tools.Server') + '.createTcpServer("-tcpDaemon").start();');
+ res.endBlock('}');
+ res.startBlock('catch (' + res.importClass('java.sql.SQLException') + ' ignore) {');
+ res.line('// No-op.');
+ res.endBlock('}');
+
+ res.needEmptyLine = true;
+ }
+
if (factoryCls)
res.importClass(factoryCls);
@@ -3002,7 +3045,7 @@ $generatorJava.nodeStartup = function (cluster, pkg, cls, cfg, factoryCls, clien
}
}
- if ($commonUtils.isDefinedAndNotEmpty(demoTypes)) {
+ if (example) {
res.needEmptyLine = true;
res.line('prepareExampleData();');