Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 b75bb664a -> 90bc913fe
IGNITE-843 Removed support for not needed any more "Keep serialized" property. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/90bc913f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/90bc913f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/90bc913f Branch: refs/heads/ignite-843-rc1 Commit: 90bc913fe29e306fbb2541687f512d4d08295314 Parents: b75bb66 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Nov 18 22:37:24 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Nov 18 22:37:24 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/models/metadata.json | 9 --------- modules/control-center-web/src/main/js/db.js | 1 - .../src/main/js/helpers/generator/generator-java.js | 1 - .../src/main/js/helpers/generator/generator-xml.js | 2 -- 4 files changed, 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/90bc913f/modules/control-center-web/src/main/js/controllers/models/metadata.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/models/metadata.json b/modules/control-center-web/src/main/js/controllers/models/metadata.json index aa44a13..e5981fd 100644 --- a/modules/control-center-web/src/main/js/controllers/models/metadata.json +++ b/modules/control-center-web/src/main/js/controllers/models/metadata.json @@ -150,15 +150,6 @@ ] }, { - "label": "Keep serialized", - "id": "keepSerialized", - "type": "check", - "model": "keepSerialized", - "tip": [ - "Should be checked if in case of Portable object format" - ] - }, - { "label": "Key fields", "id": "keyFields", "type": "table-db-fields", http://git-wip-us.apache.org/repos/asf/ignite/blob/90bc913f/modules/control-center-web/src/main/js/db.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/db.js b/modules/control-center-web/src/main/js/db.js index a31ed89..477fe47 100644 --- a/modules/control-center-web/src/main/js/db.js +++ b/modules/control-center-web/src/main/js/db.js @@ -80,7 +80,6 @@ var CacheTypeMetadataSchema = new Schema({ valueType: String, keyFields: [{databaseFieldName: String, databaseFieldType: String, javaFieldName: String, javaFieldType: String}], valueFields: [{databaseFieldName: String, databaseFieldType: String, javaFieldName: String, javaFieldType: String}], - keepSerialized: Boolean, fields: [{name: String, className: String}], aliases: [{field: String, alias: String}], indexes: [{name: String, indexType: {type: String, enum: ['SORTED', 'FULLTEXT', 'GEOSPATIAL']}, fields: [{name: String, direction: Boolean}]}] http://git-wip-us.apache.org/repos/asf/ignite/blob/90bc913f/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 6428b01..deb8bdf 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 @@ -1205,7 +1205,6 @@ $generatorJava.metadataStore = function (meta, withTypes, res) { $generatorJava.property(res, 'jdbcType', meta, 'databaseSchema'); $generatorJava.property(res, 'jdbcType', meta, 'databaseTable'); - $generatorJava.property(res, 'jdbcType', meta, 'keepSerialized', null, null, false); if (withTypes) { $generatorJava.property(res, 'jdbcType', meta, 'keyType'); http://git-wip-us.apache.org/repos/asf/ignite/blob/90bc913f/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js index 3e3455e..9b9f799 100644 --- a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js +++ b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js @@ -758,7 +758,6 @@ $generatorXml.cacheStore = function(cache, metadatas, res) { $generatorXml.classNameProperty(res, meta, 'keyType'); $generatorXml.property(res, meta, 'valueType'); - $generatorXml.property(res, meta, 'keepSerialized', null, null, false); $generatorXml.metadataStore(meta, res); @@ -1046,7 +1045,6 @@ $generatorXml.metadataStore = function(meta, res) { $generatorXml.property(res, meta, 'databaseSchema'); $generatorXml.property(res, meta, 'databaseTable'); - $generatorXml.property(res, meta, 'keepSerialized'); res.needEmptyLine = true;
