http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/app/helpers/jade/mixins.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/helpers/jade/mixins.pug b/modules/web-console/frontend/app/helpers/jade/mixins.pug index bf49fa9..4b98d42 100644 --- a/modules/web-console/frontend/app/helpers/jade/mixins.pug +++ b/modules/web-console/frontend/app/helpers/jade/mixins.pug @@ -17,15 +17,15 @@ include ./form include ../../primitives/tooltip/index -//- Mixin for advanced options toggle. -mixin advanced-options-toggle(click, cond, showMessage, hideMessage) - .advanced-options +//- Mixin for advanced option toggle. +mixin advanced-option-toggle(click, cond, showMessage, hideMessage) + .advanced-option i.fa(ng-click=`${click}` ng-class=`${cond} ? 'fa-chevron-circle-down' : 'fa-chevron-circle-right'`) a(ng-click=click) {{ #{cond} ? '#{hideMessage}' : '#{showMessage}' }} -//- Mixin for advanced options toggle with default settings. -mixin advanced-options-toggle-default - +advanced-options-toggle('toggleExpanded()', 'ui.expanded', 'Show advanced settings...', 'Hide advanced settings...') +//- Mixin for advanced option toggle with default settings. +mixin advanced-option-toggle-default + +advanced-option-toggle('toggleExpanded()', 'ui.expanded', 'Show advanced settings...', 'Hide advanced settings...') //- Mixin for main table on screen with list of items. mixin main-table(title, rows, focusId, click, rowTemplate, searchField) @@ -143,11 +143,11 @@ mixin java-class(lbl, model, name, enabled, required, tip, validationActive) if block block -//- Mixin for text field with enabled condition with options. -mixin java-class-typeahead(lbl, model, name, options, enabled, required, placeholder, tip, validationActive) +//- Mixin for text field with enabled condition with option. +mixin java-class-typeahead(lbl, model, name, option, enabled, required, placeholder, tip, validationActive) -var errLbl = lbl.substring(0, lbl.length - 1) - +form-field-datalist(lbl, model, name, enabledToDisabled(enabled), required, placeholder, options, tip)( + +form-field-datalist(lbl, model, name, enabledToDisabled(enabled), required, placeholder, option, tip)( data-java-identifier='true' data-java-package-specified='allow-built-in' data-java-keywords='true' @@ -204,9 +204,9 @@ mixin password(lbl, model, name, required, placeholder, tip) if block block -//- Mixin for text field with enabled condition with options. -mixin text-options(lbl, model, name, options, enabled, required, placeholder, tip) - +form-field-datalist(lbl, model, name, enabledToDisabled(enabled), required, placeholder, options, tip) +//- Mixin for text field with enabled condition with option. +mixin text-option(lbl, model, name, option, enabled, required, placeholder, tip) + +form-field-datalist(lbl, model, name, enabledToDisabled(enabled), required, placeholder, option, tip) //- Mixin for required numeric field. mixin number-required(lbl, model, name, enabled, required, placeholder, min, tip) @@ -225,42 +225,42 @@ mixin number(lbl, model, name, enabled, placeholder, min, tip) +ignite-form-field-number(lbl, model, name, enabledToDisabled(enabled), false, placeholder, min, false, false, tip) //- Mixin for required dropdown field. -mixin dropdown-required-empty(lbl, model, name, enabled, required, placeholder, placeholderEmpty, options, tip) - +ignite-form-field-dropdown(lbl, model, name, enabledToDisabled(enabled), required, false, placeholder, placeholderEmpty, options, tip) +mixin dropdown-required-empty(lbl, model, name, enabled, required, placeholder, placeholderEmpty, option, tip) + +ignite-form-field-dropdown(lbl, model, name, enabledToDisabled(enabled), required, false, placeholder, placeholderEmpty, option, tip) if block block //- Mixin for required dropdown field with autofocus. -mixin dropdown-required-empty-autofocus(lbl, model, name, enabled, required, placeholder, placeholderEmpty, options, tip) - +ignite-form-field-dropdown(lbl, model, name, enabledToDisabled(enabled), required, false, placeholder, placeholderEmpty, options, tip)( +mixin dropdown-required-empty-autofocus(lbl, model, name, enabled, required, placeholder, placeholderEmpty, option, tip) + +ignite-form-field-dropdown(lbl, model, name, enabledToDisabled(enabled), required, false, placeholder, placeholderEmpty, option, tip)( data-ignite-form-field-input-autofocus='true' ) if block block //- Mixin for required dropdown field. -mixin dropdown-required(lbl, model, name, enabled, required, placeholder, options, tip) - +ignite-form-field-dropdown(lbl, model, name, enabledToDisabled(enabled), required, false, placeholder, '', options, tip) +mixin dropdown-required(lbl, model, name, enabled, required, placeholder, option, tip) + +ignite-form-field-dropdown(lbl, model, name, enabledToDisabled(enabled), required, false, placeholder, '', option, tip) if block block //- Mixin for required dropdown field with autofocus. -mixin dropdown-required-autofocus(lbl, model, name, enabled, required, placeholder, options, tip) - +ignite-form-field-dropdown(lbl, model, name, enabledToDisabled(enabled), required, false, placeholder, '', options, tip)( +mixin dropdown-required-autofocus(lbl, model, name, enabled, required, placeholder, option, tip) + +ignite-form-field-dropdown(lbl, model, name, enabledToDisabled(enabled), required, false, placeholder, '', option, tip)( data-ignite-form-field-input-autofocus='true' ) if block block //- Mixin for dropdown field. -mixin dropdown(lbl, model, name, enabled, placeholder, options, tip) - +ignite-form-field-dropdown(lbl, model, name, enabledToDisabled(enabled), false, false, placeholder, '', options, tip) +mixin dropdown(lbl, model, name, enabled, placeholder, option, tip) + +ignite-form-field-dropdown(lbl, model, name, enabledToDisabled(enabled), false, false, placeholder, '', option, tip) if block block //- Mixin for dropdown-multiple field. -mixin dropdown-multiple(lbl, model, name, enabled, placeholder, placeholderEmpty, options, tip) - +ignite-form-field-dropdown(lbl, model, name, enabledToDisabled(enabled), false, true, placeholder, placeholderEmpty, options, tip) +mixin dropdown-multiple(lbl, model, name, enabled, placeholder, placeholderEmpty, option, tip) + +ignite-form-field-dropdown(lbl, model, name, enabledToDisabled(enabled), false, true, placeholder, placeholderEmpty, option, tip) if block block @@ -562,7 +562,7 @@ mixin table-pair-edit(tbl, prefix, keyPlaceholder, valPlaceholder, keyJavaBuiltI .fieldSep !{divider} .input-tip if keyJavaBuiltInTypes - input.form-control(id=keyFocusId ignite-on-enter-focus-move=valFocusId type='text' ng-model=keyModel placeholder=keyPlaceholder bs-typeahead container='body' ignite-retain-selection data-min-length='1' bs-options='javaClass for javaClass in javaBuiltInClasses' ignite-on-escape='tableReset(false)') + input.form-control(id=keyFocusId ignite-on-enter-focus-move=valFocusId type='text' ng-model=keyModel placeholder=keyPlaceholder bs-typeahead container='body' ignite-retain-selection data-min-length='1' bs-option='javaClass for javaClass in javaBuiltInClasses' ignite-on-escape='tableReset(false)') else input.form-control(id=keyFocusId ignite-on-enter-focus-move=valFocusId type='text' ng-model=keyModel placeholder=keyPlaceholder ignite-on-escape='tableReset(false)') .col-xs-6.col-sm-6.col-md-6 @@ -573,7 +573,7 @@ mixin table-pair-edit(tbl, prefix, keyPlaceholder, valPlaceholder, keyJavaBuiltI +btn-save(btnVisible, btnSave) .input-tip if valueJavaBuiltInTypes - input.form-control(id=valFocusId type='text' ng-model=valModel placeholder=valPlaceholder bs-typeahead container='body' ignite-retain-selection data-min-length='1' bs-options='javaClass for javaClass in javaBuiltInClasses' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset(false)') + input.form-control(id=valFocusId type='text' ng-model=valModel placeholder=valPlaceholder bs-typeahead container='body' ignite-retain-selection data-min-length='1' bs-option='javaClass for javaClass in javaBuiltInClasses' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset(false)') else input.form-control(id=valFocusId type='text' ng-model=valModel placeholder=valPlaceholder ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset(false)')
http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug b/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug index d9ea68c..1ae7361 100644 --- a/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug +++ b/modules/web-console/frontend/app/modules/nodes/nodes-dialog.tpl.pug @@ -21,7 +21,7 @@ button.close(ng-click='$cancel()' aria-hidden='true') × h4.modal-title Select Node .modal-body.modal-body-with-scroll - p Choose node to execute query for cache: #[strong {{ $ctrl.options.target }}] + p Choose node to execute query for cache: #[strong {{ $ctrl.option.target }}] .panel.panel-default.nodes-grid .panel-heading http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/app/modules/states/configuration/caches/node-filter.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/states/configuration/caches/node-filter.pug b/modules/web-console/frontend/app/modules/states/configuration/caches/node-filter.pug index 6715dcd..0974337 100644 --- a/modules/web-console/frontend/app/modules/states/configuration/caches/node-filter.pug +++ b/modules/web-console/frontend/app/modules/states/configuration/caches/node-filter.pug @@ -46,7 +46,7 @@ include /app/helpers/jade/mixins -var igfsNodeFilter = `${nodeFilter}.IGFS` -var required = `${nodeFilterKind} === 'IGFS'` - //(lbl, model, name, enabled, required, placeholder, options, tip) + //(lbl, model, name, enabled, required, placeholder, option, tip) +dropdown-required-empty('IGFS:', `${igfsNodeFilter}.igfs`, '"igfsNodeFilter"', 'true', required, 'Choose IGFS', 'No IGFS configured', 'igfss', 'Select IGFS to filter nodes') div(ng-show=`${nodeFilterKind} === 'Custom'`) http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/app/modules/states/configuration/clusters/ssl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/ssl.pug b/modules/web-console/frontend/app/modules/states/configuration/clusters/ssl.pug index dcb3b21..d9c483a 100644 --- a/modules/web-console/frontend/app/modules/states/configuration/clusters/ssl.pug +++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/ssl.pug @@ -36,7 +36,7 @@ include /app/helpers/jade/mixins .settings-row +checkbox('Enabled', enabled, '"sslEnabled"', 'Flag indicating whether to configure SSL configuration') .settings-row - +text-options('Algorithm to create a key manager:', `${model}.keyAlgorithm`, '"keyAlgorithm"', '["SumX509", "X509"]', enabled, 'false', 'SumX509', + +text-option('Algorithm to create a key manager:', `${model}.keyAlgorithm`, '"keyAlgorithm"', '["SumX509", "X509"]', enabled, 'false', 'SumX509', 'Sets key manager algorithm that will be used to create a key manager<br/>\ Notice that in most cased default value suites well, however, on Android platform this value need to be set to X509') .settings-row @@ -44,10 +44,10 @@ include /app/helpers/jade/mixins 'Path to the key store file<br/>\ This is a mandatory parameter since ssl context could not be initialized without key manager') .settings-row - +text-options('Key store type:', `${model}.keyStoreType`, '"keyStoreType"', '["JKS", "PCKS11", "PCKS12"]', enabled, 'false', 'JKS', + +text-option('Key store type:', `${model}.keyStoreType`, '"keyStoreType"', '["JKS", "PCKS11", "PCKS12"]', enabled, 'false', 'JKS', 'Key store type used in context initialization') .settings-row - +text-options('Protocol:', `${model}.protocol`, '"protocol"', '["TSL", "SSL"]', enabled, 'false', 'TSL', 'Protocol for secure transport') + +text-option('Protocol:', `${model}.protocol`, '"protocol"', '["TSL", "SSL"]', enabled, 'false', 'TSL', 'Protocol for secure transport') .settings-row -var form = 'trustManagers' @@ -105,6 +105,6 @@ include /app/helpers/jade/mixins .settings-row(ng-show=`!${trust}.length`) +text-enabled('Trust store file:', `${model}.trustStoreFilePath`, '"trustStoreFilePath"', enabled, 'false', 'Path to the trust store file', 'Path to the trust store file') .settings-row(ng-show=`!${trust}.length`) - +text-options('Trust store type:', `${model}.trustStoreType`, '"trustStoreType"', '["JKS", "PCKS11", "PCKS12"]', enabled, 'false', 'JKS', 'Trust store type used in context initialization') + +text-option('Trust store type:', `${model}.trustStoreType`, '"trustStoreType"', '["JKS", "PCKS11", "PCKS12"]', enabled, 'false', 'JKS', 'Trust store type used in context initialization') .col-sm-6 +preview-xml-java(cluster, 'clusterSsl') http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/app/modules/states/configuration/domains/query.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/states/configuration/domains/query.pug b/modules/web-console/frontend/app/modules/states/configuration/domains/query.pug index a057f59..d32ac63 100644 --- a/modules/web-console/frontend/app/modules/states/configuration/domains/query.pug +++ b/modules/web-console/frontend/app/modules/states/configuration/domains/query.pug @@ -41,15 +41,15 @@ mixin table-index-item-edit(prefix, index, sortAvailable, idAddition) .col-xs-8.col-sm-8.col-md-8 label.fieldSep / .input-tip - button.select-toggle.form-control(id=`{{::'${fieldName}' + ${idAddition}}}` ignite-on-enter-focus-move=`{{::'${direction}S' + ${idAddition}}}` ng-model=fieldNameModel placeholder=`{{fields('${prefix}', ${fieldNameModel}).length > 0 ? 'Choose field' : 'No fields configured'}}` bs-select bs-options=`item.value as item.label for item in fields('${prefix}', ${fieldNameModel})` ng-disabled=`fields('${prefix}', ${fieldNameModel}).length === 0` ignite-on-escape='tableReset(false)' tabindex='0') + button.select-toggle.form-control(id=`{{::'${fieldName}' + ${idAddition}}}` ignite-on-enter-focus-move=`{{::'${direction}S' + ${idAddition}}}` ng-model=fieldNameModel placeholder=`{{fields('${prefix}', ${fieldNameModel}).length > 0 ? 'Choose field' : 'No fields configured'}}` bs-select bs-option=`item.value as item.label for item in fields('${prefix}', ${fieldNameModel})` ng-disabled=`fields('${prefix}', ${fieldNameModel}).length === 0` ignite-on-escape='tableReset(false)' tabindex='0') .col-xs-4.col-sm-4.col-md-4 +btn-save(btnVisible, btnSave) .input-tip - button.select-toggle.form-control(id=`{{::'${direction}' + ${idAddition}}}` ng-model=directionModel bs-select bs-options='item.value as item.label for item in {{sortDirections}}' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset(false)' tabindex='0') + button.select-toggle.form-control(id=`{{::'${direction}' + ${idAddition}}}` ng-model=directionModel bs-select bs-option='item.value as item.label for item in {{sortDirections}}' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset(false)' tabindex='0') .col-xs-12(ng-if=`!(${sortAvailable})`) +btn-save(btnVisible, btnSave) .input-tip - button.select-toggle.form-control(id=`{{::'${fieldName}' + ${idAddition}}}` ng-model=fieldNameModel placeholder=`{{fields('${prefix}', ${fieldNameModel}).length > 0 ? 'Choose index field' : 'No fields configured'}}` bs-select bs-options=`item.value as item.label for item in fields('${prefix}', ${fieldNameModel})` ng-disabled=`fields('${prefix}', ${fieldNameModel}).length === 0` ignite-on-escape='tableReset(false)' tabindex='0') + button.select-toggle.form-control(id=`{{::'${fieldName}' + ${idAddition}}}` ng-model=fieldNameModel placeholder=`{{fields('${prefix}', ${fieldNameModel}).length > 0 ? 'Choose index field' : 'No fields configured'}}` bs-select bs-option=`item.value as item.label for item in fields('${prefix}', ${fieldNameModel})` ng-disabled=`fields('${prefix}', ${fieldNameModel}).length === 0` ignite-on-escape='tableReset(false)' tabindex='0') .panel.panel-default(ng-form=form novalidate) .panel-heading(bs-collapse-toggle) @@ -141,7 +141,7 @@ mixin table-index-item-edit(prefix, index, sortAvailable, idAddition) .col-sm-5 +btn-save('tableIndexSaveVisible(indexesTbl, $index)', 'tableIndexSave(indexesTbl, $index)') .input-tip - button.select-toggle.form-control(id='curIndexType{{$index}}' bs-select ng-model='indexesTbl.curIndexType' data-placeholder='Select index type' bs-options='item.value as item.label for item in indexType' tabindex='0' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset(false)') + button.select-toggle.form-control(id='curIndexType{{$index}}' bs-select ng-model='indexesTbl.curIndexType' data-placeholder='Select index type' bs-option='item.value as item.label for item in indexType' tabindex='0' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset(false)') .margin-left-dflt table.links-edit-sub(st-table='item.fields' ng-init='itemIndex = $index') tbody @@ -167,6 +167,6 @@ mixin table-index-item-edit(prefix, index, sortAvailable, idAddition) .col-sm-5 +btn-save('tableIndexSaveVisible(indexesTbl, -1)', 'tableIndexSave(indexesTbl, -1)') .input-tip - button#newIndexType.select-toggle.form-control(bs-select ng-model='indexesTbl.newIndexType' data-placeholder='Select index type' bs-options='item.value as item.label for item in indexType' tabindex='0' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset(false)') + button#newIndexType.select-toggle.form-control(bs-select ng-model='indexesTbl.newIndexType' data-placeholder='Select index type' bs-option='item.value as item.label for item in indexType' tabindex='0' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset(false)') .col-sm-6 +preview-xml-java(model, 'domainModelQuery') http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/app/modules/states/configuration/domains/store.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/states/configuration/domains/store.pug b/modules/web-console/frontend/app/modules/states/configuration/domains/store.pug index 4dee986..cb19078 100644 --- a/modules/web-console/frontend/app/modules/states/configuration/domains/store.pug +++ b/modules/web-console/frontend/app/modules/states/configuration/domains/store.pug @@ -47,7 +47,7 @@ mixin table-db-field-edit(tbl, prefix, focusId, index) .col-xs-3.col-sm-3.col-md-3 .fieldSep / .input-tip - button.select-toggle.form-control(id=databaseTypeId ignite-on-enter-focus-move=javaNameId ng-model=databaseTypeModel data-placeholder='DB type' ng-class=`{placeholder: !${databaseTypeModel}}` bs-select bs-options='item.value as item.label for item in {{supportedJdbcTypes}}' ignite-on-escape='tableReset(false)' tabindex='0') + button.select-toggle.form-control(id=databaseTypeId ignite-on-enter-focus-move=javaNameId ng-model=databaseTypeModel data-placeholder='DB type' ng-class=`{placeholder: !${databaseTypeModel}}` bs-select bs-option='item.value as item.label for item in {{supportedJdbcTypes}}' ignite-on-escape='tableReset(false)' tabindex='0') .col-xs-3.col-sm-3.col-md-3 .fieldSep / .input-tip @@ -59,7 +59,7 @@ mixin table-db-field-edit(tbl, prefix, focusId, index) +btn-save(btnVisible, btnSave) .input-tip - button.select-toggle.form-control(id=javaTypeId ng-model=javaTypeModel data-placeholder='Java type' ng-class=`{placeholder: !${javaTypeModel}}` bs-select bs-options='item.value as item.label for item in {{supportedJavaTypes}}' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset(false)' tabindex='0') + button.select-toggle.form-control(id=javaTypeId ng-model=javaTypeModel data-placeholder='Java type' ng-class=`{placeholder: !${javaTypeModel}}` bs-select bs-option='item.value as item.label for item in {{supportedJavaTypes}}' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset(false)' tabindex='0') .panel.panel-default(ng-form=form novalidate) .panel-heading(bs-collapse-toggle='' ng-click=`ui.loadPanel('${form}')`) http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/app/modules/states/configuration/igfs/misc.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/states/configuration/igfs/misc.pug b/modules/web-console/frontend/app/modules/states/configuration/igfs/misc.pug index aa4b957..639eda6 100644 --- a/modules/web-console/frontend/app/modules/states/configuration/igfs/misc.pug +++ b/modules/web-console/frontend/app/modules/states/configuration/igfs/misc.pug @@ -40,7 +40,7 @@ mixin table-igfs-path-mode-edit(prefix, focusId, index) -var btnVisibleAndSave = `${btnVisible} && ${btnSave}` +btn-save(btnVisible, btnSave) .input-tip - button.select-toggle.form-control(id=valFocusId bs-select ng-model=valModel data-placeholder='Mode' bs-options='item.value as item.label for item in igfsModes' tabindex='0' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset(false)') + button.select-toggle.form-control(id=valFocusId bs-select ng-model=valModel data-placeholder='Mode' bs-option='item.value as item.label for item in igfsModes' tabindex='0' ignite-on-enter=btnVisibleAndSave ignite-on-escape='tableReset(false)') .panel.panel-default(ng-form=form novalidate) .panel-heading(bs-collapse-toggle='' ng-click=`ui.loadPanel('${form}')`) http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/app/primitives/tooltip/index.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/primitives/tooltip/index.pug b/modules/web-console/frontend/app/primitives/tooltip/index.pug index de1b116..ae10279 100644 --- a/modules/web-console/frontend/app/primitives/tooltip/index.pug +++ b/modules/web-console/frontend/app/primitives/tooltip/index.pug @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. -mixin tooltip(title, options) +mixin tooltip(title, option) if title i.tipField.icon-help( bs-tooltip='' data-title=title - data-container=options && options.container || false - data-placement=options && options.placement || false + data-container=option && option.container || false + data-placement=option && option.placement || false ) http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/public/stylesheets/style.scss ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/public/stylesheets/style.scss b/modules/web-console/frontend/public/stylesheets/style.scss index 8dbf123..4c118ae 100644 --- a/modules/web-console/frontend/public/stylesheets/style.scss +++ b/modules/web-console/frontend/public/stylesheets/style.scss @@ -1564,7 +1564,7 @@ th[st-sort] { margin-bottom: 20px; } -.advanced-options { +.advanced-option { @extend .section; margin-bottom: 20px; @@ -1573,8 +1573,8 @@ th[st-sort] { } } -.modal-advanced-options { - @extend .advanced-options; +.modal-advanced-option { + @extend .advanced-option; margin-top: 10px; margin-bottom: 10px; } http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/views/configuration/caches.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/configuration/caches.tpl.pug b/modules/web-console/frontend/views/configuration/caches.tpl.pug index fca41a8..cfe6c6d 100644 --- a/modules/web-console/frontend/views/configuration/caches.tpl.pug +++ b/modules/web-console/frontend/views/configuration/caches.tpl.pug @@ -41,7 +41,7 @@ include /app/helpers/jade/mixins include /app/modules/states/configuration/caches/query include /app/modules/states/configuration/caches/store - +advanced-options-toggle-default + +advanced-option-toggle-default div(ng-show='ui.expanded') include /app/modules/states/configuration/caches/affinity @@ -52,4 +52,4 @@ include /app/helpers/jade/mixins include /app/modules/states/configuration/caches/rebalance include /app/modules/states/configuration/caches/statistics - +advanced-options-toggle-default + +advanced-option-toggle-default http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/views/configuration/clusters.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/configuration/clusters.tpl.pug b/modules/web-console/frontend/views/configuration/clusters.tpl.pug index c979012..9ce13b8 100644 --- a/modules/web-console/frontend/views/configuration/clusters.tpl.pug +++ b/modules/web-console/frontend/views/configuration/clusters.tpl.pug @@ -38,7 +38,7 @@ include /app/helpers/jade/mixins .panel-group include /app/modules/states/configuration/clusters/general - +advanced-options-toggle-default + +advanced-option-toggle-default div(ng-show='ui.expanded') include /app/modules/states/configuration/clusters/atomic @@ -65,4 +65,4 @@ include /app/helpers/jade/mixins include /app/modules/states/configuration/clusters/transactions include /app/modules/states/configuration/clusters/attributes - +advanced-options-toggle-default + +advanced-option-toggle-default http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/views/configuration/domains-import.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/configuration/domains-import.tpl.pug b/modules/web-console/frontend/views/configuration/domains-import.tpl.pug index 04de07a..866816d 100644 --- a/modules/web-console/frontend/views/configuration/domains-import.tpl.pug +++ b/modules/web-console/frontend/views/configuration/domains-import.tpl.pug @@ -137,21 +137,21 @@ mixin td-ellipses-lbl(w, lbl) div.td-ellipsis a(ng-if='!table.edit' ng-click='startEditDbTableCache(table)') {{tableActionView(table)}} div(style='display: flex' ng-if='table.edit') - button.select-toggle.form-control(style='width: 35%; margin-right: 5px' bs-select ng-model='table.action' data-container='.modal-domain-import' bs-options='item.value as item.shortLabel for item in importActions') - button.select-toggle.form-control(style='width: 65%; margin-right: 0' bs-select ng-model='table.cacheOrTemplate' data-container='.modal-domain-import' bs-options='item.value as item.label for item in table.cachesOrTemplates') + button.select-toggle.form-control(style='width: 35%; margin-right: 5px' bs-select ng-model='table.action' data-container='.modal-domain-import' bs-option='item.value as item.shortLabel for item in importActions') + button.select-toggle.form-control(style='width: 65%; margin-right: 0' bs-select ng-model='table.cacheOrTemplate' data-container='.modal-domain-import' bs-option='item.value as item.label for item in table.cachesOrTemplates') td .settings-row label Defaults to be applied for filtered tables - i.tipLabel.icon-help(bs-tooltip='' data-title='Select and apply options for caches generation') + i.tipLabel.icon-help(bs-tooltip='' data-title='Select and apply option for caches generation') .settings-row .col-sm-11 .col-sm-6(style='padding-right: 5px') - button.select-toggle.form-control(bs-select ng-model='importCommon.action' data-container='.modal-domain-import' bs-options='item.value as item.label for item in importActions') + button.select-toggle.form-control(bs-select ng-model='importCommon.action' data-container='.modal-domain-import' bs-option='item.value as item.label for item in importActions') .col-sm-6(style='padding-left: 5px; padding-right: 5px') - button.select-toggle.form-control(bs-select ng-model='importCommon.cacheOrTemplate' data-container='.modal-domain-import' bs-options='item.value as item.label for item in importCommon.cachesOrTemplates') + button.select-toggle.form-control(bs-select ng-model='importCommon.cacheOrTemplate' data-container='.modal-domain-import' bs-option='item.value as item.label for item in importCommon.cachesOrTemplates') .col-sm-1(style='padding-left: 5px') button.btn.btn-primary(ng-click='applyDefaults()') Apply - .import-domain-model-wizard-page(ng-show='importDomain.action == "options"') + .import-domain-model-wizard-page(ng-show='importDomain.action == "option"') -var form = 'optionsForm' form.form-horizontal(name=form novalidate) http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/views/configuration/igfs.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/configuration/igfs.tpl.pug b/modules/web-console/frontend/views/configuration/igfs.tpl.pug index 89e0920..a540922 100644 --- a/modules/web-console/frontend/views/configuration/igfs.tpl.pug +++ b/modules/web-console/frontend/views/configuration/igfs.tpl.pug @@ -39,7 +39,7 @@ include /app/helpers/jade/mixins .panel-group include /app/modules/states/configuration/igfs/general - +advanced-options-toggle-default + +advanced-option-toggle-default div(ng-show='ui.expanded') include /app/modules/states/configuration/igfs/secondary @@ -48,4 +48,4 @@ include /app/helpers/jade/mixins include /app/modules/states/configuration/igfs/dual include /app/modules/states/configuration/igfs/misc - +advanced-options-toggle-default + +advanced-option-toggle-default http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/views/configuration/summary-project-structure.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/configuration/summary-project-structure.tpl.pug b/modules/web-console/frontend/views/configuration/summary-project-structure.tpl.pug index 31a557f..15efd24 100644 --- a/modules/web-console/frontend/views/configuration/summary-project-structure.tpl.pug +++ b/modules/web-console/frontend/views/configuration/summary-project-structure.tpl.pug @@ -19,7 +19,7 @@ label.labelField Project structure button.close(id='summary-project-structure-close' ng-click='$hide()') × .popover-content - treecontrol.tree-classic(tree-model='projectStructure' options='projectStructureOptions' expanded-nodes='projectStructureExpanded') + treecontrol.tree-classic(tree-model='projectStructure' option='projectStructureOptions' expanded-nodes='projectStructureExpanded') span(ng-switch='node.type') span(ng-switch-when='folder') label {{node.name}} http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/views/settings/admin.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/settings/admin.tpl.pug b/modules/web-console/frontend/views/settings/admin.tpl.pug index a09fda9..ee483d2 100644 --- a/modules/web-console/frontend/views/settings/admin.tpl.pug +++ b/modules/web-console/frontend/views/settings/admin.tpl.pug @@ -22,4 +22,4 @@ .docs-body .row .col-xs-12 - ignite-list-of-registered-users(data-options='ctrl.data') + ignite-list-of-registered-users(data-option='ctrl.data') http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/views/settings/profile.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/settings/profile.tpl.pug b/modules/web-console/frontend/views/settings/profile.tpl.pug index 6f91f8f..68fb812 100644 --- a/modules/web-console/frontend/views/settings/profile.tpl.pug +++ b/modules/web-console/frontend/views/settings/profile.tpl.pug @@ -44,9 +44,9 @@ mixin lbl(txt) .details-row +lbl('Country:') .col-xs-5.col-sm-4 - button#profile-country.select-toggle.form-control(bs-select bs-options='item.name as item.name for item in countries' type='text' ng-model='user.country' placeholder='Choose your country' ng-required='true') + button#profile-country.select-toggle.form-control(bs-select bs-option='item.name as item.name for item in countries' type='text' ng-model='user.country' placeholder='Choose your country' ng-required='true') .details-row - .advanced-options + .advanced-option i.fa( ng-click='toggleToken()' ng-class='expandedToken ? "fa-chevron-circle-down" : "fa-chevron-circle-right"') @@ -58,7 +58,7 @@ mixin lbl(txt) i.tipLabel.fa.fa-clipboard(ignite-copy-to-clipboard='{{user.token}}' bs-tooltip='' data-title='Copy security token to clipboard') i.tipLabel.icon-help(ng-if=lines bs-tooltip='' data-title='The security token is used for authorization of web agent') .details-row - .advanced-options + .advanced-option i.fa( ng-click='togglePassword()' ng-class='expandedPassword ? "fa-chevron-circle-down" : "fa-chevron-circle-right"') http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/views/signin.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/signin.tpl.pug b/modules/web-console/frontend/views/signin.tpl.pug index a6c64a8..ce3e556 100644 --- a/modules/web-console/frontend/views/signin.tpl.pug +++ b/modules/web-console/frontend/views/signin.tpl.pug @@ -76,7 +76,7 @@ header#header.header .settings-row(ng-show='action == "signup"') +lblRequired('Country:') .col-xs-9.col-md-8 - button#country.select-toggle.form-control(ignite-on-enter-focus-move='signup' bs-select bs-options='item.name as item.name for item in countries' type='text' ng-model='ui.country' placeholder='Choose your country' ng-required='action=="signup"') + button#country.select-toggle.form-control(ignite-on-enter-focus-move='signup' bs-select bs-option='item.name as item.name for item in countries' type='text' ng-model='ui.country' placeholder='Choose your country' ng-required='action=="signup"') .settings-row(ignite-terms) .col-md-offset-3(ng-if='action == "signup" && terms.termsState') label http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/views/sql/cache-metadata.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/sql/cache-metadata.tpl.pug b/modules/web-console/frontend/views/sql/cache-metadata.tpl.pug index 385960a..fd13fce 100644 --- a/modules/web-console/frontend/views/sql/cache-metadata.tpl.pug +++ b/modules/web-console/frontend/views/sql/cache-metadata.tpl.pug @@ -20,7 +20,7 @@ .input-tip input.form-control(type='text' ng-model='metaFilter' placeholder='Filter metadata...') .popover-content(ng-if='metadata && metadata.length > 0') - treecontrol.tree-classic(tree-model='metadata' options='metaOptions' filter-expression='metaFilter') + treecontrol.tree-classic(tree-model='metadata' option='metaOptions' filter-expression='metaFilter') span(ng-switch='node.type') span(ng-switch-when='type' ng-dblclick='dblclickMetadata(paragraph, node)') i.fa.fa-table http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/views/sql/chart-settings.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/sql/chart-settings.tpl.pug b/modules/web-console/frontend/views/sql/chart-settings.tpl.pug index 5a1ceed..efe3100 100644 --- a/modules/web-console/frontend/views/sql/chart-settings.tpl.pug +++ b/modules/web-console/frontend/views/sql/chart-settings.tpl.pug @@ -36,5 +36,5 @@ ul.chart-settings-columns-list(dnd-list='paragraph.chartValCols' dnd-drop='chartAcceptValColumn(paragraph, item)') li(ng-repeat='col in paragraph.chartValCols track by $index') .btn.btn-default.btn-chart-column(ng-style='chartColor($index)') {{col.label}} - button.btn-chart-column-agg-fx.select-toggle(ng-change='applyChartSettings(paragraph)' ng-show='paragraphTimeSpanVisible(paragraph)' ng-style='chartColor($index)' ng-model='col.aggFx' placeholder='...' bs-select bs-options='item for item in aggregateFxs' data-container='false' tabindex='-1') + button.btn-chart-column-agg-fx.select-toggle(ng-change='applyChartSettings(paragraph)' ng-show='paragraphTimeSpanVisible(paragraph)' ng-style='chartColor($index)' ng-model='col.aggFx' placeholder='...' bs-select bs-option='item for item in aggregateFxs' data-container='false' tabindex='-1') i.fa.fa-close(ng-click='chartRemoveValColumn(paragraph, $index)') http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/views/sql/paragraph-rate.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/sql/paragraph-rate.tpl.pug b/modules/web-console/frontend/views/sql/paragraph-rate.tpl.pug index 03c6497..37ae9da 100644 --- a/modules/web-console/frontend/views/sql/paragraph-rate.tpl.pug +++ b/modules/web-console/frontend/views/sql/paragraph-rate.tpl.pug @@ -24,7 +24,7 @@ .col-sm-4 input.form-control(id='paragraph-rate' ng-init='value = paragraph.rate.value' ng-model='value' type='number' min='1' required ignite-auto-focus) .col-sm-8(style='padding-left: 5px') - button.form-control.select-toggle(id='paragraph-unit' ng-init='unit = paragraph.rate.unit' ng-model='unit' required placeholder='Time unit' bs-select bs-options='item.value as item.label for item in timeUnit' data-container='false' tabindex='0') + button.form-control.select-toggle(id='paragraph-unit' ng-init='unit = paragraph.rate.unit' ng-model='unit' required placeholder='Time unit' bs-select bs-option='item.value as item.label for item in timeUnit' data-container='false' tabindex='0') .form-actions(style='margin-top: 30px; padding: 5px') button.btn.btn-primary(id='paragraph-rate-start' ng-disabled='popoverForm.$invalid' ng-click='startRefresh(paragraph, value, unit); $hide()') Start button.btn.btn-primary.btn-default(id='paragraph-rate-stop' ng-click='stopRefresh(paragraph); $hide()' ng-disabled='!paragraph.rate.installed') Stop http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/views/sql/sql.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/sql/sql.tpl.pug b/modules/web-console/frontend/views/sql/sql.tpl.pug index dcfc531..6899734 100644 --- a/modules/web-console/frontend/views/sql/sql.tpl.pug +++ b/modules/web-console/frontend/views/sql/sql.tpl.pug @@ -40,7 +40,7 @@ mixin chart-settings | Chart settings div(ng-show='paragraphTimeSpanVisible(paragraph)') label Show - button.select-manual-caret.btn.btn-default(ng-model='paragraph.timeLineSpan' ng-change='applyChartSettings(paragraph)' bs-options='item for item in timeLineSpans' bs-select data-caret-html='<span class="caret"></span>') + button.select-manual-caret.btn.btn-default(ng-model='paragraph.timeLineSpan' ng-change='applyChartSettings(paragraph)' bs-option='item for item in timeLineSpans' bs-select data-caret-html='<span class="caret"></span>') label min .col-xs-4 +result-toolbar @@ -96,10 +96,10 @@ mixin query-settings button.btn.btn-default.fa.fa-clock-o.tipLabel(ng-class='{"btn-info": paragraph.rate && paragraph.rate.installed}' bs-popover data-template-url='{{ $ctrl.paragraphRateTemplateUrl }}' data-placement='left' data-auto-close='1' data-trigger='click') {{rateAsString(paragraph)}} label.tipLabel(bs-tooltip data-placement='bottom' data-title='Max number of rows to show in query result as one page') Page size: - button.btn.btn-default.select-toggle.tipLabel(ng-model='paragraph.pageSize' bs-select bs-options='item for item in pageSizes') + button.btn.btn-default.select-toggle.tipLabel(ng-model='paragraph.pageSize' bs-select bs-option='item for item in pageSizes') label.tipLabel(bs-tooltip data-placement='bottom' data-title='Limit query max results to specified number of pages') Max pages: - button.btn.btn-default.select-toggle.tipLabel(ng-model='paragraph.maxPages' bs-select bs-options='item.value as item.label for item in maxPages') + button.btn.btn-default.select-toggle.tipLabel(ng-model='paragraph.maxPages' bs-select bs-option='item.value as item.label for item in maxPages') .panel-tip-container .row(ng-if='nonCollocatedJoinsAvailable(paragraph)') @@ -167,7 +167,7 @@ mixin chart-result div(ng-show='paragraph.chartColumnsConfigured()') div(ng-show='paragraph.timeLineSupported() || !paragraph.chartTimeLineEnabled()') div(ng-repeat='chart in paragraph.charts') - nvd3(options='chart.options' data='chart.data' api='chart.api') + nvd3(option='chart.option' data='chart.data' api='chart.api') .empty(ng-show='!paragraph.timeLineSupported() && paragraph.chartTimeLineEnabled()') Pie chart does not support 'TIME_LINE' column for X-axis. Please use another column for X-axis or switch to another chart. .empty(ng-show='paragraph.scanExplain()') .row @@ -189,7 +189,7 @@ mixin paragraph-scan input(type='checkbox' ng-model='paragraph.caseSensitive') span(bs-tooltip data-title='Select this checkbox for case sensitive search') Cs label.tipLabel(bs-tooltip data-placement='bottom' data-title='Max number of rows to show in query result as one page') Page size: - button.btn.btn-default.select-toggle.tipLabel(ng-model='paragraph.pageSize' bs-select bs-options='item for item in pageSizes') + button.btn.btn-default.select-toggle.tipLabel(ng-model='paragraph.pageSize' bs-select bs-option='item for item in pageSizes') .col-sm-12.sql-controls button.btn.btn-primary(ng-disabled='!actionAvailable(paragraph, false)' ng-click='scan(paragraph)') http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/frontend/views/templates/agent-download.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/views/templates/agent-download.tpl.pug b/modules/web-console/frontend/views/templates/agent-download.tpl.pug index b913636..57da8f8 100644 --- a/modules/web-console/frontend/views/templates/agent-download.tpl.pug +++ b/modules/web-console/frontend/views/templates/agent-download.tpl.pug @@ -29,7 +29,7 @@ li Download and unzip #[a(href='/api/v1/agent/download/zip' target='_self') ignite-web-agent] archive li Run shell file #[b ignite-web-agent.{sh|bat}] p Refer to #[b README.txt] in agent folder for more information - .modal-advanced-options + .modal-advanced-option i.fa.fa-chevron-circle-down(ng-show='agentLoad.showToken' ng-click='agentLoad.showToken = ! agentLoad.showToken') i.fa.fa-chevron-circle-right(ng-show='!agentLoad.showToken' ng-click='agentLoad.showToken = ! agentLoad.showToken') a(ng-click='agentLoad.showToken = ! agentLoad.showToken') {{agentLoad.showToken ? 'Hide security token...' : 'Show security token...'}} http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/web-agent/README.txt ---------------------------------------------------------------------- diff --git a/modules/web-console/web-agent/README.txt b/modules/web-console/web-agent/README.txt index c915871..1211495 100644 --- a/modules/web-console/web-agent/README.txt +++ b/modules/web-console/web-agent/README.txt @@ -66,7 +66,7 @@ Demo of Ignite Web Agent: 1.2) Click "Import from database". You should see modal with demo description. 1.3) Click "Next" button. You should see list of available schemas. 1.4) Click "Next" button. You should see list of available tables. - 1.5) Click "Next" button. You should see import options. + 1.5) Click "Next" button. You should see import option. 1.6) Select some of them and click "Save". 2) Demo for SQL. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/web-agent/bin/ignite-web-agent.bat ---------------------------------------------------------------------- diff --git a/modules/web-console/web-agent/bin/ignite-web-agent.bat b/modules/web-console/web-agent/bin/ignite-web-agent.bat index 1f1b52d..e65da18 100644 --- a/modules/web-console/web-agent/bin/ignite-web-agent.bat +++ b/modules/web-console/web-agent/bin/ignite-web-agent.bat @@ -49,7 +49,7 @@ goto error_finish :run_java :: -:: JVM options. See http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp for more details. +:: JVM option. See http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp for more details. :: :: ADD YOUR/CHANGE ADDITIONAL OPTIONS HERE :: http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/web-console/web-agent/bin/ignite-web-agent.sh ---------------------------------------------------------------------- diff --git a/modules/web-console/web-agent/bin/ignite-web-agent.sh b/modules/web-console/web-agent/bin/ignite-web-agent.sh index c2958fc..6408700 100644 --- a/modules/web-console/web-agent/bin/ignite-web-agent.sh +++ b/modules/web-console/web-agent/bin/ignite-web-agent.sh @@ -76,7 +76,7 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" cd $DIR # -# JVM options. See http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp for more details. +# JVM option. See http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp for more details. # # ADD YOUR/CHANGE ADDITIONAL OPTIONS HERE # http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-atomic-win.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-atomic-win.properties b/modules/yardstick/config/benchmark-atomic-win.properties index 202306e..9be69d8 100644 --- a/modules/yardstick/config/benchmark-atomic-win.properties +++ b/modules/yardstick/config/benchmark-atomic-win.properties @@ -17,7 +17,7 @@ :: Contains benchmarks for ATOMIC cache. :: -:: JVM options. +:: JVM option. set JVM_OPTS=%JVM_OPTS% -DIGNITE_QUIET=false :: Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-atomic.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-atomic.properties b/modules/yardstick/config/benchmark-atomic.properties index f296041..d73ca47 100644 --- a/modules/yardstick/config/benchmark-atomic.properties +++ b/modules/yardstick/config/benchmark-atomic.properties @@ -17,7 +17,7 @@ # Contains benchmarks for ATOMIC cache. # -# JVM options. +# JVM option. JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-bin-identity.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-bin-identity.properties b/modules/yardstick/config/benchmark-bin-identity.properties index d5d18b6..85f2702 100644 --- a/modules/yardstick/config/benchmark-bin-identity.properties +++ b/modules/yardstick/config/benchmark-bin-identity.properties @@ -19,7 +19,7 @@ now0=`date +'%H%M%S'` -# JVM options. +# JVM option. JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-cache-load-win.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-cache-load-win.properties b/modules/yardstick/config/benchmark-cache-load-win.properties index 3ee11a3..256da20 100644 --- a/modules/yardstick/config/benchmark-cache-load-win.properties +++ b/modules/yardstick/config/benchmark-cache-load-win.properties @@ -17,7 +17,7 @@ :: Contains benchmarks for execute random operation on various caches. :: -:: JVM options. +:: JVM option. set JVM_OPTS=%JVM_OPTS% -DIGNITE_QUIET=false :: Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-cache-load.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-cache-load.properties b/modules/yardstick/config/benchmark-cache-load.properties index c055694..ad3ccde 100644 --- a/modules/yardstick/config/benchmark-cache-load.properties +++ b/modules/yardstick/config/benchmark-cache-load.properties @@ -16,7 +16,7 @@ now0=`date +'%H%M%S'` -# JVM options. +# JVM option. JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-client-mode.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-client-mode.properties b/modules/yardstick/config/benchmark-client-mode.properties index ad501f1..1645ab8 100644 --- a/modules/yardstick/config/benchmark-client-mode.properties +++ b/modules/yardstick/config/benchmark-client-mode.properties @@ -19,7 +19,7 @@ now0=`date +'%H%M%S'` -# JVM options. +# JVM option. JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-compute-win.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-compute-win.properties b/modules/yardstick/config/benchmark-compute-win.properties index a4c6f44..4e47ecf 100644 --- a/modules/yardstick/config/benchmark-compute-win.properties +++ b/modules/yardstick/config/benchmark-compute-win.properties @@ -17,7 +17,7 @@ :: Contains benchmarks for distributed computations. :: -:: JVM options. +:: JVM option. set JVM_OPTS=%JVM_OPTS% -DIGNITE_QUIET=false :: Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-compute.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-compute.properties b/modules/yardstick/config/benchmark-compute.properties index 30d411a..d96511a 100644 --- a/modules/yardstick/config/benchmark-compute.properties +++ b/modules/yardstick/config/benchmark-compute.properties @@ -17,7 +17,7 @@ # Contains benchmarks for distributed computations. # -# JVM options. +# JVM option. JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-failover.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-failover.properties b/modules/yardstick/config/benchmark-failover.properties index a1b9d8f..e31a399 100644 --- a/modules/yardstick/config/benchmark-failover.properties +++ b/modules/yardstick/config/benchmark-failover.properties @@ -21,7 +21,7 @@ now0=`date +'%H%M%S'` -# JVM options. +# JVM option. #JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false -Xms15g -Xmx15g" JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false -ea" http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-full.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-full.properties b/modules/yardstick/config/benchmark-full.properties index 96da0a6..d13f5f2 100644 --- a/modules/yardstick/config/benchmark-full.properties +++ b/modules/yardstick/config/benchmark-full.properties @@ -19,7 +19,7 @@ now0=`date +'%H%M%S'` -# JVM options. +# JVM option. JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-multicast.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-multicast.properties b/modules/yardstick/config/benchmark-multicast.properties index 2b4d99b..b31e868 100644 --- a/modules/yardstick/config/benchmark-multicast.properties +++ b/modules/yardstick/config/benchmark-multicast.properties @@ -19,7 +19,7 @@ now0=`date +'%H%M%S'` -# JVM options. +# JVM option. JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-put-indexed-val.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-put-indexed-val.properties b/modules/yardstick/config/benchmark-put-indexed-val.properties index a2bc956..f83ac34 100644 --- a/modules/yardstick/config/benchmark-put-indexed-val.properties +++ b/modules/yardstick/config/benchmark-put-indexed-val.properties @@ -17,7 +17,7 @@ # Contains benchmarks for SQL queries. # -# JVM options. +# JVM option. # JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-query-put-separated.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-query-put-separated.properties b/modules/yardstick/config/benchmark-query-put-separated.properties index b4437bf..03a030b 100644 --- a/modules/yardstick/config/benchmark-query-put-separated.properties +++ b/modules/yardstick/config/benchmark-query-put-separated.properties @@ -19,7 +19,7 @@ now0=`date +'%H%M%S'` -# JVM options. +# JVM option. JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-query-win.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-query-win.properties b/modules/yardstick/config/benchmark-query-win.properties index 6bd8fb9..0acf2f0 100644 --- a/modules/yardstick/config/benchmark-query-win.properties +++ b/modules/yardstick/config/benchmark-query-win.properties @@ -17,7 +17,7 @@ :: Contains benchmarks for SQL queries. :: -:: JVM options. +:: JVM option. :: set JVM_OPTS=%JVM_OPTS% -DIGNITE_QUIET=false :: Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-query.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-query.properties b/modules/yardstick/config/benchmark-query.properties index c364cfd..aa446e1 100644 --- a/modules/yardstick/config/benchmark-query.properties +++ b/modules/yardstick/config/benchmark-query.properties @@ -17,7 +17,7 @@ # Contains benchmarks for SQL queries. # -# JVM options. +# JVM option. # JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-remote-sample.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-remote-sample.properties b/modules/yardstick/config/benchmark-remote-sample.properties index e9754fe..f67bc39 100644 --- a/modules/yardstick/config/benchmark-remote-sample.properties +++ b/modules/yardstick/config/benchmark-remote-sample.properties @@ -17,7 +17,7 @@ # Contains benchmarks for ATOMIC cache. # -# JVM options. +# JVM option. JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-remote.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-remote.properties b/modules/yardstick/config/benchmark-remote.properties index 4d671d3..70b47d4 100644 --- a/modules/yardstick/config/benchmark-remote.properties +++ b/modules/yardstick/config/benchmark-remote.properties @@ -19,7 +19,7 @@ now0=`date +'%H%M%S'` -# JVM options. +# JVM option. JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-sample.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-sample.properties b/modules/yardstick/config/benchmark-sample.properties index b235e9a..433e4bc 100644 --- a/modules/yardstick/config/benchmark-sample.properties +++ b/modules/yardstick/config/benchmark-sample.properties @@ -17,7 +17,7 @@ # Contains benchmarks for ATOMIC cache. # -# JVM options. +# JVM option. JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-sql-dml.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-sql-dml.properties b/modules/yardstick/config/benchmark-sql-dml.properties index 3bb4107..d95abf9 100644 --- a/modules/yardstick/config/benchmark-sql-dml.properties +++ b/modules/yardstick/config/benchmark-sql-dml.properties @@ -17,7 +17,7 @@ # Contains benchmarks for SQL queries. # -# JVM options. +# JVM option. # JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-store.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-store.properties b/modules/yardstick/config/benchmark-store.properties index 3146c24..1ddd207 100644 --- a/modules/yardstick/config/benchmark-store.properties +++ b/modules/yardstick/config/benchmark-store.properties @@ -21,7 +21,7 @@ now0=`date +'%H%M%S'` -# JVM options. +# JVM option. JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-tx-win.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-tx-win.properties b/modules/yardstick/config/benchmark-tx-win.properties index 490b9d7..b506cc3 100644 --- a/modules/yardstick/config/benchmark-tx-win.properties +++ b/modules/yardstick/config/benchmark-tx-win.properties @@ -17,7 +17,7 @@ :: Contains benchmarks for TRANSACTIONAL cache. :: -:: JVM options. +:: JVM option. set JVM_OPTS=%JVM_OPTS% -DIGNITE_QUIET=false :: Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-tx.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-tx.properties b/modules/yardstick/config/benchmark-tx.properties index 8a75bf5..aeef1c2 100644 --- a/modules/yardstick/config/benchmark-tx.properties +++ b/modules/yardstick/config/benchmark-tx.properties @@ -17,7 +17,7 @@ # Contains benchmarks for TRANSACTIONAL cache. # -# JVM options. +# JVM option. JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark-win.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-win.properties b/modules/yardstick/config/benchmark-win.properties index e97d036..e47b91c 100644 --- a/modules/yardstick/config/benchmark-win.properties +++ b/modules/yardstick/config/benchmark-win.properties @@ -20,7 +20,7 @@ :: - SQL queries :: -:: JVM options. +:: JVM option. set JVM_OPTS=%JVM_OPTS% -DIGNITE_QUIET=false :: Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/benchmark.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark.properties b/modules/yardstick/config/benchmark.properties index cccbf2a..cd6934e 100644 --- a/modules/yardstick/config/benchmark.properties +++ b/modules/yardstick/config/benchmark.properties @@ -19,7 +19,7 @@ now0=`date +'%H%M%S'` -# JVM options. +# JVM option. JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/test-max-int-values-offheap.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/test-max-int-values-offheap.properties b/modules/yardstick/config/test-max-int-values-offheap.properties index 4a42538..4516f9a 100644 --- a/modules/yardstick/config/test-max-int-values-offheap.properties +++ b/modules/yardstick/config/test-max-int-values-offheap.properties @@ -17,7 +17,7 @@ # Contains benchmarks for SQL queries. # -# JVM options. +# JVM option. # JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/test-max-int-values-onheap.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/test-max-int-values-onheap.properties b/modules/yardstick/config/test-max-int-values-onheap.properties index 4346b54..9b73628 100644 --- a/modules/yardstick/config/test-max-int-values-onheap.properties +++ b/modules/yardstick/config/test-max-int-values-onheap.properties @@ -17,7 +17,7 @@ # Contains benchmarks for SQL queries. # -# JVM options. +# JVM option. # JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. http://git-wip-us.apache.org/repos/asf/ignite/blob/362700c6/modules/yardstick/config/test-max-int-values-swap.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/test-max-int-values-swap.properties b/modules/yardstick/config/test-max-int-values-swap.properties index be0aed4..8109ec7 100644 --- a/modules/yardstick/config/test-max-int-values-swap.properties +++ b/modules/yardstick/config/test-max-int-values-swap.properties @@ -17,7 +17,7 @@ # Contains benchmarks for SQL queries. # -# JVM options. +# JVM option. # JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses.
